From owner-svn-ports-all@FreeBSD.ORG Wed Nov 20 03:16:25 2013 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 67D3D2F3; Wed, 20 Nov 2013 03:16:25 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5826226BF; Wed, 20 Nov 2013 03:16:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAK3GPQ4002146; Wed, 20 Nov 2013 03:16:25 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAK3GPlW002144; Wed, 20 Nov 2013 03:16:25 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311200316.rAK3GPlW002144@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Wed, 20 Nov 2013 03:16:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334375 - in head/games/tremulous: . files X-SVN-Group: ports-head 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.16 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: Wed, 20 Nov 2013 03:16:25 -0000 Author: danilo Date: Wed Nov 20 03:16:24 2013 New Revision: 334375 URL: http://svnweb.freebsd.org/changeset/ports/334375 Log: - Convert USE_GMAKE to USES - Convert LIB_DEPENDS to new syntax - Remove the linker's parameter -static on module master_server - Add stage support Modified: head/games/tremulous/Makefile head/games/tremulous/files/patch-src__master__Makefile Modified: head/games/tremulous/Makefile ============================================================================== --- head/games/tremulous/Makefile Wed Nov 20 03:15:07 2013 (r334374) +++ head/games/tremulous/Makefile Wed Nov 20 03:16:24 2013 (r334375) @@ -12,8 +12,8 @@ COMMENT= Free FPS game featuring two opp LICENSE= GPLv2 +USES= gmake USE_ZIP= yes -USE_GMAKE= yes MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" WRKSRC= ${WRKDIR}/${PORTNAME} @@ -37,7 +37,6 @@ SDL_AUDIO_DESC= Use SDL for audio SDL_VIDEO_DESC= Use SDL for video SMP_CLIENT_DESC= Build SMP (threaded) client -NO_STAGE= yes .include .for arch in ${ARCH} @@ -73,7 +72,7 @@ USE_XORG= x11 xxf86dga . endif # Vorbis . if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif @@ -102,7 +101,7 @@ PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MMASTER_SERVER} -LIB_DEPENDS+= tdb:${PORTSDIR}/databases/tdb +LIB_DEPENDS+= libtdb.so:${PORTSDIR}/databases/tdb MAKE_ENV+= BUILD_MASTER_SERVER=1 PLIST_SUB+= MASTER_SERVER="" .else @@ -130,19 +129,14 @@ post-patch: do-install: .for bin in ${TRBIN} - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/build/release/${bin} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/build/release/${bin} ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MMASTER_SERVER} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/master/release/tremmaster \ - ${PREFIX}/bin + ${STAGEDIR}${PREFIX}/bin .endif - @${MKDIR} ${DATADIR}/base - ${INSTALL_DATA} ${WRKSRC}/base/* ${DATADIR}/base - ${INSTALL_DATA} ${WRKSRC}/tremulous.xpm ${PREFIX}/share/pixmaps - -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + @${MKDIR} ${STAGEDIR}${DATADIR}/base + ${INSTALL_DATA} ${WRKSRC}/base/* ${STAGEDIR}${DATADIR}/base + ${INSTALL_DATA} ${WRKSRC}/tremulous.xpm ${STAGEDIR}${PREFIX}/share/pixmaps .include Modified: head/games/tremulous/files/patch-src__master__Makefile ============================================================================== --- head/games/tremulous/files/patch-src__master__Makefile Wed Nov 20 03:15:07 2013 (r334374) +++ head/games/tremulous/files/patch-src__master__Makefile Wed Nov 20 03:16:24 2013 (r334375) @@ -1,5 +1,5 @@ ---- ./tremulous-1.1.0-src/src/master/Makefile.orig Fri Jan 20 20:37:31 2006 -+++ ./tremulous-1.1.0-src/src/master/Makefile Wed Jun 7 16:57:12 2006 +--- ./tremulous-1.1.0-src/src/master/Makefile.orig 2006-01-20 21:37:31.000000000 -0200 ++++ ./tremulous-1.1.0-src/src/master/Makefile 2013-11-20 01:02:22.000000000 -0200 @@ -1,5 +1,5 @@ BD_DEBUG=debug-$(PLATFORM)-$(ARCH) -BD_RELEASE=release-$(PLATFORM)-$(ARCH) @@ -7,7 +7,15 @@ ifeq ($(PLATFORM),mingw32) BINEXT=.exe -@@ -15,9 +15,11 @@ +@@ -9,15 +9,17 @@ + MKDIR=mkdir + else + BINEXT= +- RELEASE_LDFLAGS=-static -ltdb +- DEBUG_LDFLAGS=-static -ltdb ++ RELEASE_LDFLAGS=-ltdb ++ DEBUG_LDFLAGS=-ltdb + RM=rm -f MKDIR=mkdir endif