svn commit: r369670 - in head/games/sdl_scavenger: . files
Jason E. Hale
jhale at freebsd.org
Wed Oct 1 00:29:54 UTC 2014
On Tue, Sep 30, 2014 at 5:28 PM, Rusmir Dusko <nemysis at freebsd.org> wrote:
> Author: nemysis
> Date: Tue Sep 30 21:28:39 2014
> New Revision: 369670
> URL: http://svnweb.freebsd.org/changeset/ports/369670
> QAT: https://qat.redports.org/buildarchive/r369670/
>
> Log:
> - Bump PORTREVISION
> - Add USES shebangfix and SHEBANG_FILES
The problem with this is the former patch made the script use /bin/sh
... shebangfix makes the script use ${LOCALBASE}/bin/bash.
You could probably define: bash_CMD= /bin/sh
> - Simplify installation handling, use normal Makefile
> and adjust files/patch-Makefile
> - Change REINPLACE, use DATADIR and .sdlscavenger
> - Use REINPLACE instead of simple patch
>
> Deleted:
> head/games/sdl_scavenger/files/patch-scavsaver
> Modified:
> head/games/sdl_scavenger/Makefile
> head/games/sdl_scavenger/files/patch-Makefile
> head/games/sdl_scavenger/pkg-plist
>
> Modified: head/games/sdl_scavenger/Makefile
> ==============================================================================
> --- head/games/sdl_scavenger/Makefile Tue Sep 30 21:26:13 2014 (r369669)
> +++ head/games/sdl_scavenger/Makefile Tue Sep 30 21:28:39 2014 (r369670)
> @@ -3,7 +3,7 @@
>
> PORTNAME= sdl_scavenger
> PORTVERSION= 145.2014.01.01
> -PORTREVISION= 2
> +PORTREVISION= 3
> PORTEPOCH= 1
> CATEGORIES= games
> MASTER_SITES= SF/sdlscavenger/
> @@ -16,7 +16,8 @@ LICENSE= GPLv1
>
> WRKSRC= ${WRKDIR}/sdlscav-145
>
> -USES= gmake tar:tgz
> +USES= gmake shebangfix tar:tgz
> +SHEBANG_FILES= scavsaver
> USE_SDL= sdl image mixer
> USE_GCC= yes
This seem to build with clang, although with tons of warnings.
> ALL_TARGET=
> @@ -29,13 +30,14 @@ DESKTOP_ENTRIES="SDL Scavenger" "" "${PO
> "${PORTNAME}" "Game;LogicGame;" ""
>
> post-patch:
> - @${REINPLACE_CMD} -e 's|/usr/local/games/scavenger|${DATADIR}/data|' \
> + @${REINPLACE_CMD} -e 's|/usr/local/games/scavenger|${DATADIR}|; \
> + s|".scavenger"|".sdlscavenger"|' \
> ${WRKSRC}/names.h
> + @${REINPLACE_CMD} -e 's|sdlscav|sdl_scavenger|' ${WRKSRC}/scavsaver
>
> -do-install:
> +post-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/sdlscav ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
> - @(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR})
> - ${LN} -sf ${DATADIR}/data/scav.png \
> + ${INSTALL_DATA} ${WRKSRC}/data/scav.png \
> ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
>
> @${MKDIR} ${STAGEDIR}${DOCSDIR}
>
> Modified: head/games/sdl_scavenger/files/patch-Makefile
> ==============================================================================
> --- head/games/sdl_scavenger/files/patch-Makefile Tue Sep 30 21:26:13 2014 (r369669)
> +++ head/games/sdl_scavenger/files/patch-Makefile Tue Sep 30 21:28:39 2014 (r369670)
> @@ -1,6 +1,6 @@
> ---- ./Makefile.orig 2010-11-04 08:53:00.000000000 +0100
> -+++ ./Makefile 2013-12-25 10:25:00.000000000 +0100
> -@@ -1,12 +1,9 @@
> +--- Makefile.orig 2010-11-04 07:53:00 UTC
> ++++ Makefile
> +@@ -1,12 +1,11 @@
> -CC = gcc
> ###CFLAGS = -Wall -O2 -I/usr/local/include/SDL -I/usr/include/SDL -D_REENTRANT
> -CFLAGS = -O2 `sdl-config --cflags`
> @@ -11,7 +11,28 @@
> - gcc -o sdlscav scav.o gfx.o sound.o edit.o anim.o `sdl-config --libs`
> - install -m 0755 -d $$HOME/.scavenger
> - install -m 0644 data/*rc $$HOME/.scavenger
> ++ install -m 0755 -d $$HOME/.sdlscavenger
> ++ install -m 0644 data/*rc $$HOME/.sdlscavenger
This doesn't look right. Ports shouldn't be touching home
directories, although HOME is defined WRKDIR by default in MAKE_ENV.
Is something supposed to happen with these files?
> + ${CC} -o sdlscav scav.o gfx.o sound.o edit.o anim.o `sdl-config --libs`
>
> scav.o: scav.c scav.h names.h edit.h anim.h gfx.h sound.h
>
> +@@ -21,11 +20,11 @@
> + clean:
> + rm -f *.o sdlscav *~
> + install:
> +- install -m 0755 -d /usr/local/games/scavenger
> +- install -m 0755 -d /usr/local/bin
> +- install -m 0644 data/*.lbm /usr/local/games/scavenger/
> +- install -m 0644 data/*.wav /usr/local/games/scavenger/
> +- install -m 0644 data/*.scl /usr/local/games/scavenger/
> +- install -m 0755 sdlscav /usr/local/bin/
> +- install -m 0755 scavsaver /usr/local/bin/
> ++ install -m 0755 -d $(DESTDIR)/usr/local/share/sdl_scavenger
> ++ install -m 0755 -d $(DESTDIR)/usr/local/bin
> ++ install -m 0644 data/*.lbm $(DESTDIR)/usr/local/share/sdl_scavenger/
> ++ install -m 0644 data/*.wav $(DESTDIR)/usr/local/share/sdl_scavenger/
> ++ install -m 0644 data/*.scl $(DESTDIR)/usr/local/share/sdl_scavenger/
> ++ #install -m 0755 sdlscav /usr/local/bin/
> ++ install -m 0755 scavsaver $(DESTDIR)/usr/local/bin/
> +
/usr/local everywhere! Should be ${PREFIX}
>
> Modified: head/games/sdl_scavenger/pkg-plist
> ==============================================================================
> --- head/games/sdl_scavenger/pkg-plist Tue Sep 30 21:26:13 2014 (r369669)
> +++ head/games/sdl_scavenger/pkg-plist Tue Sep 30 21:28:39 2014 (r369670)
> @@ -1,34 +1,21 @@
> +bin/scavsaver
> bin/sdl_scavenger
> share/pixmaps/sdl_scavenger.png
> -%%DATADIR%%/data/badguy.lbm
> -%%DATADIR%%/data/brownblue.lbm
> -%%DATADIR%%/data/death.wav
> -%%DATADIR%%/data/devil.xpm
> -%%DATADIR%%/data/dig.wav
> -%%DATADIR%%/data/fall.wav
> -%%DATADIR%%/data/highrc
> -%%DATADIR%%/data/highstreet.lbm
> -%%DATADIR%%/data/leprechaun.lbm
> -%%DATADIR%%/data/levels.scl
> -%%DATADIR%%/data/masters.scl
> -%%DATADIR%%/data/microman.lbm
> -%%DATADIR%%/data/microman.xpm
> -%%DATADIR%%/data/micromanrc
> -%%DATADIR%%/data/microrc
> -%%DATADIR%%/data/pop.wav
> -%%DATADIR%%/data/redbrick.lbm
> -%%DATADIR%%/data/reddevil.lbm
> -%%DATADIR%%/data/reddevilrc
> -%%DATADIR%%/data/regularguy.lbm
> -%%DATADIR%%/data/scav.bmp
> -%%DATADIR%%/data/scav.png
> -%%DATADIR%%/data/scav.xpm
> -%%DATADIR%%/data/scavrc
> -%%DATADIR%%/data/shamrc
> -%%DATADIR%%/data/shamrock.lbm
> -%%DATADIR%%/data/shamrock.xpm
> -%%DATADIR%%/data/spiral.lbm
> -%%DATADIR%%/data/spiralthing.lbm
> -%%DATADIR%%/data/victory.wav
> - at dirrm %%DATADIR%%/data
> - at dirrm %%DATADIR%%
> +%%DATADIR%%/badguy.lbm
> +%%DATADIR%%/brownblue.lbm
> +%%DATADIR%%/death.wav
> +%%DATADIR%%/dig.wav
> +%%DATADIR%%/fall.wav
> +%%DATADIR%%/highstreet.lbm
> +%%DATADIR%%/leprechaun.lbm
> +%%DATADIR%%/levels.scl
> +%%DATADIR%%/masters.scl
> +%%DATADIR%%/microman.lbm
> +%%DATADIR%%/pop.wav
> +%%DATADIR%%/redbrick.lbm
> +%%DATADIR%%/reddevil.lbm
> +%%DATADIR%%/regularguy.lbm
> +%%DATADIR%%/shamrock.lbm
> +%%DATADIR%%/spiral.lbm
> +%%DATADIR%%/spiralthing.lbm
> +%%DATADIR%%/victory.wav
>
More information about the svn-ports-all
mailing list