5 files changed, 25 insertions, 22 deletions

diff --git a/games/toppler/Makefile b/games/toppler/Makefile
index a557718c3941..9b9657fa35eb 100644
--- a/games/toppler/Makefile
+++ b/games/toppler/Makefile
@@ -6,39 +6,39 @@
 #
 
 PORTNAME=	toppler
-PORTVERSION=	1.1.3
-PORTREVISION=	2
+PORTVERSION=	1.1.4
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A game where you have to climb the tower and avoid the monsters
 
-USE_GNOME=	gnometarget
 USE_SDL=	mixer sdl
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"  \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--localstatedir=/var/games
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share
 
-MAN6=		toppler.6
+MAN6=		${PORTNAME}.6
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|DATA install-dist_pkgdocDATA|DATA|g' ${WRKSRC}/Makefile.in
 
 post-install:
+	@${CHMOD} 2755 ${PREFIX}/bin/${PORTNAME}
+	@${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
+	@${CHMOD} 0664 ${DATADIR}/${PORTNAME}.hsc
+	@${CHOWN} root:games ${DATADIR}/${PORTNAME}.hsc
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in AUTHORS ChangeLog NEWS README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@${CHOWN} root:games ${PREFIX}/bin/toppler
-	@${CHMOD} g+s ${PREFIX}/bin/toppler
-	@${SETENV} "PKG_PREFIX=${PREFIX}" \
-		${SH} pkg-install ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/games/toppler/distinfo b/games/toppler/distinfo
index ea5b9a6bf47d..63a98c177bd7 100644
--- a/games/toppler/distinfo
+++ b/games/toppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (toppler-1.1.3.tar.gz) = 15ee44094e6a4e2a4f5f9b661f3fb617
-SHA256 (toppler-1.1.3.tar.gz) = 5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b
-SIZE (toppler-1.1.3.tar.gz) = 2085343
+MD5 (toppler-1.1.4.tar.gz) = 6420ae91afdb75d8c6191d4de6e90e88
+SHA256 (toppler-1.1.4.tar.gz) = b6ddb217ab8e5681d5590b4e0aab555e834c512a5700313e056adec6e456da93
+SIZE (toppler-1.1.4.tar.gz) = 2681258
diff --git a/games/toppler/files/patch-highscore.cc b/games/toppler/files/patch-highscore.cc
new file mode 100644
index 000000000000..e926fce62381
--- /dev/null
+++ b/games/toppler/files/patch-highscore.cc
@@ -0,0 +1,10 @@
+--- highscore.cc.orig	2009-10-11 08:46:06.000000000 +0900
++++ highscore.cc	2009-11-16 01:09:40.000000000 +0900
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ 
+ #ifdef __QNXNTO__
diff --git a/games/toppler/pkg-install b/games/toppler/pkg-install
deleted file mode 100644
index d406fe424621..000000000000
--- a/games/toppler/pkg-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-FILE=/var/games/toppler/toppler.hsc
-[ "$2" != "POST-INSTALL" -o -f "$FILE" ] && exit 0
-
-echo "===>   Creating initial high score file $FILE"
-[ -d `dirname $FILE` ] || install -o root -g games -m 775 -d `dirname $FILE`
-install -o root -g games -m 664 /dev/null $FILE
diff --git a/games/toppler/pkg-plist b/games/toppler/pkg-plist
index 72308e411f7d..1a5a85b3ef43 100644
--- a/games/toppler/pkg-plist
+++ b/games/toppler/pkg-plist
@@ -22,6 +22,7 @@ share/pixmaps/toppler.xpm
 %%DATADIR%%/m2.ttm
 %%DATADIR%%/pasi2.ttm
 %%DATADIR%%/toppler.dat
+%%DATADIR%%/toppler.hsc
 %%DATADIR%%/toppler.ogg
 @dirrm %%DATADIR%%
 @dirrmtry share/locale/cz/LC_MESSAGES