Index: games/assaultcube/Makefile =================================================================== --- games/assaultcube/Makefile +++ games/assaultcube/Makefile @@ -23,13 +23,14 @@ LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept -USES= gmake openal:al tar:bzip2 +USES= gmake tar:bzip2 GNU_CONFIGURE= yes ALL_TARGET= libenet WRKSRC= ${WRKDIR}/AssaultCube_v${PORTVERSION} CONFIGURE_ARGS= --enable-shared=no --enable-static=yes CONFIGURE_WRKSRC= ${WRKSRC}/source/enet BUILD_WRKSRC= ${WRKSRC}/source/src +SUB_FILES= ${PLIST_FILES:Mbin/*:T} PORTDATA= config packages scripts PORTDOCS= * @@ -42,43 +43,38 @@ DEDICATED_DESC= Build dedicated server MASTER_DESC= Build master server +CLIENT_USES= gettext openal:al +CLIENT_USE= GL=gl SDL=image XORG=x11 +CLIENT_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \ + libcurl.so:${PORTSDIR}/ftp/curl +CLIENT_ALL_TARGET= client +CLIENT_PLIST_FILES= bin/${PORTNAME}_client libexec/${PORTNAME}_client \ + share/pixmaps/${PORTNAME}.png +DEDICATED_ALL_TARGET= server +DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server +MASTER_ALL_TARGET= master + .include .if ${PORT_OPTIONS:MCLIENT} -LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl -USES+= gettext -USE_GL= yes -USE_SDL= image mixer sdl -ALL_TARGET+= client -SUB_FILES+= ${PORTNAME}_client -ACUBE_BIN+= client - DESKTOP_ENTRIES="AssaultCube" "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.png" "${PORTNAME}_client" \ "Game;" false .endif -.if ${PORT_OPTIONS:MDEDICATED} -ALL_TARGET+= server -SUB_FILES+= ${PORTNAME}_server -ACUBE_BIN+= server -.endif - -.if ${PORT_OPTIONS:MMASTER} -ALL_TARGET+= master -SUB_FILES+= ${PORTNAME}_master -ACUBE_BIN+= master -.endif - pre-install: .SILENT # Current STAGEDIR doesn't create empty directories for package, # in case of dynamically generated TMPPLIST, where these directories exist ${RMDIR} ${WRKSRC}/packages/maps/servermaps/incoming do-install: -.for f in ${ACUBE_BIN} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ac_${f} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_${f} +.for f in ${PLIST_FILES:Mbin/*} + ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f} +.endfor +.for f in ${PLIST_FILES:Mlibexec/*} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T:S/assaultcube/ac/} \ + ${STAGEDIR}${PREFIX}/${f} .endfor @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} @@ -88,13 +84,4 @@ ${INSTALL_DATA} ${WRKSRC}/docs/images/icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .endif -post-install: -.for f in ${ACUBE_BIN} - @${ECHO_CMD} bin/${PORTNAME}_${f} >> ${TMPPLIST} - @${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST} -.endfor -.if ${PORT_OPTIONS:MCLIENT} - @${ECHO_CMD} share/pixmaps/${PORTNAME}.png >> ${TMPPLIST} -.endif - .include Index: games/bloodfrontier/Makefile =================================================================== --- games/bloodfrontier/Makefile +++ games/bloodfrontier/Makefile @@ -18,11 +18,10 @@ CONFIGURE_WRKSRC= ${WRKSRC}/src/enet BUILD_WRKSRC= ${WRKSRC}/src WRKSRC= ${WRKDIR}/${PORTNAME} -USE_XORG= x11 -ALL_TARGET= libenet ${BINARIES} +ALL_TARGET= libenet -SUB_FILES= bfclient bfserver +SUB_FILES= ${PLIST_FILES:Mbin/*:T} PORTDATA= * @@ -34,6 +33,15 @@ CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server +CLIENT_USE= GL=gl SDL=image,mixer XORG=x11 +CLIENT_ALL_TARGET= client +CLIENT_PLIST_FILES= bin/bfclient libexec/bfclient \ + share/pixmaps/${PORTNAME}.ico +DEDICATED_PLIST_FILES= bin/bfserver libexec/bfserver +OPTIMIZED_CFLAGS_CFLAGS= -O3 -fomit-frame-pointer +OPTIMIZED_CFLAGS_CXXFLAGS= -O3 -fomit-frame-pointer +DEDICATED_ALL_TARGET= server + .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" @@ -41,11 +49,6 @@ .endif .if ${PORT_OPTIONS:MCLIENT} -USE_GL= yes -USE_SDL= image mixer sdl -PLIST_FILES+= bin/bfclient libexec/bfclient share/pixmaps/${PORTNAME}.ico -BINARIES+= client - DESKTOP_ENTRIES="Blood Frontier" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ @@ -54,20 +57,14 @@ "" .endif -.if ${PORT_OPTIONS:MDEDICATED} -PLIST_FILES+= bin/bfserver libexec/bfserver -BINARIES+= server -.endif - -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -fomit-frame-pointer -CXXFLAGS+= -O3 -fomit-frame-pointer -.endif - do-install: -.for f in ${BINARIES} - ${INSTALL_SCRIPT} ${WRKDIR}/bf${f} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bf${f} ${STAGEDIR}${PREFIX}/libexec +.for f in ${PLIST_FILES:Mbin/*} + ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f} +.endfor +.for f in ${PLIST_FILES:Mlibexec/*} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f:H} .endfor .if ${PORT_OPTIONS:MCLIENT} ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.ico ${STAGEDIR}${PREFIX}/share/pixmaps Index: games/cube/Makefile =================================================================== --- games/cube/Makefile +++ games/cube/Makefile @@ -15,7 +15,6 @@ USES= dos2unix gmake ALL_TARGET= # -USE_XORG= x11 CFLAGS+= -fsigned-char WRKSRC= ${WRKDIR}/${PORTNAME}_source/src @@ -36,20 +35,19 @@ OPTIONS_SUB= yes +CLIENT_USE= GL=glu SDL=image,mixer,sdl XORG=x11 +CLIENT_LDFLAGS= -lX11 +CLIENT_ALL_TARGET= client OPTIMIZED_CFLAGS_CFLAGS= -O3 -fomit-frame-pointer +SERVER_ALL_TARGET= server .include .if ${PORT_OPTIONS:MCLIENT} -USE_GL= glu -USE_SDL= image mixer sdl -ALL_TARGET+= client CUBE_BIN+= client -LDFLAGS+= -lX11 .endif .if ${PORT_OPTIONS:MSERVER} -ALL_TARGET+= server CUBE_BIN+= server .endif Index: games/redeclipse/Makefile =================================================================== --- games/redeclipse/Makefile +++ games/redeclipse/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= multi LICENSE= MIT ZLIB -MANUAL_PACKAGE_BUILD= huge +MANUAL_PACKAGE_BUILD= huge (734MiB) USES= tar:bzip2 gmake GNU_CONFIGURE= yes @@ -27,7 +27,7 @@ ALL_TARGET= libenet -SUB_FILES= ${PORTNAME} ${PORTNAME}_server +SUB_FILES= ${PLIST_FILES:Mbin/*:T} PORTDATA= * PORTDOCS= * @@ -41,6 +41,15 @@ CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server +CLIENT_USE= GL=gl SDL=image,mixer XORG=x11 +CLIENT_ALL_TARGET= client +CLIENT_PLIST_FILES= bin/${PORTNAME} libexec/${PORTNAME} \ + share/pixmaps/${PORTNAME}.ico +DEDICATED_ALL_TARGET= server +DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server +OPTIMIZED_CFLAGS_CFLAGS= -O3 -fomit-frame-pointer +OPTIMIZED_CFLAGS_CXXFLAGS= -O3 -fomit-frame-pointer + .include .if ${ARCH} == "sparc64" @@ -48,12 +57,6 @@ .endif .if ${PORT_OPTIONS:MCLIENT} -USE_GL= yes -USE_SDL= image mixer sdl -PLIST_FILES+= bin/${PORTNAME} libexec/${PORTNAME} share/pixmaps/${PORTNAME}.ico -BINARIES+= ${PORTNAME} -ALL_TARGET+= client - DESKTOP_ENTRIES="Red Eclipse" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ @@ -62,21 +65,14 @@ "" .endif -.if ${PORT_OPTIONS:MDEDICATED} -PLIST_FILES+= bin/${PORTNAME}_server libexec/${PORTNAME}_server -BINARIES+= ${PORTNAME}_server -ALL_TARGET+= server -.endif - -.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} -CFLAGS+= -O3 -fomit-frame-pointer -CXXFLAGS+= -O3 -fomit-frame-pointer -.endif - do-install: -.for f in ${BINARIES} - ${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libexec +.for f in ${PLIST_FILES:Mbin/*} + ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f} +.endfor +.for f in ${PLIST_FILES:Mlibexec/*} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f:H} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ Index: games/sauerbraten/Makefile =================================================================== --- games/sauerbraten/Makefile +++ games/sauerbraten/Makefile @@ -34,33 +34,25 @@ DEDICATED_DESC= Build dedicated server MASTER_DESC= Build master server -SUB_FILES= sauer_client sauer_master sauer_server pkg-message +SUB_FILES= pkg-message ${PLIST_FILES:Mbin/*:T} OPTIONS_DEFINE= DOCS +CLIENT_USE= GL=gl SDL=image,mixer XORG=x11 +CLIENT_ALL_TARGET= client +CLIENT_PLIST_FILES= bin/sauer_client libexec/sauer_client +DEDICATED_ALL_TARGET= server +DEDICATED_PLIST_FILES= bin/sauer_server libexec/sauer_server +MASTER_ALL_TARGET= master + .include .if ${PORT_OPTIONS:MCLIENT} -USE_GL= yes -USE_SDL= image mixer sdl -ALL_TARGET+= client -SAUER_BIN+= client - DESKTOP_ENTRIES="Sauerbraten" "${COMMENT}" \ "${PREFIX}/share/${PORTNAME}/data/cube.png" "sauer_client" \ "Game;" false .endif -.if ${PORT_OPTIONS:MDEDICATED} -ALL_TARGET+= server -SAUER_BIN+= server -.endif - -.if ${PORT_OPTIONS:MMASTER} -ALL_TARGET+= master -SAUER_BIN+= master -.endif - post-extract: @${FIND} ${WRKSRC} -type d -name CVS -type d -print0 | \ ${XARGS} -0 ${RM} -R @@ -70,19 +62,17 @@ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} do-install: -.for f in ${SAUER_BIN} - ${INSTALL_SCRIPT} ${WRKDIR}/sauer_${f} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/sauer_${f} ${STAGEDIR}${PREFIX}/libexec +.for f in ${PLIST_FILES:Mbin/*} + ${INSTALL_SCRIPT} ${WRKDIR}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f} +.endfor +.for f in ${PLIST_FILES:Mlibexec/*} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f:T} \ + ${STAGEDIR}${PREFIX}/${f:H} .endfor ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} -post-install: -.for f in ${SAUER_BIN} - @${ECHO_CMD} bin/sauer_${f} >> ${TMPPLIST} - @${ECHO_CMD} libexec/sauer_${f} >> ${TMPPLIST} -.endfor - .include