- Update to 145_2015_01_05, no changelog entry

- Change DISTNAME to get proper Version
- Remove obsolete patch files/patch-Makefile, use instead sed
- Strip executable

3 files changed, 13 insertions, 44 deletions

diff --git a/games/sdl_scavenger/Makefile b/games/sdl_scavenger/Makefile
index ae3d47ff236d..ef4cf5bbdd87 100644
--- a/games/sdl_scavenger/Makefile
+++ b/games/sdl_scavenger/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	sdl_scavenger
-PORTVERSION=	145.2014.01.01
-PORTREVISION=	4
+PORTVERSION=	145.2015.01.05
 PORTEPOCH=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/sdlscavenger/
-DISTNAME=	sdlscav-145_2014_01_01
+DISTNAME=	sdlscav-145.4_2015_01_05
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Lode Runner like game
@@ -31,13 +30,21 @@ DESKTOP_ENTRIES="SDL Scavenger" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;LogicGame;" ""
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; \
+		s|-O2 ||; \
+		s|$$HOME/.scavenger|$$HOME/.sdlscavenger|; \
+		s||$$(DESTDIR)/usr/local/bin|; \
+		s|/usr/local/bin|$$(DESTDIR)/usr/local/bin|; \
+		s|/usr/local/games/scavenger|$$(DESTDIR)/usr/local/share/${PORTNAME}|; \
+		s|sdlscav $$(DESTDIR)/usr/local/bin/|sdlscav $$(DESTDIR)/usr/local/bin/${PORTNAME}|' \
+		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/local/games/scavenger|${DATADIR}|; \
 		s|".scavenger"|".sdlscavenger"|' \
 		${WRKSRC}/names.h
 	@${REINPLACE_CMD} -e 's|sdlscav|sdl_scavenger|' ${WRKSRC}/scavsaver
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sdlscav ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/data/scav.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
diff --git a/games/sdl_scavenger/distinfo b/games/sdl_scavenger/distinfo
index fefb1a637654..3813114a1caa 100644
--- a/games/sdl_scavenger/distinfo
+++ b/games/sdl_scavenger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sdlscav-145_2014_01_01.tgz) = 0d46c584b47222369e4a4c2a120eac5166e59e45f6200d5add1413667a1e968b
-SIZE (sdlscav-145_2014_01_01.tgz) = 563092
+SHA256 (sdlscav-145.4_2015_01_05.tgz) = 28337a4e43756048a6d53994fcdcba6af4c9a68568d734ea774189713c4d67fe
+SIZE (sdlscav-145.4_2015_01_05.tgz) = 520580
diff --git a/games/sdl_scavenger/files/patch-Makefile b/games/sdl_scavenger/files/patch-Makefile
deleted file mode 100644
index 6e8a2ca8436c..000000000000
--- a/games/sdl_scavenger/files/patch-Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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`
-+CFLAGS	+= `sdl-config --cflags`
- 
- sdlscav:	scav.o gfx.o sound.o edit.o anim.o
- ###	gcc -o sdlscav scav.o gfx.o sound.o edit.o anim.o -lSDL -ldl -lpthread
--	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/
-