Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Oct 2014 09:06:53 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371245 - head/games/warsow
Message-ID:  <201410200906.s9K96rcT020116@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Mon Oct 20 09:06:53 2014
New Revision: 371245
URL: https://svnweb.freebsd.org/changeset/ports/371245
QAT: https://qat.redports.org/buildarchive/r371245/

Log:
  games/warsow: Add USES=alias plus...
  
  While adding USES=alias to warsow under blanket permission, I decided
  to bring in other changes from DPorts:
    * define LDFLAGS=-L${LOCALBASE}/lib (required for compilers that don't
      search /usr/local/lib by default)
    * Only change x86_64 arch if the OPSYS is FreeBSD.  Doing this breaks
      DragonFly
  
  The total sum of these changes for FreeBSD is no-op.

Modified:
  head/games/warsow/Makefile

Modified: head/games/warsow/Makefile
==============================================================================
--- head/games/warsow/Makefile	Mon Oct 20 09:03:09 2014	(r371244)
+++ head/games/warsow/Makefile	Mon Oct 20 09:06:53 2014	(r371245)
@@ -18,12 +18,13 @@ RUN_DEPENDS=	${DATADIR}/basewsw/data1_15
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		gmake compiler:c++11-lang
+USES=		alias gmake compiler:c++11-lang
 
 WRKSRC=		${WRKDIR}/source/source
 ALL_TARGET=	game angelwrap
 RELEASEDIR=	${WRKSRC}/release
 AS_SDK_DIR=	${WRKSRC}/../libsrcs/angelscript/sdk
+LDFLAGS=	-L${LOCALBASE}/lib
 
 PORTDATA=	*
 PORTDOCS=	*.rtf *.doc sourcecode_quickstart.txt
@@ -111,6 +112,10 @@ ALL_TARGET+=	tv_server
 PLIST_FILES+=	bin/wswtv_server
 .endif
 
+.if ${OPSYS} == FreeBSD
+SWAPARCH=	s/x86_64/amd64/
+.endif
+
 post-patch: .SILENT
 # Unmute build and link commands, respect CFLAGS
 	${REINPLACE_CMD} -e 's|@$$(DO_CC|$$(DO_CC| ; /> Linking $$@/d ; \
@@ -118,7 +123,7 @@ post-patch: .SILENT
 		s| -msse2||' \
 		${WRKSRC}/Makefile
 # Adjust architecture names, get rid of ``freebsd_'' prefix
-	${REINPLACE_CMD} -e 's/x86_64/amd64/ ; s/freebsd_//' \
+	${REINPLACE_CMD} -e 's/freebsd_//; ${SWAPARCH}' \
 		${WRKSRC}/gameshared/q_arch.h
 # Search directory provided by warsow-data port instead of current (doing
 # so allows us not to install any wrapper scripts)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410200906.s9K96rcT020116>