From owner-svn-ports-all@FreeBSD.ORG Fri Apr 18 10:24:08 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD28532D; Fri, 18 Apr 2014 10:24:08 +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 9DD511E03; Fri, 18 Apr 2014 10:24:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IAO8sf084845; Fri, 18 Apr 2014 10:24:08 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IAO8a9084842; Fri, 18 Apr 2014 10:24:08 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404181024.s3IAO8a9084842@svn.freebsd.org> From: Pawel Pekala Date: Fri, 18 Apr 2014 10:24:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351528 - in branches/2014Q2/games/q3cellshading: . files 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, 18 Apr 2014 10:24:08 -0000 Author: pawel Date: Fri Apr 18 10:24:07 2014 New Revision: 351528 URL: http://svnweb.freebsd.org/changeset/ports/351528 QAT: https://qat.redports.org/buildarchive/r351528/ Log: MFH: r351523 - Fix build with clang (global var defined as static, unrecognized compiler arguments) - Add staging support - Use options subs Approved by: portmgr (erwin) Added: branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c - copied unchanged from r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c Modified: branches/2014Q2/games/q3cellshading/Makefile branches/2014Q2/games/q3cellshading/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/q3cellshading/Makefile ============================================================================== --- branches/2014Q2/games/q3cellshading/Makefile Fri Apr 18 09:40:35 2014 (r351527) +++ branches/2014Q2/games/q3cellshading/Makefile Fri Apr 18 10:24:07 2014 (r351528) @@ -14,9 +14,10 @@ COMMENT= Quake III engine with Cell Shad ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option -USES= gmake dos2unix zip +USES= compiler dos2unix gmake zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/code/unix +MAKE_JOBS_UNSAFE= yes LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" @@ -28,13 +29,13 @@ OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAG OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED SMP_CLIENT OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT +OPTIONS_SUB= yes CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAMELIBS_DESC= Force building game libraries SMP_CLIENT_DESC= Build SMP (threaded) client -NO_STAGE= yes .include .if ${ARCH} == "i386" @@ -58,25 +59,16 @@ USE_XORG= xxf86dga .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES -PLIST_SUB+= CLIENT="" Q3BIN+= quake3 -.else -PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES -PLIST_SUB+= DEDICATED="" Q3BIN+= q3ded -.else -PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES -PLIST_SUB+= GAMELIBS="" -.else -PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -85,10 +77,7 @@ MAKE_ENV+= OPTIMIZED_CFLAGS=YES .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}" -PLIST_SUB+= SMP="" Q3BIN+= quake3-smp -.else -PLIST_SUB+= SMP="@comment " .endif post-patch: @@ -98,17 +87,22 @@ post-patch: 's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \ ${WRKSRC}/code/botlib/be_interface.c \ ${WRKSRC}/code/renderer/tr_init.c +.if ${COMPILER_TYPE} == clang + @${REINPLACE_CMD} -E 's,-falign-(jumps|loops)=2,,g; s|-O6||' \ + ${WRKSRC}/code/unix/Makefile +.endif do-install: .for bin in ${Q3BIN} # Adjust program names to avoid conflicts with other Quake3 ports ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \ - ${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} + ${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) .for dir in baseq3 missionpack - @${MKDIR} ${LIBDIR}/${dir} - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir} + @${MKDIR} ${STAGEDIR}${LIBDIR}/${dir} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \ + ${STAGEDIR}${LIBDIR}/${dir} .endfor .endif Copied: branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c (from r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q2/games/q3cellshading/files/patch-code-qcommon-vm_x86.c Fri Apr 18 10:24:07 2014 (r351528, copy of r351523, head/games/q3cellshading/files/patch-code-qcommon-vm_x86.c) @@ -0,0 +1,11 @@ +--- code/qcommon/vm_x86.c.orig 2014-04-17 13:05:34.157088687 +0200 ++++ code/qcommon/vm_x86.c 2014-04-17 12:58:45.706901862 +0200 +@@ -84,7 +84,7 @@ + #endif // !_WIN32 + + +-static int callMask = 0; // bk001213 - init ++ int callMask = 0; // bk001213 - init + + static int instruction, pass; + static int lastConst = 0; Modified: branches/2014Q2/games/q3cellshading/pkg-plist ============================================================================== --- branches/2014Q2/games/q3cellshading/pkg-plist Fri Apr 18 09:40:35 2014 (r351527) +++ branches/2014Q2/games/q3cellshading/pkg-plist Fri Apr 18 10:24:07 2014 (r351528) @@ -1,6 +1,6 @@ %%DEDICATED%%bin/q3celded %%CLIENT%%bin/quake3cel -%%SMP%%bin/quake3cel-smp +%%SMP_CLIENT%%bin/quake3cel-smp %%GAMELIBS%%%%LIBDIR%%/baseq3/cgame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/qagame.so %%GAMELIBS%%%%LIBDIR%%/baseq3/ui.so