From owner-svn-ports-head@FreeBSD.ORG Mon Oct 20 09:06:53 2014 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 EFD2A1D6; Mon, 20 Oct 2014 09:06: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 C35A825A; Mon, 20 Oct 2014 09:06: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 s9K96rqO020117; Mon, 20 Oct 2014 09:06:53 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9K96rcT020116; Mon, 20 Oct 2014 09:06:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410200906.s9K96rcT020116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 20 Oct 2014 09:06:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371245 - head/games/warsow 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, 20 Oct 2014 09:06:54 -0000 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)