From owner-svn-ports-all@FreeBSD.ORG Wed Nov 20 01:58:25 2013 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 50C03192; Wed, 20 Nov 2013 01:58: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 3181A2D4E; Wed, 20 Nov 2013 01:58: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 rAK1wPjb072963; Wed, 20 Nov 2013 01:58:25 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAK1wPnk072962; Wed, 20 Nov 2013 01:58:25 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201311200158.rAK1wPnk072962@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Wed, 20 Nov 2013 01:58:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334367 - head/games/evq3 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 01:58:25 -0000 Author: danilo Date: Wed Nov 20 01:58:24 2013 New Revision: 334367 URL: http://svnweb.freebsd.org/changeset/ports/334367 Log: - Convert LIB_DEPENDS to new syntax - Improve COMMENT - Add stage support Modified: head/games/evq3/Makefile Modified: head/games/evq3/Makefile ============================================================================== --- head/games/evq3/Makefile Tue Nov 19 23:59:35 2013 (r334366) +++ head/games/evq3/Makefile Wed Nov 20 01:58:24 2013 (r334367) @@ -12,9 +12,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org -COMMENT= The Marriage of XreaL and Icculus.org Q3 w/ Improvements +COMMENT= Marriage of XreaL and Icculus.org Q3 w/ Improvements -LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 USES= gmake dos2unix USE_BZIP2= yes @@ -24,7 +24,7 @@ CFLAGS+= -DMAP_ANONYMOUS=MAP_ANON OPTIONS_DEFINE= CURL CURL_DLOPEN GAMELIBS OPENAL OPENAL_DLOPEN VOIP VORBIS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS SMP VORBIS -OPTIONS_MULTI= TYPE +OPTIONS_MULTI= TYPE OPTIONS_MULTI_TYPE= CLIENT DEDICATED SMP CLIENT_DESC= Build client CURL_DLOPEN_DESC= Enable dynamic loading of curl @@ -42,7 +42,6 @@ PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\ LIBDIR= ${PREFIX}/lib/${PORTNAME} VM_ARCHS= amd64 i386 -NO_STAGE= yes .include "${.CURDIR}/../quake3-data/Makefile.include" .include @@ -60,7 +59,7 @@ MAKE_ENV+= HAVE_VM_COMPILED=true .if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP) # curl . if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl MAKE_ENV+= USE_CURL=1 . if ${PORT_OPTIONS:MCURL_DLOPEN} MAKE_ENV+= USE_CURL_DLOPEN=1 @@ -78,12 +77,12 @@ MAKE_ENV+= USE_OPENAL_DLOPEN=1 USE_SDL= sdl # VOIP . if ${PORT_OPTIONS:MVOIP} -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex MAKE_ENV+= USE_VOIP=1 . endif # Vorbis . if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis +LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif @@ -132,22 +131,20 @@ post-patch: ${WRKSRC}/code/qcommon/vm_x86.c do-install: - ${MKDIR} ${LIBDIR}/baseq3 + @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq3 ${INSTALL_DATA} ${DISTDIR}/pak-evq3.pk3 ${DISTDIR}/pak-5evq3.pk3 \ - ${LIBDIR}/baseq3 + ${STAGEDIR}${LIBDIR}/baseq3 .for bin in ${Q3BIN} - ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) . for dir in baseq3 missionpack - ${MKDIR} ${LIBDIR}/${dir} - ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${dir}/*.so ${LIBDIR}/${dir} + @${MKDIR} ${STAGEDIR}${LIBDIR}/${dir} + ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${dir}/*.so ${STAGEDIR}${LIBDIR}/${dir} . endfor .endif -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} maint-gen-distfile: @if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \