From owner-svn-ports-all@freebsd.org Thu Jan 3 23:52:32 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC4B5143BC1B; Thu, 3 Jan 2019 23:52:32 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6E3596F79E; Thu, 3 Jan 2019 23:52:32 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 631F328953; Thu, 3 Jan 2019 23:52:32 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x03NqWho087416; Thu, 3 Jan 2019 23:52:32 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x03NqWuq087414; Thu, 3 Jan 2019 23:52:32 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201901032352.x03NqWuq087414@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Thu, 3 Jan 2019 23:52:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489234 - in branches/2019Q1/games/lincity-ng: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in branches/2019Q1/games/lincity-ng: . files X-SVN-Commit-Revision: 489234 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6E3596F79E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 23:52:33 -0000 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 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) ;