- Bump PORTREVISION

- Add USES shebangfix and SHEBANG_FILES
- Simplify installation handling, use normal Makefile
  and adjust files/patch-Makefile
- Change REINPLACE, use DATADIR and .sdlscavenger
- Use REINPLACE instead of simple patch

games/sdl_scavenger/Makefile

@@ -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
 ALL_TARGET=
@@ -29,13 +30,14 @@ DESKTOP_ENTRIES="SDL Scavenger" "" "${PORTNAME}" \
 		"${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})
+	${INSTALL_DATA} ${WRKSRC}/data/scav.png \
-	${LN} -sf ${DATADIR}/data/scav.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

games/sdl_scavenger/files/patch-Makefile

@@ -1,6 +1,6 @@
---- ./Makefile.orig	2010-11-04 08:53:00.000000000 +0100
+--- Makefile.orig	2010-11-04 07:53:00 UTC
-+++ ./Makefile	2013-12-25 10:25:00.000000000 +0100
++++ Makefile
-@@ -1,12 +1,9 @@
+@@ -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
 +	${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/
+ 

games/sdl_scavenger/files/patch-scavsaver

@@ -1,11 +0,0 @@
---- ./scavsaver.orig	2005-01-23 08:52:22.000000000 +0100
-+++ ./scavsaver	2013-12-25 10:25:00.000000000 +0100
-@@ -1,6 +1,6 @@
--#!/bin/bash
-+#!/bin/sh
- #This script turns off the screen saver, runs scavenger with all its parameters,
- #then turns the screen saver back on when scavenger exits.
- xset -dpms
--sdlscav $*
-+sdlscavenger $*
- xset +dpms

games/sdl_scavenger/pkg-plist

@@ -1,34 +1,21 @@
+bin/scavsaver
 bin/sdl_scavenger
 share/pixmaps/sdl_scavenger.png
-%%DATADIR%%/data/badguy.lbm
+%%DATADIR%%/badguy.lbm
-%%DATADIR%%/data/brownblue.lbm
+%%DATADIR%%/brownblue.lbm
-%%DATADIR%%/data/death.wav
+%%DATADIR%%/death.wav
-%%DATADIR%%/data/devil.xpm
+%%DATADIR%%/dig.wav
-%%DATADIR%%/data/dig.wav
+%%DATADIR%%/fall.wav
-%%DATADIR%%/data/fall.wav
+%%DATADIR%%/highstreet.lbm
-%%DATADIR%%/data/highrc
+%%DATADIR%%/leprechaun.lbm
-%%DATADIR%%/data/highstreet.lbm
+%%DATADIR%%/levels.scl
-%%DATADIR%%/data/leprechaun.lbm
+%%DATADIR%%/masters.scl
-%%DATADIR%%/data/levels.scl
+%%DATADIR%%/microman.lbm
-%%DATADIR%%/data/masters.scl
+%%DATADIR%%/pop.wav
-%%DATADIR%%/data/microman.lbm
+%%DATADIR%%/redbrick.lbm
-%%DATADIR%%/data/microman.xpm
+%%DATADIR%%/reddevil.lbm
-%%DATADIR%%/data/micromanrc
+%%DATADIR%%/regularguy.lbm
-%%DATADIR%%/data/microrc
+%%DATADIR%%/shamrock.lbm
-%%DATADIR%%/data/pop.wav
+%%DATADIR%%/spiral.lbm
-%%DATADIR%%/data/redbrick.lbm
+%%DATADIR%%/spiralthing.lbm
-%%DATADIR%%/data/reddevil.lbm
+%%DATADIR%%/victory.wav
-%%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
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%