Date: Fri, 10 Jan 2014 12:13:56 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339345 - in head/games/blockrage: . files Message-ID: <201401101213.s0ACDucr085408@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Fri Jan 10 12:13:56 2014 New Revision: 339345 URL: http://svnweb.freebsd.org/changeset/ports/339345 Log: - Change Desktop entry file - Support STAGEDIR - Simplify REINPLACE_CMD - Change files/blockrage.in Modified: head/games/blockrage/Makefile head/games/blockrage/files/blockrage.in Modified: head/games/blockrage/Makefile ============================================================================== --- head/games/blockrage/Makefile Fri Jan 10 11:45:11 2014 (r339344) +++ head/games/blockrage/Makefile Fri Jan 10 12:13:56 2014 (r339345) @@ -18,7 +18,6 @@ LICENSE= GPLv2 USE_SDL= sdl image mixer GNU_CONFIGURE= yes ALL_TARGET= ${PORTNAME} -MAN6= ${PORTNAME}.6 PORTDOCS= ChangeLog KNOWN_BUGS README TODO @@ -27,43 +26,39 @@ ICON_SIZES= 32x32 48x48 64x64 72x72 96x9 SUB_FILES= ${PORTNAME} -DESKTOP_ENTRIES="Block Rage" "${COMMENT}" ${PORTNAME} \ - "${PORTNAME}" "Game;ArcadeGame;" false +DESKTOP_ENTRIES="Block Rage" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" OPTIONS_DEFINE= DOCS -NO_STAGE= yes -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} \ - -e 's|prefix=/usr/local|prefix=${PREFIX}|' \ - -e 's|MYCC=gcc|MYCC?=${CC}|' \ - -e 's|-s -O2 -Wall||' \ - -e 's|sdl-config|$(SDL_CONFIG)|' \ - -e 's|MAKE=make|MAKE=${MAKE}|' \ + -e 's|prefix=/usr/local|prefix=${PREFIX}| ; \ + s|MYCC=gcc|MYCC?=${CC}| ; \ + s|-s -O2 -Wall|| ; \ + s|sdl-config|$(SDL_CONFIG)| ; \ + s|MAKE=make|MAKE=${MAKE}|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gcc -s|${CC}|' \ ${WRKSRC}/src/Makefile.in do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} .for s in ${ICON_SIZES} - @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ - ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ - ${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6/ + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/games/blockrage/files/blockrage.in ============================================================================== --- head/games/blockrage/files/blockrage.in Fri Jan 10 11:45:11 2014 (r339344) +++ head/games/blockrage/files/blockrage.in Fri Jan 10 12:13:56 2014 (r339345) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -exec ./blockrage +exec ./blockrage "${@}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401101213.s0ACDucr085408>