Update to version 0.8.4 [1]

This update also fixes the build with clang.

Reported by:	Kevin Zheng <kevinz5000@gmail.com> [1]
Approved by:	crees (mentor)

8 files changed, 70 insertions, 49 deletions

diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index f560bb7b19ce..0b33c4ce2708 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	netpanzer
-PORTVERSION=	0.8.1
-PORTREVISION=	9
+PORTVERSION=	0.8.4
 CATEGORIES=	games
-MASTER_SITES=	BERLIOS
+MASTER_SITES=	LOCAL/madpilot/netpanzer
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Real time, isometric view, tank multiplayer strategy game
@@ -17,34 +16,40 @@ COMMENT=	Real time, isometric view, tank multiplayer strategy game
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	physfs.1:${PORTSDIR}/devel/physfs
-BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-RUN_DEPENDS=	${LOCALBASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpanzer-data
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-libphysfs=${LOCALBASE} --without-wx-config
+MAKE_JOBS_SAFE=	yes
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 
 USE_BZIP2=	yes
-USE_SDL=	sdl net mixer image ttf
+USE_SDL=	sdl mixer image
 USE_GNOME=	libxml2
+USE_SCONS=	yes
+SCONS_ARGS+=	datadir="${DATADIR}"
+SCONS_BUILDENV=	${SCONS_ENV}
 
-post-patch:
-	@for ff in `${FIND} ${WRKDIR} -type f -name '*.[ch]pp' -exec ${GREP} -q stdint.h {} \; -print`; do \
-		${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' $${ff}; \
-	done
-	@${REINPLACE_CMD} -e "s|##DOCSDIR##|${DOCSDIR}|" ${WRKSRC}/Jamconfig.in
+PORTDOCS=	*
+PORTDATA=	*
+MAN6=		netpanzer.6
 
-.if defined(NOPORTDOCS)
 post-configure:
-	${REINPLACE_CMD} -e '/InstallDoc/d' ${WRKSRC}/Jamfile
-.endif
-
-do-build:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam)
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/SConstruct
 
 do-install:
-	@(cd ${INSTALL_WRKSRC} && jam ${INSTALL_TARGET})
+	${INSTALL_PROGRAM} ${WRKSRC}/netpanzer ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "cache maps pics powerups scripts sound units wads"  ${DATADIR})
+	${INSTALL_MAN} ${WRKSRC}/docs/netpanzer.6 ${MANPREFIX}/man/man6
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/netpanzer.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/netpanzer.png ${WRKSRC}/netpanzer.xpm ${PREFIX}/share/pixmaps
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_MAN} COPYING ChangeLog README RELNOTES TODO ${DOCSDIR})
+	(cd ${WRKSRC}/docs && ${INSTALL_MAN} Doxyfile code-notes.txt coding.txt serverhowto.html tipofday.txt ${DOCSDIR})
+.endif
+
+do-fetch-svn:
+	svn export svn://svn.berlios.de/${PORTNAME}/tags/${PORTNAME}/${PORTVERSION} ${PORTNAME}-${PORTVERSION}
+	tar cjf ${PORTNAME}-${PORTVERSION}.tar.bz2 ${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/games/netpanzer/distinfo b/games/netpanzer/distinfo
index b30ba3954d05..037452969dfc 100644
--- a/games/netpanzer/distinfo
+++ b/games/netpanzer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netpanzer-0.8.1.tar.bz2) = 9c6706142c2d39f0fb09a48c94d4c90069a8959cc5c30a98d8c10d03d0b2432d
-SIZE (netpanzer-0.8.1.tar.bz2) = 392603
+SHA256 (netpanzer-0.8.4.tar.bz2) = 96ee69fbe0f84cd46647e35f0983c9ef8869ad2f2b9e244a82d34d8ea6279712
+SIZE (netpanzer-0.8.4.tar.bz2) = 11731818
diff --git a/games/netpanzer/files/patch-Jamconfig.in b/games/netpanzer/files/patch-Jamconfig.in
deleted file mode 100644
index 04ceb7a155b3..000000000000
--- a/games/netpanzer/files/patch-Jamconfig.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- Jamconfig.in.orig	Mon Feb 21 21:40:27 2005
-+++ Jamconfig.in	Mon Feb 21 21:41:05 2005
-@@ -98,3 +98,4 @@
- LTLIBOBJS ?= "@LTLIBOBJS@" ;
- INSTALL ?= "@INSTALL@" ;
- JAMCONFIG_READ = yes ;
-+fbsdocdir = "##DOCSDIR##" ;
diff --git a/games/netpanzer/files/patch-SConstruct b/games/netpanzer/files/patch-SConstruct
new file mode 100644
index 000000000000..5e2f83c7bced
--- /dev/null
+++ b/games/netpanzer/files/patch-SConstruct
@@ -0,0 +1,19 @@
+--- SConstruct.orig	2011-12-22 19:32:06.000000000 +0100
++++ SConstruct	2012-04-24 23:49:38.000000000 +0200
+@@ -69,7 +69,7 @@
+     ('crossmingwsdlconfig','sets the sdl-config full path for mingw cross compiler', 'sdl-config')
+ )
+ 
+-env = Environment(ENV = os.environ, options = opts)
++env = Environment(ENV = os.environ, options = opts, CC = os.environ['CC'], CXX = os.environ['CXX'])
+ Help(opts.GenerateHelpText(env))
+ 
+ ################################################################
+@@ -240,6 +240,7 @@
+     SetupSpawn(env)
+ else:
+     env.ParseConfig(env['sdlconfig'] + ' --cflags --libs')
++    env.Append( _LIBFLAGS = [ '-L%%LOCALBASE%%/lib' ] )
+     env.Append( NPLIBS = [ 'SDL_mixer' ] )
+ 
+ # for crossmingw platform
diff --git a/games/netpanzer/files/patch-mk-jam-install.jam b/games/netpanzer/files/patch-mk-jam-install.jam
deleted file mode 100644
index a4c29e11690c..000000000000
--- a/games/netpanzer/files/patch-mk-jam-install.jam
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/jam/install.jam.orig	Mon Feb 21 19:58:28 2005
-+++ mk/jam/install.jam	Mon Feb 21 20:02:05 2005
-@@ -11,7 +11,7 @@
- 
- # set some paths
- appdatadir ?= [ ConcatDirs $(datadir) $(PACKAGE_NAME) ] ;
--appdocdir ?= [ ConcatDirs $(datadir) doc $(PACKAGE_NAME)-$(PACKAGE_VERSION) ] ;
-+appdocdir ?= $(fbsdocdir) ;
- appconfdir ?= [ ConcatDirs $(sysconfdir) $(PACKAGE_NAME) ] ;
- plugindir ?= [ ConcatDirs $(libdir) $(PACKAGE_NAME) ] ;
- 
diff --git a/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp b/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp
new file mode 100644
index 000000000000..4063a78da49b
--- /dev/null
+++ b/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp
@@ -0,0 +1,11 @@
+--- src/Lib/ArrayUtil/QueueTemplate.hpp.orig	2012-04-24 23:51:05.000000000 +0200
++++ src/Lib/ArrayUtil/QueueTemplate.hpp	2012-04-24 23:51:15.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+     bool enqueue(const TYPE& object )
+     {
+-        add( object, (rear + 1) % this->size );
++        this->add( object, (rear + 1) % this->size );
+         rear = (rear + 1) % this->size;
+ 
+         if ( front == rear )
diff --git a/games/netpanzer/files/patch-src_Lib_Network_Address.hpp b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp
new file mode 100644
index 000000000000..28e7e1810bcc
--- /dev/null
+++ b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp
@@ -0,0 +1,11 @@
+--- src/Lib/Network/Address.hpp.orig	2010-01-19 17:08:17.000000000 +0100
++++ src/Lib/Network/Address.hpp	2012-04-20 17:34:26.306480287 +0200
+@@ -47,7 +47,7 @@
+     struct sockaddr * getSockaddr() const { return (struct sockaddr *)&ss; };
+     socklen_t getSockaddrLen() const
+     {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+         return sizeof(sockaddr_in); 
+ #else
+         return ss_len;
diff --git a/games/netpanzer/pkg-plist b/games/netpanzer/pkg-plist
index a24c8d088dcb..ee9e27eea36c 100644
--- a/games/netpanzer/pkg-plist
+++ b/games/netpanzer/pkg-plist
@@ -1,12 +1,5 @@
 bin/netpanzer
 share/applications/netpanzer.desktop
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/serverhowto.html
-%%PORTDOCS%%%%DOCSDIR%%/tipofday.txt
 share/pixmaps/netpanzer.png
 share/pixmaps/netpanzer.xpm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications