- Upgrade to 0.9.4;

	Changelog at <http://globulation2.org/wiki/Changes>

- Don't enable portaudio, because Globulation is not fully compatible
  with the versions in the ports tree ATM.

4 files changed, 60 insertions, 5 deletions

diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index ea71bfae044..8e675173e32 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		glob2
-PORTVERSION=		0.9.3
+PORTVERSION=		0.9.4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -19,15 +19,21 @@ LIB_DEPENDS=		vorbis.4:${PORTSDIR}/audio/libvorbis	\
 			speex.1:${PORTSDIR}/audio/speex		\
 			fribidi.0:${PORTSDIR}/converters/fribidi\
 			freetype.9:${PORTSDIR}/print/freetype2
+# Should work with portaudio v19_20071207
+# Can be built with portaudio2 but does not run cleanly
+#LIB_DEPENDS+=		portaudio.2:${PORTSDIR}/audio/portaudio2
 
 USE_SDL=		image net sdl ttf
 USE_GL=			gl
 USE_GMAKE=		yes
 USE_SCONS=		yes
+#SCONS_ARGS=		--portaudio=true
 INSTALLS_ICONS=		yes
 SCONS_BUILDENV=		${SCONS_ENV}
+#CFLAGS+=		${PTHREAD_CFLAGS} -I. `pkg-config --cflags portaudio-2.0` -I${LOCALBASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS} -I. -I${LOCALBASE}/include
+#LINKFLAGS=		${PTHREAD_LIBS} `pkg-config --libs portaudio-2.0` -L${LOCALBASE}/lib
 LINKFLAGS=		${PTHREAD_LIBS} -L${LOCALBASE}/lib
