update games/toppler: 0.71 --> 1.0.2

PR:		53859
Submitted by:	Dominic Mitchell <dom@happygiraffe.net> (maintainer)

5 files changed, 21 insertions, 62 deletions

diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index e88566744c6e..b47aadaed902 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	toppler
-PORTVERSION=	0.71
+PORTVERSION=	1.0.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	toppler
@@ -23,26 +23,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
-SCOREDIR?=	/var/games/${PORTNAME}
-SCOREFILE?=	${PORTNAME}.hscr
+MAN6=		toppler.6
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cc" \) | \
 		xargs ${PERL} -pi -e 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g'
 
-post-patch:
-	@${PERL} -pi -e 's|%SCOREDIR%|${SCOREDIR}|g;' \
-		-e 's|%SCOREFILE%|${SCOREFILE}|g' ${WRKSRC}/menu.cc
-
-pre-install:
-	${MKDIR} ${SCOREDIR}
-
 post-install:
-	${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
-	${CHMOD} g+s ${PREFIX}/bin/${PORTNAME}
-	${TOUCH} ${SCOREDIR}/${SCOREFILE}
-	${CHMOD} 664 ${SCOREDIR}/${SCOREFILE}
-	${CHOWN} root:games ${SCOREDIR}/${SCOREFILE}
+	@cd ${WRKSRC} && ${MAKE} global_highscore
 
 .include <bsd.port.mk>
diff --git a/games/toppler/distinfo b/games/toppler/distinfo
index f6a401e5a2f1..c450403932b2 100644
--- a/games/toppler/distinfo
+++ b/games/toppler/distinfo
@@ -1 +1 @@
-MD5 (toppler-0.71.tar.gz) = cdaa3dd91cfa2938ffa3979ed03f7f4f
+MD5 (toppler-1.0.2.tar.gz) = 18793ac2bec622a94e5369c645941954
diff --git a/games/toppler/files/patch-configure b/games/toppler/files/patch-configure
deleted file mode 100644
index 520531aa0023..000000000000
--- a/games/toppler/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Jan 19 09:55:17 2002
-+++ configure	Sat Jan 19 09:54:37 2002
-@@ -1167,7 +1167,7 @@
-   rm -f conf.sdltest
- 
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
--LIS="$LIBS $SDL_LIBS"
-+LIBS="$LIBS $SDL_LIBS"
- 
- echo $ac_n "checking for main in -lSDL_mixer""... $ac_c" 1>&6
- echo "configure:1174: checking for main in -lSDL_mixer" >&5
diff --git a/games/toppler/files/patch-menu.cc b/games/toppler/files/patch-menu.cc
deleted file mode 100644
index b85cc1a75a3e..000000000000
--- a/games/toppler/files/patch-menu.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- menu.cc.orig	Sat Jan 19 11:08:41 2002
-+++ menu.cc	Sat Jan 19 11:11:09 2002
-@@ -10,6 +10,9 @@
- 
- #include <stdlib.h>
- 
-+#define SCOREDIR	"%SCOREDIR%"
-+#define SCOREFILE	"%SCOREFILE%"
-+
- static unsigned short menupicture, titledata;
- static unsigned char currentmission = 0;
- 
-@@ -175,7 +178,7 @@
- static void getscores() {
-   char n[300];
- 
--  sprintf(n, "%s/nebulous.hsc", getenv("HOME"));
-+  sprintf(n, "%s/%s", SCOREDIR, SCOREFILE);
-   FILE *f = fopen(n, "rb");
- 
-   if (f) {
-@@ -195,7 +198,7 @@
- static void savescores() {
-   char n[300];
- 
--  sprintf(n, "%s/nebulous.hsc", getenv("HOME"));
-+  sprintf(n, "%s/%s", SCOREDIR, SCOREFILE);
- 
-   FILE *f = fopen(n, "r+b");
- 
diff --git a/games/toppler/pkg-plist b/games/toppler/pkg-plist
index 723747fbb8bc..5f7ea23c0d0d 100644
--- a/games/toppler/pkg-plist
+++ b/games/toppler/pkg-plist
@@ -1,15 +1,27 @@
 bin/toppler
+share/toppler/abc.ttm
+share/toppler/alarm.wav
+share/toppler/ball1.ttm
+share/toppler/ball2.ttm
+share/toppler/ball3.ttm
 share/toppler/boing.wav
 share/toppler/bubbles.wav
+share/toppler/fanfare.wav
 share/toppler/hit.wav
 share/toppler/honk.wav
-share/toppler/layer1.tga
-share/toppler/layer2.tga
-share/toppler/layer3.tga
-share/toppler/nebulous.dat
+share/toppler/m1.ttm
+share/toppler/m2.ttm
+share/toppler/rumble.wav
+share/toppler/score.wav
+share/toppler/sonar.wav
 share/toppler/splash.wav
-share/toppler/swosh.wav
+share/toppler/swoosh.wav
 share/toppler/tap.wav
 share/toppler/tick.wav
+share/toppler/toppler.dat
+share/toppler/toppler.xpm
+share/toppler/torpedo.wav
 share/toppler/water.wav
+var/toppler/toppler.hsc
 @dirrm share/toppler
+@dirrm var/toppler