From owner-svn-ports-head@FreeBSD.ORG Mon Dec 29 23:45:41 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B093A6FF; Mon, 29 Dec 2014 23:45:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C7542CF9; Mon, 29 Dec 2014 23:45:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBTNjfEa030051; Mon, 29 Dec 2014 23:45:41 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBTNjf2o030048; Mon, 29 Dec 2014 23:45:41 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201412292345.sBTNjf2o030048@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 29 Dec 2014 23:45:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375810 - head/games/0ad X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Dec 2014 23:45:41 -0000 Author: madpilot Date: Mon Dec 29 23:45:40 2014 New Revision: 375810 URL: https://svnweb.freebsd.org/changeset/ports/375810 QAT: https://qat.redports.org/buildarchive/r375810/ Log: Add option to allow linking to lang/spidermonkey24 port instead of using the boundled one. PR: 196304 Submitted by: Kevin Zheng Modified: head/games/0ad/Makefile head/games/0ad/pkg-plist Modified: head/games/0ad/Makefile ============================================================================== --- head/games/0ad/Makefile Mon Dec 29 23:06:29 2014 (r375809) +++ head/games/0ad/Makefile Mon Dec 29 23:45:40 2014 (r375810) @@ -2,7 +2,7 @@ PORTNAME= 0ad PORTVERSION= 0.0.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ @@ -41,10 +41,22 @@ WX_COMPS= wx:lib WX_UNICODE= yes MAKE_ENV+= JOBS=${_MAKE_JOBS} +OPTIONS_DEFINE= PORTSSM +PORTSSM_DESC= Use lang/spidermonkey24 instead of bundled one + +OPTIONS_SUB= yes +PORTSSM_LIB_DEPENDS= libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24 + MANUAL_PACKAGE_BUILD= huge PORTDATA= * +.include + +.if ${PORT_OPTIONS:MPORTSSM} +SMOPT= --with-system-mozjs24 +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ @@ -55,14 +67,17 @@ post-patch: ${WRKSRC}/build/resources/0ad.sh pre-build: - (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc ${SMOPT} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} - (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libmozjs24-ps-release.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) +.if ! ${PORT_OPTIONS:MPORTSSM} + (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libmozjs24-ps-release.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) +.endif ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/0ad/pkg-plist ============================================================================== --- head/games/0ad/pkg-plist Mon Dec 29 23:06:29 2014 (r375809) +++ head/games/0ad/pkg-plist Mon Dec 29 23:45:40 2014 (r375810) @@ -3,7 +3,7 @@ bin/0ad bin/ActorEditor lib/0ad/libAtlasUI.so lib/0ad/libCollada.so -lib/0ad/libmozjs24-ps-release.so +%%NO_PORTSSM%%lib/0ad/libmozjs24-ps-release.so lib/0ad/libnvcore.so lib/0ad/libnvimage.so lib/0ad/libnvmath.so