- Update to 1.60

- Unbreak

4 files changed, 16 insertions, 18 deletions

diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index 9533b4068229..21ba809b18ec 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gish-demo
-PORTVERSION=	1.52
+PORTVERSION=	1.60
 CATEGORIES=	games linux
 MASTER_SITES=	http://s159260531.onlinehome.us/demos/
 DISTNAME=	gishdemo
@@ -18,18 +18,17 @@ RESTRICTED=	(c) Copyright 2004 Chronic Logic All rights reserved
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
 USE_LINUX=	yes
-USE_LINUX_APPS=	freealut libvorbis openal
+USE_LINUX_APPS=	libvorbis openal-soft
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	rungish.sh
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 
-BROKEN=		Checksum mismatch. Newer version does not work.
-
 do-install:
 	${MKDIR} ${DATADIR}
 	${CP} -R ${WRKSRC}/* ${DATADIR}
-	${BRANDELF} -t Linux ${DATADIR}/gish
+	${BRANDELF} -t Linux ${DATADIR}/gishdemo
+	${BRANDELF} -t Linux ${DATADIR}/gishdemo
 	${INSTALL_SCRIPT} ${WRKDIR}/rungish.sh ${PREFIX}/bin/gish
 
 .include <bsd.port.mk>
diff --git a/games/gish-demo/distinfo b/games/gish-demo/distinfo
index a8e7ba17d1c9..95a0d37f271b 100644
--- a/games/gish-demo/distinfo
+++ b/games/gish-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gishdemo.tar.gz) = 486151404202655498bca21b79a7fe4f
-SHA256 (gishdemo.tar.gz) = 1dc8abd33652ed938078d1e2ba23e75d4958948ebb1c7d55951a2b599c94858b
-SIZE (gishdemo.tar.gz) = 12206307
+MD5 (gishdemo.tar.gz) = 144b79a7200355b5c274bd395e016c1e
+SHA256 (gishdemo.tar.gz) = 335e28ae5b9f91ebb9487e341d9bb9cf679083a0a3ed5a49daaa27f2b3e3908d
+SIZE (gishdemo.tar.gz) = 12712912
diff --git a/games/gish-demo/files/rungish.sh.in b/games/gish-demo/files/rungish.sh.in
index 7b5702378bab..d752d66fa5bc 100644
--- a/games/gish-demo/files/rungish.sh.in
+++ b/games/gish-demo/files/rungish.sh.in
@@ -1,12 +1,4 @@
 #!/bin/sh
 
-LD_PRELOAD_ALUT=%%LINUXBASE%%/usr/lib/libalut.so.0
-
-if [ -n "$LD_PRELOAD" ]; then
-    export LD_PRELOAD="$LD_PRELOAD_ALUT:$LD_PRELOAD"
-else
-    export LD_PRELOAD="$LD_PRELOAD_ALUT"
-fi
-
 cd %%DATADIR%% || exit 1
-exec ./gish "$@"
+exec ./gishdemo "$@"
diff --git a/games/gish-demo/pkg-plist b/games/gish-demo/pkg-plist
index 83c7dc768635..96b1fd206370 100644
--- a/games/gish-demo/pkg-plist
+++ b/games/gish-demo/pkg-plist
@@ -1,4 +1,5 @@
 bin/gish
+%%DATADIR%%/Chronic.url
 %%DATADIR%%/README-SDL.txt
 %%DATADIR%%/README.txt
 %%DATADIR%%/animation/pibatk01.tga
@@ -74,7 +75,8 @@ bin/gish
 %%DATADIR%%/animation/zomwlk07.tga
 %%DATADIR%%/animation/zomwlk08.tga
 %%DATADIR%%/animation/zomwlk09.tga
-%%DATADIR%%/gish
+%%DATADIR%%/gishdemo
+%%DATADIR%%/gishdemo_64
 %%DATADIR%%/gish.bmp
 %%DATADIR%%/gishmanual.html
 %%DATADIR%%/leveldemo/bathhouse.lvl
@@ -86,6 +88,7 @@ bin/gish
 %%DATADIR%%/leveldemo/demo4.lvl
 %%DATADIR%%/leveldemo/playroom.lvl
 %%DATADIR%%/manual3.swf
+%%DATADIR%%/ordergish.url
 %%DATADIR%%/music/intro.ogg
 %%DATADIR%%/music/sewer.ogg
 %%DATADIR%%/replay/demo01.gre
@@ -98,6 +101,7 @@ bin/gish
 %%DATADIR%%/sound/fleshhit.wav
 %%DATADIR%%/sound/gishhit.wav
 %%DATADIR%%/sound/gishhurt.wav
+%%DATADIR%%/sound/lava.wav
 %%DATADIR%%/sound/necksnap.wav
 %%DATADIR%%/sound/nibattack.wav
 %%DATADIR%%/sound/points.wav
@@ -110,6 +114,7 @@ bin/gish
 %%DATADIR%%/sound/squish.wav
 %%DATADIR%%/sound/switch.wav
 %%DATADIR%%/sound/tarball.wav
+%%DATADIR%%/sound/visattack.wav
 %%DATADIR%%/texture/0.tga
 %%DATADIR%%/texture/1.tga
 %%DATADIR%%/texture/10.tga
@@ -153,6 +158,8 @@ bin/gish
 %%DATADIR%%/texture/fight.tga
 %%DATADIR%%/texture/font00.tga
 %%DATADIR%%/texture/font01.tga
+%%DATADIR%%/texture/font02.tga
+%%DATADIR%%/texture/font03.tga
 %%DATADIR%%/texture/gameover.tga
 %%DATADIR%%/texture/gface.tga
 %%DATADIR%%/texture/gfaceb1.tga