From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 01:57:47 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 ESMTP id D3E6DE79; Thu, 17 Oct 2013 01:57:47 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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 B1CD42927; Thu, 17 Oct 2013 01:57:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9H1vl3T033343; Thu, 17 Oct 2013 01:57:47 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9H1vlTB033342; Thu, 17 Oct 2013 01:57:47 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310170157.r9H1vlTB033342@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 17 Oct 2013 01:57:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330593 - head/games/nexuiz 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.14 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: Thu, 17 Oct 2013 01:57:47 -0000 Author: amdmi3 Date: Thu Oct 17 01:57:47 2013 New Revision: 330593 URL: http://svnweb.freebsd.org/changeset/ports/330593 Log: - Support staging - Rework OPTIONS - Use new LIB_DEPENDS syntax - Add DESKTOP_ENTRIES Deleted: head/games/nexuiz/pkg-plist Modified: head/games/nexuiz/Makefile Modified: head/games/nexuiz/Makefile ============================================================================== --- head/games/nexuiz/Makefile Thu Oct 17 01:24:56 2013 (r330592) +++ head/games/nexuiz/Makefile Thu Oct 17 01:57:47 2013 (r330593) @@ -3,7 +3,7 @@ PORTNAME= nexuiz PORTVERSION= 2.5.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \ SF/${PORTNAME}/mappack/nexmappack_r2:mappack @@ -13,8 +13,8 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fast-paced, chaotic, and intense multiplayer first person shooter -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libjpeg.so:${PORTSDIR}/graphics/jpeg LICENSE= GPLv2 @@ -29,61 +29,68 @@ MAKE_ARGS= DP_FS_BASEDIR="${DATADIR}" CC OPTIM_RELEASE="${CFLAGS} -fno-strict-aliasing -funroll-loops" \ STRIP="${STRIP_CMD}" MAKE_JOBS_UNSAFE=yes -ALL_TARGET= # +ALL_TARGET= # empty + +PORTDATA= * OPTIONS_DEFINE= MAPPACK -OPTIONS_MULTI= FLAVOR -OPTIONS_MULTI_FLAVOR= CLIENT SDL_CLIENT SERVER -CLIENT_DESC= Build GLX client -SDL_CLIENT_DESC= Build SDL client -SERVER_DESC= Build dedicated server +OPTIONS_MULTI= COMPONENTS +OPTIONS_MULTI_COMPONENTS=CLIENT SDL_CLIENT DEDICATED +OPTIONS_DEFAULT=MAPPACK CLIENT SDL_CLIENT DEDICATED + MAPPACK_DESC= Install community map pack -FLAVOR_DESC= Executable Selection +CLIENT_DESC= Build GLX client +SDL_CLIENT_DESC=Build SDL client +DEDICATED_DESC= Build dedicated server -OPTIONS_DEFAULT= CLIENT SDL_CLIENT SERVER MAPPAC +CLIENT_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug \ + libpng.so:${PORTSDIR}/graphics/png \ + libtheora.so:${PORTSDIR}/multimedia/libtheora +SDL_CLIENT_LIB_DEPENDS= ${CLIENT_LIB_DEPENDS} +MAPPACK_DISTFILES= nexmappack_r2${EXTRACT_SUFX}:mappack -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MMAPPACK} -DISTFILES+= nexmappack_r2${EXTRACT_SUFX}:mappack -PLIST_SUB+= MAPPACK="" -.else -PLIST_SUB+= MAPPACK="@comment " -.endif - -.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSDL_CLIENT} -LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug \ - png15:${PORTSDIR}/graphics/png \ - theora:${PORTSDIR}/multimedia/libtheora -.endif - .if ${PORT_OPTIONS:MCLIENT} USE_GL= glut USE_XORG= x11 xpm xxf86vm xxf86dga xext ALL_TARGET+= cl-release -PLIST_SUB+= CLIENT="" -.else -PLIST_SUB+= CLIENT="@comment " +PLIST_FILES+= bin/${PORTNAME}-glx + +DESKTOP_ENTRIES="Nexuiz" \ + "${COMMENT}" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ + "${PORTNAME}-glx" \ + "Game;Shooter;" \ + "" .endif .if ${PORT_OPTIONS:MSDL_CLIENT} USE_SDL= sdl ALL_TARGET+= sdl-release -PLIST_SUB+= SDL_CLIENT="" -.else -PLIST_SUB+= SDL_CLIENT="@comment " +PLIST_FILES+= bin/${PORTNAME}-sdl + +# override of DESKTOP_ENTRIES for GLX client is intented +DESKTOP_ENTRIES="Nexuiz" \ + "${COMMENT}" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ + "${PORTNAME}-sdl" \ + "Game;Shooter;" \ + "" .endif -.if ${PORT_OPTIONS:MSERVER} +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSDL_CLIENT} +PLIST_FILES+= share/pixmaps/${PORTNAME}.ico +.endif + +.if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= sv-release -PLIST_SUB+= SERVER="" -.else -PLIST_SUB+= SERVER="@comment " +PLIST_FILES+= bin/${PORTNAME}-dedicated .endif post-extract: - @${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20091001.zip \ + @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${WRKDIR}/Nexuiz/sources/enginesource20091001.zip \ -d ${WRKDIR}/Nexuiz/sources post-patch: @@ -96,20 +103,25 @@ post-patch: ${WRKSRC}/image_png.c do-install: - ${SH} -c '${FIND} ${WRKSRC} -name "darkplaces-*[^vpj]" | \ - while read f ; do ${INSTALL_PROGRAM} $${f} \ - ${PREFIX}/bin/${PORTNAME}-$${f##*-} ; done' - @${MKDIR} ${DATADIR}/data ${DATADIR}/havoc - ${INSTALL_DATA} ${WRKDIR}/Nexuiz/data/*.pk3 ${DATADIR}/data - ${INSTALL_DATA} ${WRKDIR}/Nexuiz/havoc/*.pk3 ${DATADIR}/havoc -.if ${PORT_OPTIONS:MMAPPACK} - ${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${DATADIR}/data +.if ${PORT_OPTIONS:MCLIENT} + ${INSTALL_PROGRAM} ${WRKDIR}/Nexuiz/sources/darkplaces/darkplaces-glx ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-glx .endif -.if ${PORT_OPTIONS:MSERVER} - cd ${WRKDIR}/Nexuiz && ${COPYTREE_SHARE} server ${DATADIR} +.if ${PORT_OPTIONS:MSDL_CLIENT} + ${INSTALL_PROGRAM} ${WRKDIR}/Nexuiz/sources/darkplaces/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-sdl +.endif +.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSDL_CLIENT} + ${INSTALL_DATA} ${WRKDIR}/Nexuiz/sources/darkplaces/nexuiz.ico ${STAGEDIR}${PREFIX}/share/pixmaps +.endif +.if ${PORT_OPTIONS:MDEDICATED} + ${INSTALL_PROGRAM} ${WRKDIR}/Nexuiz/sources/darkplaces/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated + cd ${WRKDIR}/Nexuiz && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR} # Fixup lost +x permissions on scripts after COPYTREE_SHARE - ${FIND} ${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \ + ${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \ ${XARGS} ${CHMOD} +x .endif + cd ${WRKDIR}/Nexuiz && ${COPYTREE_SHARE} "data havoc" ${STAGEDIR}${DATADIR} +.if ${PORT_OPTIONS:MMAPPACK} + ${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${STAGEDIR}${DATADIR}/data +.endif .include