Date: Wed, 3 Dec 2014 13:37:37 +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: r373818 - in head/games/fightorperish: . files Message-ID: <201412031337.sB3DbbKV099121@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Dec 3 13:37:37 2014 New Revision: 373818 URL: https://svnweb.freebsd.org/changeset/ports/373818 QAT: https://qat.redports.org/buildarchive/r373818/ Log: - Convert clumsy REINPLACE into patch - Cosmetic fixes - Add empty directory to plist Added: head/games/fightorperish/files/ head/games/fightorperish/files/patch-Makefile (contents, props changed) Modified: head/games/fightorperish/Makefile head/games/fightorperish/pkg-plist Modified: head/games/fightorperish/Makefile ============================================================================== --- head/games/fightorperish/Makefile Wed Dec 3 13:37:16 2014 (r373817) +++ head/games/fightorperish/Makefile Wed Dec 3 13:37:37 2014 (r373818) @@ -24,27 +24,22 @@ USES= gmake USE_SDL= image mixer sdl PORTDOCS= CHANGES.txt README.txt -OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="Fight or Perish" "" "${PORTNAME}" \ "${PORTNAME}" "Game;ArcadeGame;" "" +OPTIONS_DEFINE= DOCS + post-patch: - @${REINPLACE_CMD} -e 's|data/|${DATADIR}/data/| ; \ - s|char [256],|char [512],|' ${WRKSRC}/src/fop.c - @${REINPLACE_CMD} -e 's|CC=gcc|CC=${CC}| ; \ - s|CFLAGS=-Wall -O2|CFLAGS+=| ; \ - s|SDL_CFLAGS=|SDL_CFLAGS+=| ; \ - s|SDL_LIBS=|SDL_LIBS+=|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|data/|${DATADIR}/data/|' \ + ${WRKSRC}/src/fop.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fop ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @(cd ${WRKSRC}/data && ${COPYTREE_SHARE} "images maps sounds" \ ${STAGEDIR}${DATADIR}/data) - ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} Added: head/games/fightorperish/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/fightorperish/files/patch-Makefile Wed Dec 3 13:37:37 2014 (r373818) @@ -0,0 +1,15 @@ +--- Makefile.orig 2009-03-15 13:11:12.000000000 +0300 ++++ Makefile 2014-11-30 07:39:48.000000000 +0300 +@@ -6,10 +6,10 @@ + # February 25, 2009 - March 15, 2009 + + VERSION=0.5 +-CC=gcc ++CC?=gcc + SDL_CFLAGS=$(shell sdl-config --cflags) + SDL_LIBS=$(shell sdl-config --libs) -lSDL_image +-CFLAGS=-Wall -O2 $(SDL_CFLAGS) -DVERSION="\"${VERSION}\"" ++CFLAGS+=-Wall $(SDL_CFLAGS) -DVERSION="\"${VERSION}\"" + + all: fop + Modified: head/games/fightorperish/pkg-plist ============================================================================== --- head/games/fightorperish/pkg-plist Wed Dec 3 13:37:16 2014 (r373817) +++ head/games/fightorperish/pkg-plist Wed Dec 3 13:37:37 2014 (r373818) @@ -19,3 +19,4 @@ bin/fightorperish %%DATADIR%%/data/maps/2.txt %%DATADIR%%/data/maps/3.txt share/pixmaps/fightorperish.png +@dir %%DATADIR%%/data/sounds
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412031337.sB3DbbKV099121>