Update to 0.8.22.

	Data are no longer included in the source tarball, mirror them.

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

5 files changed, 153 insertions, 97 deletions

diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index f90fc6f9530e..5d0c4648a054 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -6,10 +6,13 @@
 #
 
 PORTNAME=		glob2
-PORTVERSION=		0.8.21
-PORTREVISION=	2
+PORTVERSION=		0.8.22
 CATEGORIES=		games
-MASTER_SITES=		http://globulation2.org/releases/${PORTVERSION}/
+MASTER_SITES=		http://globulation2.org/releases/${PORTVERSION}/:src	\
+			${MASTER_SITE_LOCAL:S|$|:data|:S|%SUBDIR%|${MASTER_SITE_SUBDIR}|}
+MASTER_SITE_SUBDIR=	thierry
+DISTFILES=		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src	\
+			${PORTNAME}-data_from_CVS-${PORTVERSION}${EXTRACT_SUFX}:data
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		Globulation 2 - a free and innovative strategy game
@@ -17,6 +20,7 @@ COMMENT=		Globulation 2 - a free and innovative strategy game
 BUILD_DEPENDS=		${LOCALBASE}/include/boost/rational.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS=		vorbis.3:${PORTSDIR}/audio/libvorbis	\
 			speex.1:${PORTSDIR}/audio/speex		\
+			fribidi.0:${PORTSDIR}/converters/fribidi\
 			freetype.9:${PORTSDIR}/print/freetype2
 
 USE_SDL=		image net sdl ttf
@@ -29,10 +33,6 @@ CONFIGURE_ENV=		CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-BROKEN=			Does not compile with gcc-2.95
-.endif
-
 .if ${ARCH} == "alpha"
 BROKEN=			Does not build on ${ARCH}
 .endif
diff --git a/games/glob2/distinfo b/games/glob2/distinfo
index f4766ffaabae..8cdec4e07088 100644
--- a/games/glob2/distinfo
+++ b/games/glob2/distinfo
@@ -1,3 +1,6 @@
-MD5 (glob2-0.8.21.tar.gz) = 3173f82572f1dd5fba79019ebc43d427
-SHA256 (glob2-0.8.21.tar.gz) = db687dafbba0f7b3b49ce6e0bc70205445b870a6a9afda504f8f7a7f48631ec4
-SIZE (glob2-0.8.21.tar.gz) = 9496398
+MD5 (glob2-0.8.22.tar.gz) = 0e57a41d6a534c0242c37a424e064b49
+SHA256 (glob2-0.8.22.tar.gz) = f17f1480d65dc20cad85abed1351d44ac3a82bbbda31c04826048ccb2aac3303
+SIZE (glob2-0.8.22.tar.gz) = 8982137
+MD5 (glob2-data_from_CVS-0.8.22.tar.gz) = 5a88f9f325ef9ce8a9f4d4c031ba345d
+SHA256 (glob2-data_from_CVS-0.8.22.tar.gz) = 3f5e161ab513e8b1ff15e0d856943c5c002225c1d2817ef369b4e5ca1d2c7553
+SIZE (glob2-data_from_CVS-0.8.22.tar.gz) = 9271322
diff --git a/games/glob2/files/patch-configure b/games/glob2/files/patch-configure
index 7433bdcdda29..331178d516af 100644
--- a/games/glob2/files/patch-configure
+++ b/games/glob2/files/patch-configure
@@ -1,24 +1,12 @@
---- configure.orig	Sun Aug  8 19:53:25 2004
-+++ configure	Sat Aug 14 18:01:58 2004
-@@ -5175,8 +5175,8 @@
- /* end confdefs.h.  */
- #include <GL/gl.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp $CFLAGS conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5318,8 +5318,8 @@
- /* end confdefs.h.  */
- #include <GL/glu.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp $CFLAGS conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
+--- configure.orig	Wed Apr  4 03:39:32 2007
++++ configure	Sun Apr  8 18:08:24 2007
+@@ -2374,9 +2374,6 @@
+ 
+ ac_config_headers="$ac_config_headers config.h"
+ 
+-
+-CXXFLAGS="-O3 -march=i686"
+-
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/games/glob2/files/patch-src_ConfigFiles.h b/games/glob2/files/patch-src_ConfigFiles.h
new file mode 100644
index 000000000000..738e1de58fc7
--- /dev/null
+++ b/games/glob2/files/patch-src_ConfigFiles.h
@@ -0,0 +1,15 @@
+--- src/ConfigFiles.h.orig	Sat Sep  9 16:07:13 2006
++++ src/ConfigFiles.h	Sun Apr  8 18:55:00 2007
+@@ -178,7 +178,11 @@
+ 		else
+ 		{
+ 			std::cerr << "ConfigVector::get(" << static_cast<unsigned int>(id) << ") : warning : id is not valid, returning default" << std::endl;
+-			assert(false);
++			// FreeBSD: patch impoted from glob2's CVS
++			//			assert(false);
++			// I commented the assert because it crashed glob2
++			// sometimes, when a building was repaired.
++			// This has to be really fixed!
+ 			return &defaultEntry;
+ 		}
+ 	}
diff --git a/games/glob2/pkg-plist b/games/glob2/pkg-plist
index 63fd38369192..6f7e05ba8722 100644
--- a/games/glob2/pkg-plist
+++ b/games/glob2/pkg-plist
@@ -1,6 +1,83 @@
 bin/glob2
 share/applications/glob2.desktop
+%%DATADIR%%/AUTHORS
+%%DATADIR%%/campaigns/Joey_mission_1.map
+%%DATADIR%%/campaigns/Joey_mission_2.map
+%%DATADIR%%/campaigns/Joey_mission_3.map
+%%DATADIR%%/campaigns/Joey_mission_4.map
+%%DATADIR%%/campaigns/Joey_mission_5.map
+%%DATADIR%%/campaigns/Joey_mission_6.map
+%%DATADIR%%/campaigns/Joey_mission_7.map
+%%DATADIR%%/data/buildings.default.txt
+%%DATADIR%%/data/buildings.txt
 %%DATADIR%%/data/fonts/sans.ttf
+%%DATADIR%%/data/gfx/IntroMN.png
+%%DATADIR%%/data/gfx/area0.png
+%%DATADIR%%/data/gfx/area1.png
+%%DATADIR%%/data/gfx/area10.png
+%%DATADIR%%/data/gfx/area11.png
+%%DATADIR%%/data/gfx/area12.png
+%%DATADIR%%/data/gfx/area13.png
+%%DATADIR%%/data/gfx/area14.png
+%%DATADIR%%/data/gfx/area15.png
+%%DATADIR%%/data/gfx/area16.png
+%%DATADIR%%/data/gfx/area17.png
+%%DATADIR%%/data/gfx/area18.png
+%%DATADIR%%/data/gfx/area19.png
+%%DATADIR%%/data/gfx/area2.png
+%%DATADIR%%/data/gfx/area20.png
+%%DATADIR%%/data/gfx/area21.png
+%%DATADIR%%/data/gfx/area22.png
+%%DATADIR%%/data/gfx/area23.png
+%%DATADIR%%/data/gfx/area3.png
+%%DATADIR%%/data/gfx/area4.png
+%%DATADIR%%/data/gfx/area5.png
+%%DATADIR%%/data/gfx/area6.png
+%%DATADIR%%/data/gfx/area7.png
+%%DATADIR%%/data/gfx/area8.png
+%%DATADIR%%/data/gfx/area9.png
+%%DATADIR%%/data/gfx/barracks0b0.png
+%%DATADIR%%/data/gfx/barracks0b0r.png
+%%DATADIR%%/data/gfx/barracks1b0.png
+%%DATADIR%%/data/gfx/barracks1b0r.png
+%%DATADIR%%/data/gfx/barracks2b0.png
+%%DATADIR%%/data/gfx/barracks2b0r.png
+%%DATADIR%%/data/gfx/black0.png
+%%DATADIR%%/data/gfx/black1.png
+%%DATADIR%%/data/gfx/black10.png
+%%DATADIR%%/data/gfx/black11.png
+%%DATADIR%%/data/gfx/black12.png
+%%DATADIR%%/data/gfx/black13.png
+%%DATADIR%%/data/gfx/black14.png
+%%DATADIR%%/data/gfx/black15.png
+%%DATADIR%%/data/gfx/black2.png
+%%DATADIR%%/data/gfx/black3.png
+%%DATADIR%%/data/gfx/black4.png
+%%DATADIR%%/data/gfx/black5.png
+%%DATADIR%%/data/gfx/black6.png
+%%DATADIR%%/data/gfx/black7.png
+%%DATADIR%%/data/gfx/black8.png
+%%DATADIR%%/data/gfx/black9.png
+%%DATADIR%%/data/gfx/brush0.png
+%%DATADIR%%/data/gfx/brush1.png
+%%DATADIR%%/data/gfx/brush2.png
+%%DATADIR%%/data/gfx/brush3.png
+%%DATADIR%%/data/gfx/brush4.png
+%%DATADIR%%/data/gfx/brush5.png
+%%DATADIR%%/data/gfx/brush6.png
+%%DATADIR%%/data/gfx/brush7.png
+%%DATADIR%%/data/gfx/brush8.png
+%%DATADIR%%/data/gfx/brush9.png
+%%DATADIR%%/data/gfx/buildingsite0.png
+%%DATADIR%%/data/gfx/buildingsite1.png
+%%DATADIR%%/data/gfx/buildingsite2.png
+%%DATADIR%%/data/gfx/buildingsite3.png
+%%DATADIR%%/data/gfx/buildingsite4.png
+%%DATADIR%%/data/gfx/buildingsite5.png
+%%DATADIR%%/data/gfx/bullet0.png
+%%DATADIR%%/data/gfx/bullet1.png
+%%DATADIR%%/data/gfx/clearingflag0r.png
+%%DATADIR%%/data/gfx/cloud0.png
 %%DATADIR%%/data/gfx/cursor/click0r.png
 %%DATADIR%%/data/gfx/cursor/click1r.png
 %%DATADIR%%/data/gfx/cursor/click2r.png
@@ -191,50 +268,6 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/cursor/wait7r.png
 %%DATADIR%%/data/gfx/cursor/wait8r.png
 %%DATADIR%%/data/gfx/cursor/wait9r.png
-%%DATADIR%%/data/gfx/IntroMN.png
-%%DATADIR%%/data/gfx/barracks0b0.png
-%%DATADIR%%/data/gfx/barracks0b0r.png
-%%DATADIR%%/data/gfx/barracks1b0.png
-%%DATADIR%%/data/gfx/barracks1b0r.png
-%%DATADIR%%/data/gfx/barracks2b0.png
-%%DATADIR%%/data/gfx/barracks2b0r.png
-%%DATADIR%%/data/gfx/black0.png
-%%DATADIR%%/data/gfx/black1.png
-%%DATADIR%%/data/gfx/black10.png
-%%DATADIR%%/data/gfx/black11.png
-%%DATADIR%%/data/gfx/black12.png
-%%DATADIR%%/data/gfx/black13.png
-%%DATADIR%%/data/gfx/black14.png
-%%DATADIR%%/data/gfx/black15.png
-%%DATADIR%%/data/gfx/black2.png
-%%DATADIR%%/data/gfx/black3.png
-%%DATADIR%%/data/gfx/black4.png
-%%DATADIR%%/data/gfx/black5.png
-%%DATADIR%%/data/gfx/black6.png
-%%DATADIR%%/data/gfx/black7.png
-%%DATADIR%%/data/gfx/out.png
-%%DATADIR%%/data/gfx/black8.png
-%%DATADIR%%/data/gfx/black9.png
-%%DATADIR%%/data/gfx/brush0.png
-%%DATADIR%%/data/gfx/brush1.png
-%%DATADIR%%/data/gfx/brush2.png
-%%DATADIR%%/data/gfx/brush3.png
-%%DATADIR%%/data/gfx/brush4.png
-%%DATADIR%%/data/gfx/brush5.png
-%%DATADIR%%/data/gfx/brush6.png
-%%DATADIR%%/data/gfx/brush7.png
-%%DATADIR%%/data/gfx/brush8.png
-%%DATADIR%%/data/gfx/brush9.png
-%%DATADIR%%/data/gfx/buildingsite0.png
-%%DATADIR%%/data/gfx/buildingsite1.png
-%%DATADIR%%/data/gfx/buildingsite2.png
-%%DATADIR%%/data/gfx/buildingsite3.png
-%%DATADIR%%/data/gfx/buildingsite4.png
-%%DATADIR%%/data/gfx/buildingsite5.png
-%%DATADIR%%/data/gfx/bullet0.png
-%%DATADIR%%/data/gfx/bullet1.png
-%%DATADIR%%/data/gfx/clearingflag0r.png
-%%DATADIR%%/data/gfx/cloud0.png
 %%DATADIR%%/data/gfx/death0r.png
 %%DATADIR%%/data/gfx/death1r.png
 %%DATADIR%%/data/gfx/death2r.png
@@ -290,6 +323,30 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/gamegui7.png
 %%DATADIR%%/data/gfx/gamegui8.png
 %%DATADIR%%/data/gfx/gamegui9.png
+%%DATADIR%%/data/gfx/guitheme0.png
+%%DATADIR%%/data/gfx/guitheme1.png
+%%DATADIR%%/data/gfx/guitheme10.png
+%%DATADIR%%/data/gfx/guitheme11.png
+%%DATADIR%%/data/gfx/guitheme12.png
+%%DATADIR%%/data/gfx/guitheme13.png
+%%DATADIR%%/data/gfx/guitheme14.png
+%%DATADIR%%/data/gfx/guitheme15.png
+%%DATADIR%%/data/gfx/guitheme16.png
+%%DATADIR%%/data/gfx/guitheme17.png
+%%DATADIR%%/data/gfx/guitheme18.png
+%%DATADIR%%/data/gfx/guitheme19.png
+%%DATADIR%%/data/gfx/guitheme2.png
+%%DATADIR%%/data/gfx/guitheme20.png
+%%DATADIR%%/data/gfx/guitheme21.png
+%%DATADIR%%/data/gfx/guitheme22.png
+%%DATADIR%%/data/gfx/guitheme23.png
+%%DATADIR%%/data/gfx/guitheme3.png
+%%DATADIR%%/data/gfx/guitheme4.png
+%%DATADIR%%/data/gfx/guitheme5.png
+%%DATADIR%%/data/gfx/guitheme6.png
+%%DATADIR%%/data/gfx/guitheme7.png
+%%DATADIR%%/data/gfx/guitheme8.png
+%%DATADIR%%/data/gfx/guitheme9.png
 %%DATADIR%%/data/gfx/hosp0b0.png
 %%DATADIR%%/data/gfx/hosp0b0r.png
 %%DATADIR%%/data/gfx/hosp0b1.png
@@ -320,7 +377,6 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/market0b0r.png
 %%DATADIR%%/data/gfx/minibarracks0b0.png
 %%DATADIR%%/data/gfx/minibarracks0b0r.png
-%%DATADIR%%/data/gfx/minihosp0b0.png
 %%DATADIR%%/data/gfx/minibarracks1b0.png
 %%DATADIR%%/data/gfx/minibarracks1b0r.png
 %%DATADIR%%/data/gfx/minibarracks2b0.png
@@ -336,8 +392,9 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/minidefencetower1b0.png
 %%DATADIR%%/data/gfx/minidefencetower1b0r.png
 %%DATADIR%%/data/gfx/minidefencetower2b0.png
-%%DATADIR%%/data/gfx/minihosp0b0r.png
 %%DATADIR%%/data/gfx/minidefencetower2b0r.png
+%%DATADIR%%/data/gfx/minihosp0b0.png
+%%DATADIR%%/data/gfx/minihosp0b0r.png
 %%DATADIR%%/data/gfx/minihosp0c0.png
 %%DATADIR%%/data/gfx/minihosp1b0.png
 %%DATADIR%%/data/gfx/minihosp1b0r.png
@@ -381,6 +438,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/miniswarm0b0.png
 %%DATADIR%%/data/gfx/miniswarm0b0r.png
 %%DATADIR%%/data/gfx/miniswarm0c0r.png
+%%DATADIR%%/data/gfx/out.png
 %%DATADIR%%/data/gfx/pool0b0.png
 %%DATADIR%%/data/gfx/pool0b0r.png
 %%DATADIR%%/data/gfx/pool0b1.png
@@ -501,6 +559,7 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gfx/rotatingEarth9.png
 %%DATADIR%%/data/gfx/rotatingEarthi.png
 %%DATADIR%%/data/gfx/school0b0.png
+%%DATADIR%%/data/gfx/school0b1.png
 %%DATADIR%%/data/gfx/school1b0.png
 %%DATADIR%%/data/gfx/school1b0r.png
 %%DATADIR%%/data/gfx/school1b1.png
@@ -1571,10 +1630,10 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gui/editor24.png
 %%DATADIR%%/data/gui/editor25.png
 %%DATADIR%%/data/gui/editor26.png
-%%DATADIR%%/data/gui/editor3.png
 %%DATADIR%%/data/gui/editor27.png
 %%DATADIR%%/data/gui/editor28.png
 %%DATADIR%%/data/gui/editor29.png
+%%DATADIR%%/data/gui/editor3.png
 %%DATADIR%%/data/gui/editor30.png
 %%DATADIR%%/data/gui/editor31.png
 %%DATADIR%%/data/gui/editor32.png
@@ -1587,21 +1646,16 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/gui/editor9.png
 %%DATADIR%%/data/gui/yog0.png
 %%DATADIR%%/data/gui/yog1.png
-%%DATADIR%%/data/zik/a1.ogg
-%%DATADIR%%/data/zik/a2.ogg
-%%DATADIR%%/data/zik/a3.ogg
-%%DATADIR%%/data/zik/intro.ogg
-%%DATADIR%%/data/zik/menu.ogg
-%%DATADIR%%/data/buildings.default.txt
-%%DATADIR%%/data/buildings.txt
 %%DATADIR%%/data/pal.txt
 %%DATADIR%%/data/ressources.txt
+%%DATADIR%%/data/texts.ar.txt
 %%DATADIR%%/data/texts.ca.txt
 %%DATADIR%%/data/texts.cz.txt
 %%DATADIR%%/data/texts.de.txt
 %%DATADIR%%/data/texts.dk.txt
 %%DATADIR%%/data/texts.en.txt
 %%DATADIR%%/data/texts.es.txt
+%%DATADIR%%/data/texts.eu.txt
 %%DATADIR%%/data/texts.fr.txt
 %%DATADIR%%/data/texts.hu.txt
 %%DATADIR%%/data/texts.it.txt
@@ -1612,7 +1666,6 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/texts.pt.txt
 %%DATADIR%%/data/texts.ro.txt
 %%DATADIR%%/data/texts.ru.txt
-%%DATADIR%%/data/texts.se.txt
 %%DATADIR%%/data/texts.si.txt
 %%DATADIR%%/data/texts.sk.txt
 %%DATADIR%%/data/texts.sr.txt
@@ -1620,6 +1673,11 @@ share/applications/glob2.desktop
 %%DATADIR%%/data/texts.tr.txt
 %%DATADIR%%/data/units.txt
 %%DATADIR%%/data/unitsSkins.txt
+%%DATADIR%%/data/zik/a1.ogg
+%%DATADIR%%/data/zik/a2.ogg
+%%DATADIR%%/data/zik/a3.ogg
+%%DATADIR%%/data/zik/intro.ogg
+%%DATADIR%%/data/zik/menu.ogg
 %%DATADIR%%/maps/A_big_pond.map
 %%DATADIR%%/maps/Centerfolds_2.map
 %%DATADIR%%/maps/Easy_Three.map
@@ -1646,14 +1704,6 @@ share/applications/glob2.desktop
 %%DATADIR%%/maps/the_sand_square.map
 %%DATADIR%%/maps/tutorial.map
 %%DATADIR%%/maps/weakness.map
-%%DATADIR%%/campaigns/Joey_mission_1.map
-%%DATADIR%%/campaigns/Joey_mission_2.map
-%%DATADIR%%/campaigns/Joey_mission_3.map
-%%DATADIR%%/campaigns/Joey_mission_4.map
-%%DATADIR%%/campaigns/Joey_mission_5.map
-%%DATADIR%%/campaigns/Joey_mission_6.map
-%%DATADIR%%/campaigns/Joey_mission_7.map
-%%DATADIR%%/AUTHORS
 %%DATADIR%%/pixmaps/glob2-icon-128x128.png
 %%DATADIR%%/pixmaps/glob2-icon-16x16.png
 %%DATADIR%%/pixmaps/glob2-icon-24x24.png