ports/77905: [maintainer-update]: games/netpanzer update to 0.8 and portname change request for games/netpanzerdata
Guido Falsi
mad at madpilot.net
Tue Feb 22 05:10:21 UTC 2005
>Number: 77905
>Category: ports
>Synopsis: [maintainer-update]: games/netpanzer update to 0.8 and portname change request for games/netpanzerdata
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 22 05:10:20 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Guido Falsi
>Release: FreeBSD 5.3-STABLE i386
>Organization:
none
>Environment:
System: FreeBSD wedge.madpilot.net 5.3-STABLE FreeBSD 5.3-STABLE #30: Wed Feb 16 17:20:41 CET 2005 root at wedge.madpilot.net:/usr/obj/usr/src/sys/WEDGE i386
>Description:
Updating both netpanzer and netpanzer-data to 0.8 with many new features.
I've built the patches considering a change in the netpanzerdata
portname to netpanzer-data, because distfiles are now ditributed
with this name and the game's development team has choosen this new
convention for the future. I know changing a port name is not to
be taken lightly by port maintainers, but I really think in this
case this is a justified request. Also, I hope the development team
will not change the scheme in the future again.
Obviously this change has to be made known to port users, because
removing the old netpanzerdata one manually will be requested.
Perhaps an entry in UPDATING is the best choice.
The port also needs testing on 4.x, I don't have any such machines
handy. Anyway there should be no prooblems.
For the commit message I'd use something like this:
---START---
update to 0.8.
Note that the netpanzerdata port has changed it's name to netpanzer-data,
so before installing the new one you will need to remove the old
netpanzerdata-0.1.3 port.
---END---
If an entry in UPDATIN is considered acceptable I think this would
be what is needed:
---START---
AFFECTS: users of games/netpanzerdata, games/netpanzer
the netpanzerdata port containing netpanzer datafiles has been
renamed to "netpanzer-data", so if you'r using any automatic updating
script like portupgrade, you'll need to remove the old ports by
hand before updating.
---END---
removed files:
netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp
netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp
netpanzer/files/patch-src-ServerBrowser-Main.cpp
netpanzer-data/files/patch-configure
added files:
netpanzer/files/noportdocs-patch-Jamfile
netpanzer/files/patch-Jamconfig.in
netpanzer/files/patch-mk-jam-install.jam
>How-To-Repeat:
>Fix:
Patch for netpanzer-data:
diff -ruN netpanzerdata.old/Makefile netpanzer-data/Makefile
--- netpanzerdata.old/Makefile Mon Feb 21 03:33:45 2005
+++ netpanzer-data/Makefile Mon Feb 21 03:35:55 2005
@@ -5,8 +5,8 @@
# $FreeBSD: ports/games/netpanzerdata/Makefile,v 1.2 2004/09/30 05:31:53 kris Exp $
#
-PORTNAME= netpanzerdata
-PORTVERSION= 0.1.3
+PORTNAME= netpanzer-data
+PORTVERSION= 0.8
CATEGORIES= games
MASTER_SITES= http://download.berlios.de/netpanzer/
diff -ruN netpanzerdata.old/distinfo netpanzer-data/distinfo
--- netpanzerdata.old/distinfo Mon Feb 21 03:33:45 2005
+++ netpanzer-data/distinfo Mon Feb 21 03:38:54 2005
@@ -1,2 +1,2 @@
-MD5 (netpanzerdata-0.1.3.tar.bz2) = 3080e48be7cb28bdb8f8b26dd84b3755
-SIZE (netpanzerdata-0.1.3.tar.bz2) = 9821445
+MD5 (netpanzer-data-0.8.tar.bz2) = d2dbd5a6c38a181fa3b6aa9a68c81d2f
+SIZE (netpanzer-data-0.8.tar.bz2) = 10123751
diff -ruN netpanzerdata.old/files/patch-configure netpanzer-data/files/patch-configure
--- netpanzerdata.old/files/patch-configure Mon Feb 21 03:33:45 2005
+++ netpanzer-data/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,23 +0,0 @@
---- configure.orig Sun May 30 18:03:41 2004
-+++ configure Sun May 30 18:04:34 2004
-@@ -3496,12 +3496,14 @@
-
- cat >conftest.$ac_ext <<_ACEOF
- #include <physfs.h>
--#if PHYSFS_VER_MINOR < 1
--# error PHYSFS is too old
--#else
--# if PHYSFS_VER_MINOR == 1
--# if PHYSFS_VER_PATCH < 9
--# error PHYSFS is too old
-+#if PHYSFS_VER_MAJOR == 0
-+# if PHYSFS_VER_MINOR < 1
-+# error PHYSFS is too old
-+# else
-+# if PHYSFS_VER_MINOR == 1
-+# if PHYSFS_VER_PATCH < 9
-+# error PHYSFS is too old
-+# endif
- # endif
- # endif
- #endif
diff -ruN netpanzerdata.old/pkg-plist netpanzer-data/pkg-plist
--- netpanzerdata.old/pkg-plist Mon Feb 21 03:33:45 2005
+++ netpanzer-data/pkg-plist Mon Feb 21 18:06:34 2005
@@ -1,9 +1,28 @@
+share/netpanzer/cache/colorfilters/netp/2080.tbl
+share/netpanzer/cache/colorfilters/netp/4060.tbl
+share/netpanzer/cache/colorfilters/netp/6040.tbl
+share/netpanzer/cache/colorfilters/netp/8020.tbl
+share/netpanzer/cache/colorfilters/netp/Brighten.tbl
+share/netpanzer/cache/colorfilters/netp/DarkenALittle.tbl
+share/netpanzer/cache/colorfilters/netp/DarkenALot.tbl
+share/netpanzer/cache/colorfilters/netp/LightDark.tbl
+share/netpanzer/cache/colorfilters/netpmenu/2080.tbl
+share/netpanzer/cache/colorfilters/netpmenu/4060.tbl
+share/netpanzer/cache/colorfilters/netpmenu/6040.tbl
+share/netpanzer/cache/colorfilters/netpmenu/8020.tbl
+share/netpanzer/cache/colorfilters/netpmenu/Brighten.tbl
+share/netpanzer/cache/colorfilters/netpmenu/DarkenALittle.tbl
+share/netpanzer/cache/colorfilters/netpmenu/DarkenALot.tbl
+share/netpanzer/cache/colorfilters/netpmenu/LightDark.tbl
share/netpanzer/maps/Bad Neuburg.npm
share/netpanzer/maps/Bad Neuburg.opt
share/netpanzer/maps/Bad Neuburg.spn
share/netpanzer/maps/Cramped.npm
share/netpanzer/maps/Cramped.opt
share/netpanzer/maps/Cramped.spn
+share/netpanzer/maps/Duell.npm
+share/netpanzer/maps/Duell.opt
+share/netpanzer/maps/Duell.spn
share/netpanzer/maps/Hill 221.npm
share/netpanzer/maps/Hill 221.opt
share/netpanzer/maps/Hill 221.spn
@@ -92,6 +111,7 @@
share/netpanzer/pics/flags/colombia.bmp
share/netpanzer/pics/flags/czech-republic.bmp
share/netpanzer/pics/flags/denmark.bmp
+share/netpanzer/pics/flags/finland.bmp
share/netpanzer/pics/flags/france.bmp
share/netpanzer/pics/flags/germany.bmp
share/netpanzer/pics/flags/greece.bmp
@@ -355,4 +375,8 @@
@dirrm share/netpanzer/pics/backgrounds
@dirrm share/netpanzer/pics
@dirrm share/netpanzer/maps
+ at dirrm share/netpanzer/cache/colorfilters/netpmenu
+ at dirrm share/netpanzer/cache/colorfilters/netp
+ at dirrm share/netpanzer/cache/colorfilters
+ at dirrm share/netpanzer/cache
@dirrm share/netpanzer
Patch for netpanzer:
diff -ruN netpanzer.old/Makefile netpanzer/Makefile
--- netpanzer.old/Makefile Mon Feb 21 03:33:17 2005
+++ netpanzer/Makefile Mon Feb 21 21:51:09 2005
@@ -6,16 +6,16 @@
#
PORTNAME= netpanzer
-PORTVERSION= 0.1.5
+PORTVERSION= 0.8
CATEGORIES= games
MASTER_SITES= http://download.berlios.de/netpanzer/
MAINTAINER= mad at 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
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libphysfs=${LOCALBASE} --without-wx-config
@@ -33,6 +33,13 @@
@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 -ruN netpanzer.old/distinfo netpanzer/distinfo
--- netpanzer.old/distinfo Mon Feb 21 03:33:17 2005
+++ netpanzer/distinfo Mon Feb 21 18:15:15 2005
@@ -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 -ruN netpanzer.old/files/noportdocs-patch-Jamfile netpanzer/files/noportdocs-patch-Jamfile
--- netpanzer.old/files/noportdocs-patch-Jamfile Thu Jan 1 01:00:00 1970
+++ netpanzer/files/noportdocs-patch-Jamfile Mon Feb 21 18:59:31 2005
@@ -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 -ruN netpanzer.old/files/patch-Jamconfig.in netpanzer/files/patch-Jamconfig.in
--- netpanzer.old/files/patch-Jamconfig.in Thu Jan 1 01:00:00 1970
+++ netpanzer/files/patch-Jamconfig.in Mon Feb 21 21:53:38 2005
@@ -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 -ruN netpanzer.old/files/patch-mk-jam-install.jam netpanzer/files/patch-mk-jam-install.jam
--- netpanzer.old/files/patch-mk-jam-install.jam Thu Jan 1 01:00:00 1970
+++ netpanzer/files/patch-mk-jam-install.jam Mon Feb 21 22:04:14 2005
@@ -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 -ruN netpanzer.old/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp
--- netpanzer.old/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp Mon Feb 21 03:33:17 2005
+++ netpanzer/files/patch-src-Lib-ArrayUtil-LinkListDoubleTemplate.hpp Thu Jan 1 01:00:00 1970
@@ -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 -ruN netpanzer.old/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp
--- netpanzer.old/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp Mon Feb 21 03:33:17 2005
+++ netpanzer/files/patch-src-Lib-ArrayUtil-QueueTemplate.hpp Thu Jan 1 01:00:00 1970
@@ -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 -ruN netpanzer.old/files/patch-src-ServerBrowser-Main.cpp netpanzer/files/patch-src-ServerBrowser-Main.cpp
--- netpanzer.old/files/patch-src-ServerBrowser-Main.cpp Mon Feb 21 03:33:17 2005
+++ netpanzer/files/patch-src-ServerBrowser-Main.cpp Thu Jan 1 01:00:00 1970
@@ -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 -ruN netpanzer.old/pkg-plist netpanzer/pkg-plist
--- netpanzer.old/pkg-plist Mon Feb 21 03:33:17 2005
+++ netpanzer/pkg-plist Mon Feb 21 19:25:48 2005
@@ -1,6 +1,12 @@
bin/netpanzer
-bin/netpanzerbrowser
-share/pixmaps/netpanzer/netpanzer.png
-share/pixmaps/netpanzer/netpanzer.xpm
- at 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
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list