-CFLAGS+=		${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/glob2/distinfo b/games/glob2/distinfo
index e168a58a0ee..1f8d6be1c92 100644
--- a/games/glob2/distinfo
+++ b/games/glob2/distinfo
@@ -1,3 +1,3 @@
-MD5 (glob2-0.9.3.tar.gz) = e0483d5864cff4ace5ac8e39eae27429
-SHA256 (glob2-0.9.3.tar.gz) = 07e2c09e1fc2a780ceb9e5b7e6fbb32cd6018f137f861cf2c1e1daa09339ce20
-SIZE (glob2-0.9.3.tar.gz) = 10688792
+MD5 (glob2-0.9.4.tar.gz) = 087169fcf82e4073266307680e75e447
+SHA256 (glob2-0.9.4.tar.gz) = 0d110619f4efccfa24985436bc0619368d62864e0efa8b721ac78d2c0dd0781f
+SIZE (glob2-0.9.4.tar.gz) = 11521283
diff --git a/games/glob2/files/patch-src_VoiceRecorder.cpp b/games/glob2/files/patch-src_VoiceRecorder.cpp
new file mode 100644
index 00000000000..9c49c581ad3
--- /dev/null
+++ b/games/glob2/files/patch-src_VoiceRecorder.cpp
@@ -0,0 +1,11 @@
+--- ./src/VoiceRecorder.cpp.orig	2009-01-06 17:24:57.000000000 +0100
++++ ./src/VoiceRecorder.cpp	2009-03-01 18:33:04.000000000 +0100
+@@ -36,7 +36,7 @@
+ #define SPEEX_FRAME_SIZE 160
+ 
+ #ifdef HAVE_PORTAUDIO
+-	#include "portaudio.h"
++	#include <portaudio2/portaudio.h>
+ #else
+ 	#ifdef WIN32
+ 		// Windows audio input include
diff --git a/games/glob2/pkg-plist b/games/glob2/pkg-plist
index 89e3278a024..7c1dd269467 100644
--- a/games/glob2/pkg-plist
+++ b/games/glob2/pkg-plist
@@ -5,6 +5,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/campaigns/tutorial-part2.map
 %%DATADIR%%/campaigns/tutorial-part3.map
 %%DATADIR%%/campaigns/tutorial-part4.map
+%%DATADIR%%/data/authors.txt
 %%DATADIR%%/data/buildings.default.txt
 %%DATADIR%%/data/buildings.txt
 %%DATADIR%%/data/fonts/sans.ttf
@@ -321,7 +322,16 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/gamegui32.png
 %%DATADIR%%/data/gfx/gamegui33.png
 %%DATADIR%%/data/gfx/gamegui34.png
+%%DATADIR%%/data/gfx/gamegui35.png
+%%DATADIR%%/data/gfx/gamegui36.png
+%%DATADIR%%/data/gfx/gamegui37.png
+%%DATADIR%%/data/gfx/gamegui38.png
+%%DATADIR%%/data/gfx/gamegui39.png
 %%DATADIR%%/data/gfx/gamegui4.png
+%%DATADIR%%/data/gfx/gamegui40.png
+%%DATADIR%%/data/gfx/gamegui41.png
+%%DATADIR%%/data/gfx/gamegui42.png
+%%DATADIR%%/data/gfx/gamegui43.png
 %%DATADIR%%/data/gfx/gamegui5.png
 %%DATADIR%%/data/gfx/gamegui6.png
 %%DATADIR%%/data/gfx/gamegui7.png
@@ -344,6 +354,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/guitheme21.png
 %%DATADIR%%/data/gfx/guitheme22.png
 %%DATADIR%%/data/gfx/guitheme23.png
+%%DATADIR%%/data/gfx/guitheme24.png
 %%DATADIR%%/data/gfx/guitheme3.png
 %%DATADIR%%/data/gfx/guitheme4.png
 %%DATADIR%%/data/gfx/guitheme5.png
@@ -877,6 +888,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/terrain97.png
 %%DATADIR%%/data/gfx/terrain98.png
 %%DATADIR%%/data/gfx/terrain99.png
+%%DATADIR%%/data/gfx/title.png
 %%DATADIR%%/data/gfx/unit0r.png
 %%DATADIR%%/data/gfx/unit100.png
 %%DATADIR%%/data/gfx/unit100r.png
@@ -1664,32 +1676,57 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/pal.txt
 %%DATADIR%%/data/ressources.txt
 %%DATADIR%%/data/texts.ar.txt
+%%DATADIR%%/data/texts.ar.txt.orig
 %%DATADIR%%/data/texts.br.txt
+%%DATADIR%%/data/texts.br.txt.orig
 %%DATADIR%%/data/texts.ca.txt
+%%DATADIR%%/data/texts.ca.txt.orig
 %%DATADIR%%/data/texts.cz.txt
+%%DATADIR%%/data/texts.cz.txt.orig
 %%DATADIR%%/data/texts.de.txt
+%%DATADIR%%/data/texts.de.txt.orig
 %%DATADIR%%/data/texts.dk.txt
+%%DATADIR%%/data/texts.dk.txt.orig
 %%DATADIR%%/data/texts.en.txt
+%%DATADIR%%/data/texts.en.txt.orig
 %%DATADIR%%/data/texts.es.txt
+%%DATADIR%%/data/texts.es.txt.orig
 %%DATADIR%%/data/texts.eu.txt
+%%DATADIR%%/data/texts.eu.txt.orig
 %%DATADIR%%/data/texts.fr.txt
+%%DATADIR%%/data/texts.fr.txt.orig
 %%DATADIR%%/data/texts.gr.txt
+%%DATADIR%%/data/texts.gr.txt.orig
 %%DATADIR%%/data/texts.hu.txt
+%%DATADIR%%/data/texts.hu.txt.orig
 %%DATADIR%%/data/texts.incomplete.txt
 %%DATADIR%%/data/texts.it.txt
+%%DATADIR%%/data/texts.it.txt.orig
 %%DATADIR%%/data/texts.keys.txt
+%%DATADIR%%/data/texts.keys.txt.orig
 %%DATADIR%%/data/texts.list.txt
 %%DATADIR%%/data/texts.nl.txt
+%%DATADIR%%/data/texts.nl.txt.orig
 %%DATADIR%%/data/texts.pl.txt
+%%DATADIR%%/data/texts.pl.txt.orig
 %%DATADIR%%/data/texts.pt.txt
+%%DATADIR%%/data/texts.pt.txt.orig
 %%DATADIR%%/data/texts.ro.txt
+%%DATADIR%%/data/texts.ro.txt.orig
 %%DATADIR%%/data/texts.ru.txt
+%%DATADIR%%/data/texts.ru.txt.orig
 %%DATADIR%%/data/texts.si.txt
+%%DATADIR%%/data/texts.si.txt.orig
 %%DATADIR%%/data/texts.sk.txt
+%%DATADIR%%/data/texts.sk.txt.orig
 %%DATADIR%%/data/texts.sr.txt
+%%DATADIR%%/data/texts.sr.txt.orig
 %%DATADIR%%/data/texts.sv.txt
+%%DATADIR%%/data/texts.sv.txt.orig
 %%DATADIR%%/data/texts.tr.txt
+%%DATADIR%%/data/texts.tr.txt.orig
 %%DATADIR%%/data/texts.zh-tw.txt
+%%DATADIR%%/data/texts.zh-tw.txt.orig
 %%DATADIR%%/data/units.txt
 %%DATADIR%%/data/unitsSkins.txt
 %%DATADIR%%/data/zik/a1.ogg
@@ -1703,6 +1740,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/maps/FourSquares1.map
 %%DATADIR%%/maps/G2.map
 %%DATADIR%%/maps/Garden_3.map
+%%DATADIR%%/maps/Holiday_Island_2.map
 %%DATADIR%%/maps/Isles.map
 %%DATADIR%%/maps/Migration.map
 %%DATADIR%%/maps/Muka.map