ports/53859: version bump for games/toppler

[Dominic Mitchell]

>Number:         53859
>Category:       ports
>Synopsis:       version bump for games/toppler
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 27 15:10:07 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dominic Mitchell
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ppe.happygiraffe.net 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Thu Jun 5 19:40:43 BST 2003 root at ppe.happygiraffe.net:/usr/obj/usr/src/sys/PPE i386


>Description:
	This is the latest version of games/toppler.  It also fixes a
	security bug over the previous version.
>How-To-Repeat:
	
>Fix:

	Here's the patch.  Please note that everything under the "files"
	directory no longer exists and needs to be removed.

diff -urN /usr/ports/games/toppler/Makefile toppler/Makefile
--- /usr/ports/games/toppler/Makefile	Sat Feb 22 00:46:35 2003
+++ toppler/Makefile	Fri Jun 27 22:58:32 2003
@@ -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 @@
 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 -urN /usr/ports/games/toppler/distinfo toppler/distinfo
--- /usr/ports/games/toppler/distinfo	Tue Apr  2 17:43:37 2002
+++ toppler/distinfo	Fri Jun 27 10:59:57 2003
@@ -1 +1 @@
-MD5 (toppler-0.71.tar.gz) = cdaa3dd91cfa2938ffa3979ed03f7f4f
+MD5 (toppler-1.0.2.tar.gz) = 18793ac2bec622a94e5369c645941954
diff -urN /usr/ports/games/toppler/files/patch-configure toppler/files/patch-configure
--- /usr/ports/games/toppler/files/patch-configure	Tue Apr  2 17:43:40 2002
+++ toppler/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -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 -urN /usr/ports/games/toppler/files/patch-menu.cc toppler/files/patch-menu.cc
--- /usr/ports/games/toppler/files/patch-menu.cc	Tue Apr  2 17:43:40 2002
+++ toppler/files/patch-menu.cc	Thu Jan  1 01:00:00 1970
@@ -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 -urN /usr/ports/games/toppler/pkg-plist toppler/pkg-plist
--- /usr/ports/games/toppler/pkg-plist	Tue Apr  2 17:43:38 2002
+++ toppler/pkg-plist	Fri Jun 27 22:53:16 2003
@@ -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
+ at dirrm var/toppler
>Release-Note:
>Audit-Trail:
>Unformatted: