3 files changed, 88 insertions, 161 deletions

diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index b459bfd02726..ff33cfc56737 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gish-demo
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	games linux
 MASTER_SITES=	http://s159260531.onlinehome.us/demos/
 DISTNAME=	gishdemo
@@ -16,8 +16,7 @@ COMMENT=	A platform game with a gelatinous 12-pound ball of tar named Gish (Demo
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorbis \
 		${LINUXBASE}/usr/lib/libopenal.so.0:${PORTSDIR}/audio/linux-openal \
-		${LINUXBASE}/usr/lib/libalut.so.0:${PORTSDIR}/audio/linux-freealut \
-		${LINUXBASE}/usr/X11R6/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux_dri
+		${LINUXBASE}/usr/lib/libalut.so.0:${PORTSDIR}/audio/linux-freealut
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
@@ -27,6 +26,9 @@ DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	rungish.sh
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 
+pre-patch:
+	${MV} ${WRKDIR}/gish\ demo ${WRKSRC}
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${CP} -R ${WRKSRC}/* ${DATADIR}
diff --git a/games/gish-demo/distinfo b/games/gish-demo/distinfo
index cfde8e5ea76e..a16c4f21deff 100644
--- a/games/gish-demo/distinfo
+++ b/games/gish-demo/distinfo
@@ -1,3 +1,3 @@
-MD5 (gishdemo.tar.gz) = 4b8dc9c5fb61fcf11151e7a79c3961d3
-SHA256 (gishdemo.tar.gz) = f3c1db89733457b51e6e569a6d5542c03c33f9b3b36f1719d734d1cbaf3dcdc7
-SIZE (gishdemo.tar.gz) = 13564186
+MD5 (gishdemo.tar.gz) = c5b74a3ab2e6f65f3801b3eac7f46f0d
+SHA256 (gishdemo.tar.gz) = 69cc2acb12bd0bf754b8b4f21df57fb68ac63da91148966645f2107588d41fab
+SIZE (gishdemo.tar.gz) = 12691640
diff --git a/games/gish-demo/pkg-plist b/games/gish-demo/pkg-plist
index 240cdec545d9..9ee4f907752b 100644
--- a/games/gish-demo/pkg-plist
+++ b/games/gish-demo/pkg-plist
@@ -1,119 +1,95 @@
 bin/gish
-%%DATADIR%%/animation/bibatk01.tga
-%%DATADIR%%/animation/bibatk02.tga
-%%DATADIR%%/animation/bibatk03.tga
-%%DATADIR%%/animation/bibatk04.tga
-%%DATADIR%%/animation/bibatk05.tga
-%%DATADIR%%/animation/bibatk06.tga
-%%DATADIR%%/animation/bibatk07.tga
-%%DATADIR%%/animation/bibatk08.tga
-%%DATADIR%%/animation/bibatk09.tga
-%%DATADIR%%/animation/bibsta01.tga
-%%DATADIR%%/animation/bibsta02.tga
-%%DATADIR%%/animation/bibsta03.tga
-%%DATADIR%%/animation/bibsta04.tga
-%%DATADIR%%/animation/bibsta05.tga
-%%DATADIR%%/animation/bibsta06.tga
-%%DATADIR%%/animation/bibwlk01.tga
-%%DATADIR%%/animation/bibwlk02.tga
-%%DATADIR%%/animation/bibwlk03.tga
-%%DATADIR%%/animation/bibwlk04.tga
-%%DATADIR%%/animation/bibwlk05.tga
-%%DATADIR%%/animation/bibwlk06.tga
-%%DATADIR%%/animation/bibwlk07.tga
-%%DATADIR%%/animation/bibwlk08.tga
-%%DATADIR%%/animation/bibwlk09.tga
-%%DATADIR%%/animation/frkatk01.tga
-%%DATADIR%%/animation/frkatk02.tga
-%%DATADIR%%/animation/frkatk03.tga
-%%DATADIR%%/animation/frkatk04.tga
-%%DATADIR%%/animation/frkatk05.tga
-%%DATADIR%%/animation/frkatk06.tga
-%%DATADIR%%/animation/frkatk07.tga
-%%DATADIR%%/animation/frkatk08.tga
-%%DATADIR%%/animation/frkatk09.tga
-%%DATADIR%%/animation/frkdie01.tga
-%%DATADIR%%/animation/frkdie02.tga
-%%DATADIR%%/animation/frkdie03.tga
-%%DATADIR%%/animation/frkdie04.tga
-%%DATADIR%%/animation/frkdie05.tga
-%%DATADIR%%/animation/frkdie06.tga
-%%DATADIR%%/animation/frkdie07.tga
-%%DATADIR%%/animation/frkdie08.tga
-%%DATADIR%%/animation/frkdie09.tga
-%%DATADIR%%/animation/frkhed01.tga
-%%DATADIR%%/animation/frkhed02.tga
-%%DATADIR%%/animation/frkhed03.tga
-%%DATADIR%%/animation/frkhed04.tga
-%%DATADIR%%/animation/frkhed05.tga
-%%DATADIR%%/animation/frkhed06.tga
-%%DATADIR%%/animation/frksta01.tga
-%%DATADIR%%/animation/frksta02.tga
-%%DATADIR%%/animation/frksta03.tga
-%%DATADIR%%/animation/frksta04.tga
-%%DATADIR%%/animation/frksta05.tga
-%%DATADIR%%/animation/frksta06.tga
-%%DATADIR%%/animation/frkwlk01.tga
-%%DATADIR%%/animation/frkwlk02.tga
-%%DATADIR%%/animation/frkwlk03.tga
-%%DATADIR%%/animation/frkwlk04.tga
-%%DATADIR%%/animation/frkwlk05.tga
-%%DATADIR%%/animation/frkwlk06.tga
-%%DATADIR%%/animation/frkwlk07.tga
-%%DATADIR%%/animation/frkwlk08.tga
-%%DATADIR%%/animation/frkwlk09.tga
-%%DATADIR%%/animation/frkwlk10.tga
-%%DATADIR%%/animation/nibatk01.tga
-%%DATADIR%%/animation/nibatk02.tga
-%%DATADIR%%/animation/nibatk03.tga
-%%DATADIR%%/animation/nibatk04.tga
-%%DATADIR%%/animation/nibatk05.tga
-%%DATADIR%%/animation/nibatk06.tga
-%%DATADIR%%/animation/nibatk07.tga
-%%DATADIR%%/animation/nibatk08.tga
-%%DATADIR%%/animation/nibatk09.tga
-%%DATADIR%%/animation/nibdie01.tga
-%%DATADIR%%/animation/nibdie02.tga
-%%DATADIR%%/animation/nibdie03.tga
-%%DATADIR%%/animation/nibdie04.tga
-%%DATADIR%%/animation/nibdie05.tga
-%%DATADIR%%/animation/nibdie06.tga
-%%DATADIR%%/animation/nibdie07.tga
-%%DATADIR%%/animation/nibdie08.tga
-%%DATADIR%%/animation/nibdie09.tga
-%%DATADIR%%/animation/nibsta01.tga
-%%DATADIR%%/animation/nibsta02.tga
-%%DATADIR%%/animation/nibsta03.tga
-%%DATADIR%%/animation/nibsta04.tga
-%%DATADIR%%/animation/nibsta05.tga
-%%DATADIR%%/animation/nibsta06.tga
-%%DATADIR%%/animation/nibwlk01.tga
-%%DATADIR%%/animation/nibwlk02.tga
-%%DATADIR%%/animation/nibwlk03.tga
-%%DATADIR%%/animation/nibwlk04.tga
-%%DATADIR%%/animation/nibwlk05.tga
-%%DATADIR%%/animation/nibwlk06.tga
-%%DATADIR%%/animation/nibwlk07.tga
-%%DATADIR%%/animation/nibwlk08.tga
-%%DATADIR%%/animation/nibwlk09.tga
+%%DATADIR%%/README.txt
+%%DATADIR%%/animation/pibatk01.tga
+%%DATADIR%%/animation/pibatk02.tga
+%%DATADIR%%/animation/pibatk03.tga
+%%DATADIR%%/animation/pibatk04.tga
+%%DATADIR%%/animation/pibatk05.tga
+%%DATADIR%%/animation/pibatk06.tga
+%%DATADIR%%/animation/pibatk07.tga
+%%DATADIR%%/animation/pibatk08.tga
+%%DATADIR%%/animation/pibatk09.tga
+%%DATADIR%%/animation/pibdie01.tga
+%%DATADIR%%/animation/pibdie02.tga
+%%DATADIR%%/animation/pibdie03.tga
+%%DATADIR%%/animation/pibdie04.tga
+%%DATADIR%%/animation/pibdie05.tga
+%%DATADIR%%/animation/pibdie06.tga
+%%DATADIR%%/animation/pibdie07.tga
+%%DATADIR%%/animation/pibdie08.tga
+%%DATADIR%%/animation/pibdie09.tga
+%%DATADIR%%/animation/pibsta01.tga
+%%DATADIR%%/animation/pibsta02.tga
+%%DATADIR%%/animation/pibsta03.tga
+%%DATADIR%%/animation/pibsta04.tga
+%%DATADIR%%/animation/pibsta05.tga
+%%DATADIR%%/animation/pibsta06.tga
+%%DATADIR%%/animation/pibwlk01.tga
+%%DATADIR%%/animation/pibwlk02.tga
+%%DATADIR%%/animation/pibwlk03.tga
+%%DATADIR%%/animation/pibwlk04.tga
+%%DATADIR%%/animation/pibwlk05.tga
+%%DATADIR%%/animation/pibwlk06.tga
+%%DATADIR%%/animation/pibwlk07.tga
+%%DATADIR%%/animation/pibwlk08.tga
+%%DATADIR%%/animation/pibwlk09.tga
+%%DATADIR%%/animation/sepsta01.tga
+%%DATADIR%%/animation/zomatk01.tga
+%%DATADIR%%/animation/zomatk02.tga
+%%DATADIR%%/animation/zomatk03.tga
+%%DATADIR%%/animation/zomatk04.tga
+%%DATADIR%%/animation/zomatk05.tga
+%%DATADIR%%/animation/zomatk06.tga
+%%DATADIR%%/animation/zomatk07.tga
+%%DATADIR%%/animation/zomatk08.tga
+%%DATADIR%%/animation/zomatk09.tga
+%%DATADIR%%/animation/zomdie01.tga
+%%DATADIR%%/animation/zomdie02.tga
+%%DATADIR%%/animation/zomdie03.tga
+%%DATADIR%%/animation/zomdie04.tga
+%%DATADIR%%/animation/zomdie05.tga
+%%DATADIR%%/animation/zomdie06.tga
+%%DATADIR%%/animation/zomdie07.tga
+%%DATADIR%%/animation/zomdie08.tga
+%%DATADIR%%/animation/zomdie09.tga
+%%DATADIR%%/animation/zomhed01.tga
+%%DATADIR%%/animation/zomhed02.tga
+%%DATADIR%%/animation/zomhed03.tga
+%%DATADIR%%/animation/zomhed04.tga
+%%DATADIR%%/animation/zomhed05.tga
+%%DATADIR%%/animation/zomhed06.tga
+%%DATADIR%%/animation/zomsta01.tga
+%%DATADIR%%/animation/zomsta02.tga
+%%DATADIR%%/animation/zomsta03.tga
+%%DATADIR%%/animation/zomsta04.tga
+%%DATADIR%%/animation/zomsta05.tga
+%%DATADIR%%/animation/zomsta06.tga
+%%DATADIR%%/animation/zomwlk01.tga
+%%DATADIR%%/animation/zomwlk02.tga
+%%DATADIR%%/animation/zomwlk03.tga
+%%DATADIR%%/animation/zomwlk04.tga
+%%DATADIR%%/animation/zomwlk05.tga
+%%DATADIR%%/animation/zomwlk06.tga
+%%DATADIR%%/animation/zomwlk07.tga
+%%DATADIR%%/animation/zomwlk08.tga
+%%DATADIR%%/animation/zomwlk09.tga
 %%DATADIR%%/gish
 %%DATADIR%%/gish.bmp
 %%DATADIR%%/gishmanual.html
 %%DATADIR%%/leveldemo/bathhouse.lvl
-%%DATADIR%%/leveldemo/cave2.lvl
 %%DATADIR%%/leveldemo/co06.lvl
 %%DATADIR%%/leveldemo/co10.lvl
-%%DATADIR%%/leveldemo/egypt1.lvl
+%%DATADIR%%/leveldemo/demo1.lvl
+%%DATADIR%%/leveldemo/demo2.lvl
+%%DATADIR%%/leveldemo/demo3.lvl
+%%DATADIR%%/leveldemo/demo4.lvl
 %%DATADIR%%/leveldemo/playroom.lvl
-%%DATADIR%%/leveldemo/sewer1.lvl
-%%DATADIR%%/leveldemo/sewer7.lvl
 %%DATADIR%%/manual3.swf
 %%DATADIR%%/music/intro.ogg
 %%DATADIR%%/music/sewer.ogg
 %%DATADIR%%/replay/demo01.gre
 %%DATADIR%%/replay/demo02.gre
 %%DATADIR%%/replay/demo03.gre
-%%DATADIR%%/replay/demo04.gre
 %%DATADIR%%/sound/amber.wav
 %%DATADIR%%/sound/blockbreak.wav
 %%DATADIR%%/sound/bobattack.wav
@@ -152,24 +128,17 @@ bin/gish
 %%DATADIR%%/texture/amber1.tga
 %%DATADIR%%/texture/amber2.tga
 %%DATADIR%%/texture/amber3.tga
-%%DATADIR%%/texture/bastalk.tga
 %%DATADIR%%/texture/blank.tga
 %%DATADIR%%/texture/blood.tga
 %%DATADIR%%/texture/border.tga
-%%DATADIR%%/texture/breatalk.tga
 %%DATADIR%%/texture/bubble.tga
 %%DATADIR%%/texture/buynow.tga
-%%DATADIR%%/texture/cage1.tga
-%%DATADIR%%/texture/cage2.tga
-%%DATADIR%%/texture/cage3.tga
-%%DATADIR%%/texture/cage4.tga
-%%DATADIR%%/texture/cave.tga
 %%DATADIR%%/texture/chain.tga
 %%DATADIR%%/texture/chronic.tga
+%%DATADIR%%/texture/cl_logo.tga
 %%DATADIR%%/texture/complete.tga
 %%DATADIR%%/texture/demolevel.tga
 %%DATADIR%%/texture/dust.tga
-%%DATADIR%%/texture/egypt.tga
 %%DATADIR%%/texture/eyes.tga
 %%DATADIR%%/texture/face.tga
 %%DATADIR%%/texture/faceb1.tga
@@ -207,6 +176,7 @@ bin/gish
 %%DATADIR%%/texture/grayhurt.tga
 %%DATADIR%%/texture/graywin.tga
 %%DATADIR%%/texture/greyhud.tga
+%%DATADIR%%/texture/honeytalk.tga
 %%DATADIR%%/texture/key.tga
 %%DATADIR%%/texture/level.tga
 %%DATADIR%%/texture/loading03.tga
@@ -226,65 +196,20 @@ bin/gish
 %%DATADIR%%/texture/tar2.tga
 %%DATADIR%%/texture/tarball.tga
 %%DATADIR%%/texture/tarballs.tga
-%%DATADIR%%/texture/text000.tga
 %%DATADIR%%/texture/text001.tga
-%%DATADIR%%/texture/text002.tga
-%%DATADIR%%/texture/text003.tga
-%%DATADIR%%/texture/text004.tga
-%%DATADIR%%/texture/text005.tga
 %%DATADIR%%/texture/text006.tga
-%%DATADIR%%/texture/text007.tga
-%%DATADIR%%/texture/text008.tga
 %%DATADIR%%/texture/text009.tga
 %%DATADIR%%/texture/text010.tga
 %%DATADIR%%/texture/text011.tga
-%%DATADIR%%/texture/text012.tga
-%%DATADIR%%/texture/text013.tga
-%%DATADIR%%/texture/text014.tga
-%%DATADIR%%/texture/text015.tga
-%%DATADIR%%/texture/text016.tga
-%%DATADIR%%/texture/text017.tga
-%%DATADIR%%/texture/text018.tga
 %%DATADIR%%/texture/text019.tga
-%%DATADIR%%/texture/text020.tga
-%%DATADIR%%/texture/text021.tga
 %%DATADIR%%/texture/text022.tga
 %%DATADIR%%/texture/text023.tga
-%%DATADIR%%/texture/text024.tga
-%%DATADIR%%/texture/text025.tga
-%%DATADIR%%/texture/text026.tga
-%%DATADIR%%/texture/text027.tga
 %%DATADIR%%/texture/text028.tga
-%%DATADIR%%/texture/text029.tga
-%%DATADIR%%/texture/text030.tga
 %%DATADIR%%/texture/text031.tga
 %%DATADIR%%/texture/text032.tga
-%%DATADIR%%/texture/text033.tga
 %%DATADIR%%/texture/text034.tga
-%%DATADIR%%/texture/text035.tga
 %%DATADIR%%/texture/text036.tga
-%%DATADIR%%/texture/text037.tga
 %%DATADIR%%/texture/text038.tga
-%%DATADIR%%/texture/text039.tga
-%%DATADIR%%/texture/text040.tga
-%%DATADIR%%/texture/text041.tga
-%%DATADIR%%/texture/text042.tga
-%%DATADIR%%/texture/text043.tga
-%%DATADIR%%/texture/text046.tga
-%%DATADIR%%/texture/text047.tga
-%%DATADIR%%/texture/text048.tga
-%%DATADIR%%/texture/text049.tga
-%%DATADIR%%/texture/text052.tga
-%%DATADIR%%/texture/text053.tga
-%%DATADIR%%/texture/text054.tga
-%%DATADIR%%/texture/text055.tga
-%%DATADIR%%/texture/text056.tga
-%%DATADIR%%/texture/text058.tga
-%%DATADIR%%/texture/text059.tga
-%%DATADIR%%/texture/text060.tga
-%%DATADIR%%/texture/text061.tga
-%%DATADIR%%/texture/text062.tga
-%%DATADIR%%/texture/text063.tga
 %%DATADIR%%/texture/turbo.tga
 %%DATADIR%%/texture/vsmode.tga
 @dirrm %%DATADIR%%/texture