Date: Wed, 27 May 2015 01:11:15 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387534 - in head/games: nexuiz xonotic xonotic/files Message-ID: <201505270111.t4R1BFwu007822@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed May 27 01:11:14 2015 New Revision: 387534 URL: https://svnweb.freebsd.org/changeset/ports/387534 Log: - Fix shebangs - Improve WRKSRC handling Modified: head/games/nexuiz/Makefile head/games/xonotic/Makefile head/games/xonotic/files/patch-source__darkplaces__BSDmakefile Modified: head/games/nexuiz/Makefile ============================================================================== --- head/games/nexuiz/Makefile Wed May 27 01:08:17 2015 (r387533) +++ head/games/nexuiz/Makefile Wed May 27 01:11:14 2015 (r387534) @@ -3,7 +3,7 @@ PORTNAME= nexuiz PORTVERSION= 2.5.2 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/NexuizRelease/Nexuiz%20${PORTVERSION} \ SF/${PORTNAME}/mappack/nexmappack_r2:mappack @@ -17,12 +17,14 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/ libjpeg.so:${PORTSDIR}/graphics/jpeg LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/../../gpl.txt +LICENSE_FILE= ${WRKSRC}/gpl.txt MANUAL_PACKAGE_BUILD= huge (880MiB) -USES= zip:infozip -WRKSRC= ${WRKDIR}/Nexuiz/sources/darkplaces +USES= shebangfix zip:infozip +SHEBANG_FILES= server/rcon.pl server/rcon2irc/rcon2irc.pl +WRKSRC= ${WRKDIR}/Nexuiz +BUILD_WRKSRC= ${WRKSRC}/sources/darkplaces MAKEFILE= BSDmakefile MAKE_ARGS= DP_FS_BASEDIR="${DATADIR}" CC="${CC}" \ DP_PRELOAD_DEPENDENCIES=yes DP_LINK_TO_LIBJPEG=yes \ @@ -96,31 +98,31 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ - ${WRKSRC}/${MAKEFILE} ${WRKSRC}/makefile.inc + ${BUILD_WRKSRC}/${MAKEFILE} ${BUILD_WRKSRC}/makefile.inc @${REINPLACE_CMD} -e '/LDFLAGS_BSDSV/s,$$,-L${LOCALBASE}/lib,' \ - ${WRKSRC}/makefile.inc + ${BUILD_WRKSRC}/makefile.inc # Fix for libpng 1.4 @${REINPLACE_CMD} -e 's,gray_1_2_4_to_8,expand_&,g' \ - ${WRKSRC}/image_png.c + ${BUILD_WRKSRC}/image_png.c do-install: .if ${PORT_OPTIONS:MCLIENT} - ${INSTALL_PROGRAM} ${WRKDIR}/Nexuiz/sources/darkplaces/darkplaces-glx ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-glx + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-glx ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-glx .endif .if ${PORT_OPTIONS:MSDL_CLIENT} - ${INSTALL_PROGRAM} ${WRKDIR}/Nexuiz/sources/darkplaces/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-sdl + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/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 + ${INSTALL_DATA} ${BUILD_WRKSRC}/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} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated + cd ${WRKSRC} && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR} # Fixup lost +x permissions on scripts after COPYTREE_SHARE ${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} + cd ${WRKSRC} && ${COPYTREE_SHARE} "data havoc" ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MMAPPACK} ${INSTALL_DATA} ${WRKDIR}/data/*.pk3 ${STAGEDIR}${DATADIR}/data .endif Modified: head/games/xonotic/Makefile ============================================================================== --- head/games/xonotic/Makefile Wed May 27 01:08:17 2015 (r387533) +++ head/games/xonotic/Makefile Wed May 27 01:11:14 2015 (r387534) @@ -3,6 +3,7 @@ PORTNAME= xonotic PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://nl.dl.xonotic.org/ \ http://mirror.bitmissile.com/xonotic/releases/ @@ -16,8 +17,10 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/ MANUAL_PACKAGE_BUILD= huge (930M) -USES= zip:infozip -WRKSRC= ${WRKDIR}/Xonotic/source/darkplaces +USES= shebangfix zip:infozip +SHEBANG_FILES= server/rcon.pl server/rcon2irc/rcon2irc.pl +WRKSRC= ${WRKDIR}/Xonotic +BUILD_WRKSRC= ${WRKSRC}/source/darkplaces MAKEFILE= BSDmakefile MAKE_ARGS= DP_FS_BASEDIR="${DATADIR}" \ DP_PRELOAD_DEPENDENCIES=yes \ @@ -69,27 +72,27 @@ PLIST_FILES+= bin/${PORTNAME}-dedicated post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ - ${WRKSRC}/${MAKEFILE} ${WRKSRC}/makefile.inc + ${BUILD_WRKSRC}/${MAKEFILE} ${BUILD_WRKSRC}/makefile.inc @${REINPLACE_CMD} -e '/LDFLAGS_BSDSV/s,$$,-L${LOCALBASE}/lib,' \ - ${WRKSRC}/makefile.inc - @${ECHO_CMD} >> ${WRKSRC}/prvm_offsets.h # silence 'no newline' warnings + ${BUILD_WRKSRC}/makefile.inc + @${ECHO_CMD} >> ${BUILD_WRKSRC}/prvm_offsets.h # silence 'no newline' warnings do-install: .if ${PORT_OPTIONS:MCLIENT} - ${INSTALL_PROGRAM} ${WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKDIR}/Xonotic/misc/logos/icons_ico/xonotic.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_ico/xonotic.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ .endif .if ${PORT_OPTIONS:MDEDICATED} - ${INSTALL_PROGRAM} ${WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated - cd ${WRKDIR}/Xonotic && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR}/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated + cd ${WRKSRC} && ${COPYTREE_SHARE} "server" ${STAGEDIR}${DATADIR}/ # Fixup lost +x permissions on scripts after COPYTREE_SHARE ${FIND} ${STAGEDIR}${DATADIR}/server -type f -name *.sh -o -name rcon*.pl | \ ${XARGS} ${CHMOD} +x .endif ${MKDIR} ${STAGEDIR}${DATADIR}/data - ${INSTALL_DATA} ${WRKDIR}/Xonotic/data/*.pk3 ${STAGEDIR}${DATADIR}/data/ + ${INSTALL_DATA} ${WRKSRC}/data/*.pk3 ${STAGEDIR}${DATADIR}/data/ .if ${PORT_OPTIONS:MENCRYPTION} - ${INSTALL_DATA} ${WRKDIR}/Xonotic/key_0.d0pk ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/key_0.d0pk ${STAGEDIR}${DATADIR}/ .endif .include <bsd.port.mk> Modified: head/games/xonotic/files/patch-source__darkplaces__BSDmakefile ============================================================================== --- head/games/xonotic/files/patch-source__darkplaces__BSDmakefile Wed May 27 01:08:17 2015 (r387533) +++ head/games/xonotic/files/patch-source__darkplaces__BSDmakefile Wed May 27 01:11:14 2015 (r387534) @@ -1,5 +1,5 @@ ---- BSDmakefile.orig 2015-01-17 02:24:24.000000000 +0300 -+++ BSDmakefile 2015-01-17 02:26:51.000000000 +0300 +--- source/darkplaces/BSDmakefile.orig 2015-01-17 02:24:24.000000000 +0300 ++++ source/darkplaces/BSDmakefile 2015-01-17 02:26:51.000000000 +0300 @@ -158,7 +158,7 @@ CFLAGS_MAKEDEP=-MD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505270111.t4R1BFwu007822>