Date: Mon, 13 Jan 2014 23:50:45 +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: r339646 - in head/games/smashbattle: . files Message-ID: <201401132350.s0DNojRU055011@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Mon Jan 13 23:50:44 2014 New Revision: 339646 URL: http://svnweb.freebsd.org/changeset/ports/339646 Log: - USES dos2unix and DOS2UNIX_FILES instead of USE_DOS2UNIX - Support STAGEDIR - Disable all warnings with -w - Change files/smashbattle.in Modified: head/games/smashbattle/Makefile head/games/smashbattle/files/smashbattle.in Modified: head/games/smashbattle/Makefile ============================================================================== --- head/games/smashbattle/Makefile Mon Jan 13 23:30:52 2014 (r339645) +++ head/games/smashbattle/Makefile Mon Jan 13 23:50:44 2014 (r339646) @@ -15,35 +15,34 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/battle/Ba USE_ZIP= yes EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} -USES= gmake +USES= dos2unix gmake +DOS2UNIX_FILES= *.cpp *.h Makefile USE_SDL= sdl image mixer -USE_DOS2UNIX= *.cpp *.h *.ini Makefile ALL_TARGET= battle -NO_STAGE= yes pre-extract: @${MKDIR} ${WRKDIR}/${DISTNAME} SUB_FILES= ${PORTNAME} -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} \ - -e 's|CC=|CC?=|' \ - -e 's|CFLAGS=-c -Wall|CFLAGS += $$(shell sdl-config --cflags) -c -Wall|' \ - -e 's|LDFLAGS=-lSDL -lSDL_mixer -lz -lstdc++|LDFLAGS += $$(shell $${SDL_CONFIG} --libs) -lSDL -lSDL_mixer -lz -lstdc++ -lm|' \ + -e 's|CC=|CC?=| ; \ + s|CFLAGS=-c -Wall|CFLAGS += $$(shell sdl-config --cflags) -c -w| ; \ + s|LDFLAGS=-lSDL -lSDL_mixer -lz -lstdc++|LDFLAGS += $$(shell $${SDL_CONFIG} --libs) -lSDL -lSDL_mixer -lz -lstdc++ -lm|' \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e 's|/usr/share/games/smashbattle/gfx/SB.png|${PORTNAME}|' \ - -e 's|/usr/local/bin/smashbattle|${PORTNAME}|' \ + @${REINPLACE_CMD} -e 's|/usr/share/games/smashbattle/gfx/SB.png|${PORTNAME}| ; \ + s|/usr/local/bin/smashbattle|${PORTNAME}|' \ ${WRKSRC}/linux/*.desktop do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/ - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "gfx music sfx stage" ${DATADIR}) - ${INSTALL_PROGRAM} ${WRKSRC}/battle ${DATADIR}/${PORTNAME} - ${LN} -sf ${DATADIR}/gfx/SB.png ${PREFIX}/share/pixmaps/${PORTNAME}.png -# ${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${PREFIX}/share/applications/ - ${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${DESKTOPDIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ +.for d in gfx music sfx stage + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/battle ${STAGEDIR}${DATADIR}/${PORTNAME} + ${LN} -sf ${DATADIR}/gfx/SB.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + ${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${STAGEDIR}${DESKTOPDIR} .include <bsd.port.mk> Modified: head/games/smashbattle/files/smashbattle.in ============================================================================== --- head/games/smashbattle/files/smashbattle.in Mon Jan 13 23:30:52 2014 (r339645) +++ head/games/smashbattle/files/smashbattle.in Mon Jan 13 23:50:44 2014 (r339646) @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# cd "%%DATADIR%%" exec ./smashbattle "${@}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401132350.s0DNojRU055011>