svn commit: r489234 - in branches/2019Q1/games/lincity-ng: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Thu Jan  3 23:52:31 2019
New Revision: 489234
URL: https://svnweb.freebsd.org/changeset/ports/489234

Log:
  MFH: r489092
  
  games/lincity-ng: Fix STAGEDIR misuse also cleanup and improvements
  Add LICENSE block
  Add better build-time flags for `configure` and CPPFLAGS
  Add missing USES=gl, gnome
  Switch to USES=localbase
  Fix incorrect STAGEDIR usage, which makes it saved in the produced binary
  
  PR:		234489
  Submitted by:	amdmi3
  Sponsored by:	The FreeBSD Foundation
  
  Approved by:	portmgr (bugfix blanket)

Modified:
  branches/2019Q1/games/lincity-ng/Makefile
  branches/2019Q1/games/lincity-ng/files/patch-mk-jam-install.jam
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/games/lincity-ng/Makefile
==============================================================================
--- branches/2019Q1/games/lincity-ng/Makefile	Thu Jan  3 23:48:24 2019	(r489233)
+++ branches/2019Q1/games/lincity-ng/Makefile	Thu Jan  3 23:52:31 2019	(r489234)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lincity-ng
 PORTVERSION=	2.0
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	games
 MASTER_SITES=	BERLIOS
 
@@ -13,17 +13,19 @@ COMMENT=	Improved rich city simulation game for X
 BUILD_DEPENDS=	jam:devel/jam
 LIB_DEPENDS=	libphysfs.so:devel/physfs
 
-USES=		pkgconfig tar:bzip2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gl gnome localbase:ldflags pkgconfig tar:bzip2
 USE_SDL=	sdl mixer image ttf gfx
 USE_GL=		gl
 USE_XORG=	x11
 USE_GNOME=	libxml2
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libphysfs=${PREFIX} \
+CONFIGURE_ARGS=	--with-libphysfs=${LOCALBASE} \
 		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
+LDFLAGS+=	-lpthread
 
 PLIST_FILES=	bin/lincity-ng \
 		share/applications/lincity-ng.desktop \
@@ -36,10 +38,11 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e 's| -O| -I${LOCALBASE}/include&|g' \
 		${WRKSRC}/Jamrules
+
 do-build:
 	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} jam -dx -j${MAKE_JOBS_NUMBER})
 
 do-install:
-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} jam -dx -sprefix=${STAGEDIR}${PREFIX} ${INSTALL_TARGET})
+	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} jam -dx -sprefix=${PREFIX} -sDESTDIR=${STAGEDIR} ${INSTALL_TARGET})
 
 .include <bsd.port.mk>

Modified: branches/2019Q1/games/lincity-ng/files/patch-mk-jam-install.jam
==============================================================================
--- branches/2019Q1/games/lincity-ng/files/patch-mk-jam-install.jam	Thu Jan  3 23:48:24 2019	(r489233)
+++ branches/2019Q1/games/lincity-ng/files/patch-mk-jam-install.jam	Thu Jan  3 23:52:31 2019	(r489234)
@@ -9,12 +9,3 @@
  appconfdir ?= [ ConcatDirs $(sysconfdir) $(PACKAGE_NAME) ] ;
  plugindir ?= [ ConcatDirs $(libdir) $(PACKAGE_NAME) ] ;
  applicationsdir ?= [ ConcatDirs $(datadir) applications ] ;
-@@ -111,7 +111,7 @@
- rule DoInstall
- {
-     local targets target i dir gdir ;
--    dir = [ ConcatDirs $(DESTDIR) $(2) ] ;
-+    dir = [ ConcatDirs  $(2) ] ;
- 
-     gdir = $(dir:G=dir) ;
-     MkDir $(gdir) ;