Upgrade to Alpha18 and update WWW.

Noticed by:	Skasi <skasski (at) gmx.at>

5 files changed, 68 insertions, 12 deletions

diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index eda7baa027f4..d3fed7765fe9 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -6,40 +6,46 @@
 #
 
 PORTNAME=		glob2
-PORTVERSION=		0.8.17
+PORTVERSION=		0.8.18
 CATEGORIES=		games
 MASTER_SITES=		http://epfl.ysagoon.com/~glob2/data/
 
 MAINTAINER=		thierry@FreeBSD.org
 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.3:${PORTSDIR}/audio/speex		\
 			freetype.9:${PORTSDIR}/print/freetype2
 
-USE_SDL=		image net sdl
+USE_SDL=		image net sdl ttf
 USE_GL=			yes
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=		CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include"	\
 			LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
-USE_GCC=		3.4
-USE_REINPLACE=		yes
-
-PLIST_FILES=		bin/glob2
 
 .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 alpha"
+BROKEN=			Does not build on ${ARCH}
 .endif
 
 pre-configure:
-	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|"	\
+	${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|"	\
 		${WRKSRC}/configure
+	${REINPLACE_CMD} -e "s|Icon=|Icon=${DATADIR}/|"		\
+		${WRKSRC}/data/glob2.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/glob2 ${PREFIX}/bin
+	${MKDIR} ${DATADIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/data/glob2.desktop ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/data/icons/glob2-icon-48x48.png ${DATADIR}
 
 post-install:
 	@${ECHO_MSG}
diff --git a/games/glob2/distinfo b/games/glob2/distinfo
index eefb89256899..b1a393e79274 100644
--- a/games/glob2/distinfo
+++ b/games/glob2/distinfo
@@ -1,3 +1,3 @@
-MD5 (glob2-0.8.17.tar.gz) = a02ccdfdee0e4a550487fc4cf22a9480
-SHA256 (glob2-0.8.17.tar.gz) = f72b7ab66e5fd9dedd78a71df32942a0293027db01e00e2395d0b4381d17566e
-SIZE (glob2-0.8.17.tar.gz) = 8887975
+MD5 (glob2-0.8.18.tar.gz) = 7c8136d674b2bed90e91a2971d4d41ca
+SHA256 (glob2-0.8.18.tar.gz) = 62baf6ae48cfd82bad82027c607218a11067debb2a639e165917df490e1f46cf
+SIZE (glob2-0.8.18.tar.gz) = 9125977
diff --git a/games/glob2/files/patch-libgag_src_FileManager.cpp b/games/glob2/files/patch-libgag_src_FileManager.cpp
new file mode 100644
index 000000000000..5328524c9d85
--- /dev/null
+++ b/games/glob2/files/patch-libgag_src_FileManager.cpp
@@ -0,0 +1,45 @@
+--- ./libgag/src/FileManager.cpp.orig	Sat Dec 10 23:25:19 2005
++++ ./libgag/src/FileManager.cpp	Sat Feb 18 09:52:32 2006
+@@ -86,13 +86,17 @@
+ #endif
+ 		addDir(".");
+ 
+-		#ifndef WIN32 	
++		#ifndef WIN32
+ 		#ifndef __APPLE__
+ 		/* Find own path
+ 		 * TODO: Make nicer */
+-		
++
+ 		char link[100];
++		#ifdef __FreeBSD__
++		char proc[]="/proc/curproc/file";
++		#else
+ 		char proc[]="/proc/self/exe";
++		#endif
+ 		char * pch;
+ 
+ 		int linksize = readlink(proc, link, sizeof(link));
+@@ -102,17 +106,17 @@
+ 		}
+ 		else
+ 		{
+-			assert ((int)sizeof(link) > linksize); 
++			assert ((int)sizeof(link) > linksize);
+ 			link[linksize] = '\0';
+ 
+-			pch = strrchr(link,'/');	
+-			if ( (pch-link) > 0) 
++			pch = strrchr(link,'/');
++			if ( (pch-link) > 0)
+ 				link[pch-link] = '\0';
+ 			else
+ 				link[1] = '\0';
+ 
+-			pch = strrchr(link,'/');	
+-			if ( (pch-link) > 0) 
++			pch = strrchr(link,'/');
++			if ( (pch-link) > 0)
+ 				link[pch-link] = '\0';
+ 
+ 			if ((linksize + 13) <= (int)sizeof(link))
diff --git a/games/glob2/pkg-descr b/games/glob2/pkg-descr
index b4fcff05222a..371eb74a2c24 100644
--- a/games/glob2/pkg-descr
+++ b/games/glob2/pkg-descr
@@ -9,4 +9,4 @@ Internet thanks to Ysagoon Online Game [YOG], a meta-server. It also
 features a scripting language for versatile gameplay or tutorials and an
 integrated map editor.
 
-WWW: http://www.ysagoon.com/glob2/
+WWW: http://globulation2.org/
diff --git a/games/glob2/pkg-plist b/games/glob2/pkg-plist
new file mode 100644
index 000000000000..68cad059030f
--- /dev/null
+++ b/games/glob2/pkg-plist
@@ -0,0 +1,5 @@
+bin/glob2
+share/applications/glob2.desktop
+%%DATADIR%%/glob2-icon-48x48.png
+@dirrm %%DATADIR%%
+@dirrmtry share/applications