From owner-svn-ports-all@FreeBSD.ORG Fri Apr 25 14:14:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1526D5D8; Fri, 25 Apr 2014 14:14:12 +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 0160C1926; Fri, 25 Apr 2014 14:14:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PEEBM4065867; Fri, 25 Apr 2014 14:14:11 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PEEBsk065865; Fri, 25 Apr 2014 14:14:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404251414.s3PEEBsk065865@svn.freebsd.org> From: Pawel Pekala Date: Fri, 25 Apr 2014 14:14:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r352130 - branches/2014Q2/games/worldofpadman X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 25 Apr 2014 14:14:12 -0000 Author: pawel Date: Fri Apr 25 14:14:11 2014 New Revision: 352130 URL: http://svnweb.freebsd.org/changeset/ports/352130 QAT: https://qat.redports.org/buildarchive/r352130/ Log: MFH: r352066 - Fix build with clang (global variable defined as static) - Add staging support - Use options subs Approved by: portmgr (erwin) Modified: branches/2014Q2/games/worldofpadman/Makefile branches/2014Q2/games/worldofpadman/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/worldofpadman/Makefile ============================================================================== --- branches/2014Q2/games/worldofpadman/Makefile Fri Apr 25 14:13:06 2014 (r352129) +++ branches/2014Q2/games/worldofpadman/Makefile Fri Apr 25 14:14:11 2014 (r352130) @@ -31,6 +31,7 @@ OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT SERVER SMP_CLIENT OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \ VORBIS SMP_CLIENT +OPTIONS_SUB= yes FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client @@ -40,7 +41,6 @@ GAMELIBS_DESC= Force building game libr OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_CLIENT_DESC= Build SMP (threaded) client -NO_STAGE= yes .include .for arch in ${ARCH} @@ -82,25 +82,16 @@ MAKE_ENV+= USE_CODEC_VORBIS=1 .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 -PLIST_SUB+= CLIENT="" WOPBIN+= wop -.else -PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MSERVER} MAKE_ENV+= BUILD_SERVER=1 -PLIST_SUB+= SERVER="" WOPBIN+= wopded -.else -PLIST_SUB+= SERVER="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 -PLIST_SUB+= GAMELIBS="" -.else -PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MMP3} @@ -114,10 +105,7 @@ MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 -PLIST_SUB+= SMPCLIENT="" WOPBIN+= wop-smp -.else -PLIST_SUB+= SMPCLIENT="@comment " .endif post-extract: @@ -132,25 +120,25 @@ post-patch: # Do not log debug output of bots (can be enabled with "homedir"/"gamedir") @${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \ ${WRKSRC}/code/botlib/be_interface.c + @${REINPLACE_CMD} '/callMask/ s|static||' \ + ${WRKSRC}/code/qcommon/vm_x86.c do-install: - @${MKDIR} ${DATADIR}/wop - ${CP} -a ${WRKDIR}/wop/* ${DATADIR}/wop + @${MKDIR} ${STAGEDIR}${DATADIR}/wop + ${CP} -a ${WRKDIR}/wop/* ${STAGEDIR}${DATADIR}/wop ${INSTALL_DATA} ${WRKDIR}/wop.png \ - ${PREFIX}/share/pixmaps/${PORTNAME}.png + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .for bin in ${WOPBIN} # Rename wop* -> worldofpadman* to avoid conflicts with `games/wop' ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} \ - ${PREFIX}/bin/${bin:S/wop/${PORTNAME}/} + ${STAGEDIR}${PREFIX}/bin/${bin:S/wop/${PORTNAME}/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) - ${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so ${DATADIR}/wop + ${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so \ + ${STAGEDIR}${DATADIR}/wop .endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${CP} -a ${WRKDIR}/readme/* ${DOCSDIR} -.endif - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${CP} -a ${WRKDIR}/readme/* ${STAGEDIR}${DOCSDIR} generate-distfile: @if [ -f ${DISTDIR}/${SRC_FILE}.tar.bz2 ]; then \ Modified: branches/2014Q2/games/worldofpadman/pkg-plist ============================================================================== --- branches/2014Q2/games/worldofpadman/pkg-plist Fri Apr 25 14:13:06 2014 (r352129) +++ branches/2014Q2/games/worldofpadman/pkg-plist Fri Apr 25 14:14:11 2014 (r352130) @@ -1,5 +1,5 @@ %%CLIENT%%bin/worldofpadman -%%SMPCLIENT%%bin/worldofpadman-smp +%%SMP_CLIENT%%bin/worldofpadman-smp %%SERVER%%bin/worldofpadmanded %%PORTDOCS%%%%DOCSDIR%%/banner.html %%PORTDOCS%%%%DOCSDIR%%/copyright_de.html