Date: Mon, 18 Dec 2017 11:43:55 +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: r456622 - head/games/odamex Message-ID: <201712181143.vBIBhtkA067685@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Dec 18 11:43:55 2017 New Revision: 456622 URL: https://svnweb.freebsd.org/changeset/ports/456622 Log: - Fix LICENSE - Switch to options helpers - Don't install LICENSE with docs Modified: head/games/odamex/Makefile head/games/odamex/pkg-plist Modified: head/games/odamex/Makefile ============================================================================== --- head/games/odamex/Makefile Mon Dec 18 11:23:13 2017 (r456621) +++ head/games/odamex/Makefile Mon Dec 18 11:43:55 2017 (r456622) @@ -11,7 +11,7 @@ DISTNAME= odamex-src-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Client/server multiplayer engine for Doom -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USE_SDL= sdl mixer @@ -28,8 +28,6 @@ LAUNCHER_USE= WX=3.0 LAUNCHER_CMAKE_ON= -DODALAUNCH_TARGET=on -DNO_AG-ODALAUNCH_TARGET=off -DwxWidgets_CONFIG_EXECUTABLE=${PREFIX}/bin/wxgtk2u-3.0-config LAUNCHER_CMAKE_OFF= -DODALAUNCH_TARGET=off -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|; \ s|%%DATADIR%%|${DATADIR}|' \ @@ -45,26 +43,23 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/client/odamex ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/server/odasrv ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MLAUNCHER} - ${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${STAGEDIR}${PREFIX}/bin -.endif @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/odamex.wad ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR} .for f in odamex odasrv ${INSTALL_DATA} ${WRKSRC}/media/icon_${f}_*.png ${STAGEDIR}${PREFIX}/share/pixmaps .endfor -.if ${PORT_OPTIONS:MLAUNCHER} - ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${STAGEDIR}${PREFIX}/share/pixmaps -.endif .for f in odamex odasrv ${INSTALL_DATA} ${WRKSRC}/installer/arch/${f}.desktop ${STAGEDIR}${PREFIX}/share/applications .endfor -.if ${PORT_OPTIONS:MLAUNCHER} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + +do-install-LAUNCHER-on: + ${INSTALL_PROGRAM} ${WRKSRC}/odalaunch/odalaunch ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/media/icon_odalaunch_*.png ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/installer/arch/odalaunch.desktop ${STAGEDIR}${PREFIX}/share/applications -.endif .include "${.CURDIR}/../doom-data/Makefile.include" Modified: head/games/odamex/pkg-plist ============================================================================== --- head/games/odamex/pkg-plist Mon Dec 18 11:23:13 2017 (r456621) +++ head/games/odamex/pkg-plist Mon Dec 18 11:43:55 2017 (r456622) @@ -17,5 +17,4 @@ share/pixmaps/icon_odasrv_256.png share/pixmaps/icon_odasrv_512.png share/pixmaps/icon_odasrv_96.png %%DATADIR%%/odamex.wad -%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712181143.vBIBhtkA067685>