From owner-svn-ports-head@FreeBSD.ORG Sat Mar 21 18:22:53 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 787FAADD; Sat, 21 Mar 2015 18:22:53 +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 59C5084E; Sat, 21 Mar 2015 18:22:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2LIMrUr048874; Sat, 21 Mar 2015 18:22:53 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2LIMq2Z048871; Sat, 21 Mar 2015 18:22:52 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201503211822.t2LIMq2Z048871@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 21 Mar 2015 18:22:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381812 - 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: Sat, 21 Mar 2015 18:22:53 -0000 Author: madpilot Date: Sat Mar 21 18:22:51 2015 New Revision: 381812 URL: https://svnweb.freebsd.org/changeset/ports/381812 QAT: https://qat.redports.org/buildarchive/r381812/ Log: - Update to 0.0.18 - Requires newer bundled spidermonkey, so remove option for using the ports provided one - Mark broken on 8.x, fails to build due to libc++/libstdc++ issues Thanks to mandree and to leper(0ad developer) for their suggestions. Modified: head/games/0ad/Makefile head/games/0ad/distinfo head/games/0ad/pkg-plist Modified: head/games/0ad/Makefile ============================================================================== --- head/games/0ad/Makefile Sat Mar 21 18:17:44 2015 (r381811) +++ head/games/0ad/Makefile Sat Mar 21 18:22:51 2015 (r381812) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= 0ad -PORTVERSION= 0.0.17 -PORTREVISION= 4 +PORTVERSION= 0.0.18 CATEGORIES= games MASTER_SITES= SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ @@ -28,7 +27,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-alpha BUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc MAKE_ARGS= config=release -USES= compiler:c++11-lang dos2unix gmake iconv openal:al \ +USES= compiler:c++11-lib dos2unix gmake iconv openal:al \ pkgconfig tar:xz USE_SDL= sdl USE_GNOME= libxml2 gtk20 @@ -41,26 +40,25 @@ 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 +.include -.if ${PORT_OPTIONS:MPORTSSM} -SMOPT= --with-system-mozjs24 +.if ${OSVERSION} < 900044 +BROKEN= Fails to build on FreeBSD 8.x .endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ -e 's|%%CC%%|${CC}|' \ ${WRKSRC}/build/premake/premake4.lua +.if ${ARCH} == i386 && ${CHOSEN_COMPILER_TYPE} == gcc + @${REINPLACE_CMD} -e '1055,1251s/-rdynamic/-lssp_nonshared &/' \ + -e '1441s/"execinfo",/& "ssp_nonshared",/' \ + ${WRKSRC}/build/premake/premake4.lua +.endif @${REINPLACE_CMD} 's,^\(Exec=\)/usr/local,\1${PREFIX},' \ ${WRKSRC}/build/resources/0ad.desktop @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' \ @@ -75,9 +73,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${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 + (cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libmozjs31-ps-release.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) ${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} @@ -86,4 +82,4 @@ do-install: ${TAR} xf ${WRKSRC}/binaries/data/mods/public/public.zip -C ${STAGEDIR}${DATADIR}/mods/public --no-same-permissions ${TAR} xf ${WRKSRC}/binaries/data/mods/mod/mod.zip -C ${STAGEDIR}${DATADIR}/mods/mod --no-same-permissions -.include +.include Modified: head/games/0ad/distinfo ============================================================================== --- head/games/0ad/distinfo Sat Mar 21 18:17:44 2015 (r381811) +++ head/games/0ad/distinfo Sat Mar 21 18:22:51 2015 (r381812) @@ -1,4 +1,4 @@ -SHA256 (0ad-0.0.17-alpha-unix-build.tar.xz) = ef144d44fe8a8abd29a4642999a58a596b8f0d0e1f310065f5ce1dfbe29c3aeb -SIZE (0ad-0.0.17-alpha-unix-build.tar.xz) = 19327284 -SHA256 (0ad-0.0.17-alpha-unix-data.tar.xz) = 6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0 -SIZE (0ad-0.0.17-alpha-unix-data.tar.xz) = 561617008 +SHA256 (0ad-0.0.18-alpha-unix-build.tar.xz) = bd2f04d3269ae9af104626827446a89ea4a0dd4859f89539701fd331cbae0397 +SIZE (0ad-0.0.18-alpha-unix-build.tar.xz) = 26179952 +SHA256 (0ad-0.0.18-alpha-unix-data.tar.xz) = b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 +SIZE (0ad-0.0.18-alpha-unix-data.tar.xz) = 571228108 Modified: head/games/0ad/pkg-plist ============================================================================== --- head/games/0ad/pkg-plist Sat Mar 21 18:17:44 2015 (r381811) +++ head/games/0ad/pkg-plist Sat Mar 21 18:22:51 2015 (r381812) @@ -3,7 +3,7 @@ bin/0ad bin/ActorEditor lib/0ad/libAtlasUI.so lib/0ad/libCollada.so -%%NO_PORTSSM%%lib/0ad/libmozjs24-ps-release.so +lib/0ad/libmozjs31-ps-release.so lib/0ad/libnvcore.so lib/0ad/libnvimage.so lib/0ad/libnvmath.so