9 files changed, 52 insertions, 97 deletions

diff --git a/games/netpanzer/Makefile b/games/netpanzer/Makefile
index ffebdfb37990..c35e2a9ae032 100644
--- a/games/netpanzer/Makefile
+++ b/games/netpanzer/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	netpanzer
-PORTVERSION=	0.1.5
+PORTVERSION=	0.8
 CATEGORIES=	games
 MASTER_SITES=	http://download.berlios.de/netpanzer/
 
 MAINTAINER=	mad@madpilot.net
-COMMENT=	Real time, isometric view, tank strategy game(multiplayer)
+COMMENT=	Real time, isometric view, tank multiplayer strategy game
 
 LIB_DEPENDS=	physfs-1.0.0:${PORTSDIR}/devel/physfs
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
-RUN_DEPENDS=	${X11BASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpanzerdata
+RUN_DEPENDS=	${X11BASE}/share/netpanzer/wads/netp.act:${PORTSDIR}/games/netpanzer-data
+
+CONFLICTS=	netpanzerdata*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libphysfs=${LOCALBASE} --without-wx-config
@@ -33,6 +35,13 @@ 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
+
+.if defined(NOPORTDOCS)
+post-configure:
+	@(cd ${BUILD_WRKSRC}; \
+	${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/noportdocs-patch-Jamfile)
+.endif
 
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam)
diff --git a/games/netpanzer/distinfo b/games/netpanzer/distinfo
index 5439e506b9fe..cdd8a3ec6155 100644
--- a/games/netpanzer/distinfo
+++ b/games/netpanzer/distinfo
@@ -1,2 +1,2 @@
-MD5 (netpanzer-0.1.5.tar.bz2) = 6ffd1d301362d9a2bd9b1f77fa09ed67
-SIZE (netpanzer-0.1.5.tar.bz2) = 396395
+MD5 (netpanzer-0.8.tar.bz2) = c08c1b703eac533407db02510deca68e
+SIZE (netpanzer-0.8.tar.bz2) = 382007
diff --git a/games/netpanzer/files/noportdocs-patch-Jamfile b/games/netpanzer/files/noportdocs-patch-Jamfile
new file mode 100644
index 000000000000..b38b7f678fc0
--- /dev/null
+++ b/games/netpanzer/files/noportdocs-patch-Jamfile
@@ -0,0 +1,10 @@
+--- Jamfile.orig	Mon Feb 21 18:57:00 2005
++++ Jamfile	Mon Feb 21 18:57:19 2005
+@@ -40,6 +40,6 @@
+     }
+ 
+     InstallIcon netpanzer.png netpanzer.xpm ;
+-    InstallDoc ChangeLog README TODO RELNOTES docs/tipofday.txt docs/serverhowto.html ;
++#    InstallDoc ChangeLog README TODO RELNOTES docs/tipofday.txt docs/serverhowto.html ;
+     InstallDesktop netpanzer.desktop ;
+ }
diff --git a/games/netpanzer/files/patch-Jamconfig.in b/games/netpanzer/files/patch-Jamconfig.in
new file mode 100644
index 000000000000..04ceb7a155b3
--- /dev/null
+++ b/games/netpanzer/files/patch-Jamconfig.in
@@ -0,0 +1,7 @@
+--- 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-mk-jam-install.jam b/games/netpanzer/files/patch-mk-jam-install.jam
new file mode 100644
index 000000000000..a4c29e11690c
--- /dev/null
+++ b/games/netpanzer/files/patch-mk-jam-install.jam
@@ -0,0 +1,11 @@
+--- 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-LinkListDoubleTemplate.hpp b/games/netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp
deleted file mode 100644
index 0d7f5beaa8bd..000000000000
--- a/games/netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Lib/ArrayUtil/LinkListDoubleTemplate.hpp.orig	Tue Dec  2 12:40:14 2003
-+++ src/Lib/ArrayUtil/LinkListDoubleTemplate.hpp	Thu Aug 19 16:34:25 2004
-@@ -203,7 +203,7 @@
-             object->prev->next = before;
-         }
- 
--        if(delete_ptr == front) {
-+        if(object == front) {
-             front = before;
-         }
- 
diff --git a/games/netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp b/games/netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp
deleted file mode 100644
index 915ee182e555..000000000000
--- a/games/netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/Lib/ArrayUtil/QueueTemplate.hpp.orig	Sun Dec 21 01:48:03 2003
-+++ src/Lib/ArrayUtil/QueueTemplate.hpp	Thu Aug 19 16:34:31 2004
-@@ -42,8 +42,8 @@
- 
-     bool enqueue(const TYPE& object )
-     {
--        add( object, (rear + 1) % size );
--        rear = (rear + 1) % size;
-+        add( object, (rear + 1) % this->size );
-+        rear = (rear + 1) % this->size;
- 
-         if ( front == rear )
-             return( false );
-@@ -55,29 +55,29 @@
-     {
-         assert( front != rear );
- 
--        front = ( front + 1 ) % size;
--        return( array[ front ] );
-+        front = ( front + 1 ) % this->size;
-+        return( this->array[ front ] );
-     }
- 
-     void pop()
-     {
-         assert( front != rear );
- 
--        front = ( front + 1 ) % size;
-+        front = ( front + 1 ) % this->size;
-     }
- 
-     TYPE getFirst()
-     {
-         assert( front != rear );
- 
--        return( array[ (( front + 1 ) % size) ] );
-+        return( this->array[ (( front + 1 ) % this->size) ] );
-     }
- 
-     TYPE * getFirstPtr()
-     {
-         assert( front != rear );
- 
--        return( &(array[ (( front + 1 ) % size) ]) );
-+        return( &(this->array[ (( front + 1 ) % this->size) ]) );
-     }
- 
- 
-@@ -88,7 +88,7 @@
- 
-     bool isFull () const
-     {
--        return front == (rear + 1) % size;
-+        return front == (rear + 1) % this->size;
-     }
- 
-     bool isReady() const
-@@ -99,7 +99,7 @@
-     unsigned long itemCount() const
-     {
-         if ( front > rear )
--            return ( (rear+1) + ( (size-1) - front ) );
-+            return ( (rear+1) + ( (this->size-1) - front ) );
-         else
-             return ( rear - front );
-     }
diff --git a/games/netpanzer/files/patch-src-ServerBrowser-Main.cpp b/games/netpanzer/files/patch-src-ServerBrowser-Main.cpp
deleted file mode 100644
index 39cd93827a54..000000000000
--- a/games/netpanzer/files/patch-src-ServerBrowser-Main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ServerBrowser/Main.cpp.orig	Mon May 31 21:24:01 2004
-+++ src/ServerBrowser/Main.cpp	Mon May 31 21:24:44 2004
-@@ -16,7 +16,7 @@
-     srand(time(0));
- 
-     BrowserConfig* config = new BrowserConfig;
--    config->ircserver = "irc.freenode.net";
-+    config->ircserver = "irc.quakenet.org";
-     config->connect_timeout = 20;
-     config->query_timeout = 20;
- 
diff --git a/games/netpanzer/pkg-plist b/games/netpanzer/pkg-plist
index 6f4c5aaf88fc..09963986e787 100644
--- a/games/netpanzer/pkg-plist
+++ b/games/netpanzer/pkg-plist
@@ -1,6 +1,12 @@
 bin/netpanzer
-bin/netpanzerbrowser
-share/pixmaps/netpanzer/netpanzer.png
-share/pixmaps/netpanzer/netpanzer.xpm
-@dirrm share/pixmaps/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%%
 @unexec rmdir %D/share/pixmaps 2>/dev/null || true