Date: Wed, 9 Sep 2015 11:14:47 +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: r396467 - head/games/redeclipse Message-ID: <201509091114.t89BElDR045984@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Sep 9 11:14:47 2015 New Revision: 396467 URL: https://svnweb.freebsd.org/changeset/ports/396467 Log: - Switch to options helpers - Simplify - Only use GCC where necessary Modified: head/games/redeclipse/Makefile Modified: head/games/redeclipse/Makefile ============================================================================== --- head/games/redeclipse/Makefile Wed Sep 9 11:14:29 2015 (r396466) +++ head/games/redeclipse/Makefile Wed Sep 9 11:14:47 2015 (r396467) @@ -22,57 +22,57 @@ GH_PROJECT= base USES= gmake BUILD_WRKSRC= ${WRKSRC}/src -USE_GCC= yes # clang dies, see https://llvm.org/bugs/show_bug.cgi?id=23010 SUB_FILES= ${PLIST_FILES:Mbin/*:T} PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -OPTIONS_MULTI= COMPONENTS +OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS +OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED -OPTIONS_DEFAULT=CLIENT DEDICATED OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS -CLIENT_DESC= Build client -CLIENT_USE= GL=gl SDL=image,mixer,sdl XORG=x11 -CLIENT_ALL_TARGET= client -CLIENT_PLIST_FILES= bin/${PORTNAME} libexec/${PORTNAME} \ - share/pixmaps/${PORTNAME}.ico -DEDICATED_DESC= Build dedicated server -DEDICATED_ALL_TARGET= server -DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server +CLIENT_DESC= Build client +CLIENT_USE= GL=gl SDL=image,mixer,sdl XORG=x11 +CLIENT_ALL_TARGET= client +CLIENT_PLIST_FILES= bin/${PORTNAME} libexec/${PORTNAME} \ + share/pixmaps/${PORTNAME}.ico +CLIENT_DESKTOP_ENTRIES= "Red Eclipse" \ + "" \ + "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ + "${PORTNAME}" \ + "Game;Shooter;" \ + "" + +DEDICATED_DESC= Build dedicated server +DEDICATED_ALL_TARGET= server +DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server OPTIMIZED_CFLAGS_CFLAGS= -O3 -fomit-frame-pointer -ffast-math OPTIMIZED_CFLAGS_CXXFLAGS= -O3 -fomit-frame-pointer -ffast-math -.include <bsd.port.options.mk> +.include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MCLIENT} -DESKTOP_ENTRIES="Red Eclipse" \ - "${COMMENT}" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ - "${PORTNAME}" \ - "Game;Shooter;" \ - "" +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1100000 +USE_GCC= yes # clang < 3.6.1 dies, see https://llvm.org/bugs/show_bug.cgi?id=23010 .endif post-patch: @${REINPLACE_CMD} -e 's|CLIENT_PCH=.*|CLIENT_PCH=|' ${WRKSRC}/src/Makefile do-install: -.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}_bsd \ - ${STAGEDIR}${PREFIX}/${f} -.endfor (cd ${WRKSRC} && ${COPYTREE_SHARE} config ${STAGEDIR}${DATADIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) do-install-CLIENT-on: + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}_bsd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}.ico \ ${STAGEDIR}${PREFIX}/share/pixmaps -.include <bsd.port.mk> +do-install-DEDICATED-on: + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}_server ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}_server_bsd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}_server + +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509091114.t89BElDR045984>