diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-03 20:16:07 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2003-01-03 20:16:07 +0000 |
commit | 9b9f2251a6ef86b1544c4ba545247cd7ea1f26bf (patch) | |
tree | afa3008ec62535062028d1c4e58ec2f6f6c956b0 /games/bzflag | |
parent | upgrade to 0.1.10 (diff) |
upgrade to 1.7g0
PR: 46586
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=72461
Diffstat (limited to 'games/bzflag')
-rw-r--r-- | games/bzflag/Makefile | 14 | ||||
-rw-r--r-- | games/bzflag/distinfo | 2 | ||||
-rw-r--r-- | games/bzflag/files/patch-BzfString.h | 19 | ||||
-rw-r--r-- | games/bzflag/files/patch-bzflag.cxx | 17 | ||||
-rw-r--r-- | games/bzflag/files/patch-bzfs.cxx | 11 | ||||
-rw-r--r-- | games/bzflag/files/patch-resources.h | 19 | ||||
-rw-r--r-- | games/bzflag/pkg-plist | 3 |
7 files changed, 27 insertions, 58 deletions
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 4d8970c3ad1d..87b38dfbb3a0 100644 --- a/games/bzflag/Makefile +++ b/games/bzflag/Makefile @@ -6,11 +6,11 @@ # PORTNAME= bzflag -PORTVERSION= 1.7e.6 +PORTVERSION= 1.7g.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= bzflag -DISTNAME= ${PORTNAME}-${PORTVERSION:S/e./e/} +MASTER_SITE_SUBDIR= ${PORTNAME} +DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E} EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org @@ -36,9 +36,9 @@ post-build: @(cd ${WRKSRC}/man && ${MAKE} targets) do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/ - @${INSTALL_MAN} ${WRKSRC}/man/*.6 ${PREFIX}/man/man6/ - @${MKDIR} ${PREFIX}/share/bzflag/data - @${INSTALL_DATA} ${WRKSRC}/data/* ${PREFIX}/share/bzflag/data/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/man/*.6 ${MANPREFIX}/man/man6/ + @${MKDIR} ${DATADIR}/data + ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data/ .include <bsd.port.mk> diff --git a/games/bzflag/distinfo b/games/bzflag/distinfo index 3df03c837250..02045183de27 100644 --- a/games/bzflag/distinfo +++ b/games/bzflag/distinfo @@ -1 +1 @@ -MD5 (bzflag-1.7e6.tgz) = 0afedee9279c305c0acda563287ad0f2 +MD5 (bzflag-1.7g0.tgz) = 689009fa98416ac1abba4677870c7b9f diff --git a/games/bzflag/files/patch-BzfString.h b/games/bzflag/files/patch-BzfString.h index b58380f6dafb..43ddce4d0ee6 100644 --- a/games/bzflag/files/patch-BzfString.h +++ b/games/bzflag/files/patch-BzfString.h @@ -1,18 +1,11 @@ ---- include/BzfString.h.orig Sat Nov 23 15:04:54 2002 -+++ include/BzfString.h Sat Nov 23 15:05:16 2002 -@@ -39,12 +39,14 @@ - +--- include/BzfString.h.orig Thu Oct 17 04:29:38 2002 ++++ include/BzfString.h Mon Dec 9 22:08:01 2002 +@@ -40,6 +40,8 @@ #include "common.h" - --#if defined(sun) || defined(__MWERKS__) -+#if 1 - // solaris compiler doesn't like declaration of ostream #include "bzfio.h" - #else - class ostream; - #endif -+ -+using std::ostream; ++using std::ostream; ++ class BzfString { public: + BzfString(); diff --git a/games/bzflag/files/patch-bzflag.cxx b/games/bzflag/files/patch-bzflag.cxx index c4df65d4d5f3..bddae7ce2e3c 100644 --- a/games/bzflag/files/patch-bzflag.cxx +++ b/games/bzflag/files/patch-bzflag.cxx @@ -1,6 +1,6 @@ ---- src/bzflag/bzflag.cxx.orig Sat Nov 23 15:16:44 2002 -+++ src/bzflag/bzflag.cxx Sat Nov 23 15:17:53 2002 -@@ -756,7 +756,7 @@ +--- src/bzflag/bzflag.cxx.orig Fri Dec 6 02:22:44 2002 ++++ src/bzflag/bzflag.cxx Mon Dec 9 22:09:36 2002 +@@ -769,7 +769,7 @@ // read resources { @@ -8,13 +8,4 @@ + #if 1 ifstream resourceStream(getConfigFileName(), ios::in); #else - ifstream resourceStream(getConfigFileName(), ios::in | ios::nocreate); -@@ -768,7 +768,7 @@ - - #if !defined(_WIN32) & !defined(macintosh) - else { -- ifstream resourceStream2(getConfigFileName2(), ios::in | ios::nocreate); -+ ifstream resourceStream2(getConfigFileName2(), ios::in); - if (resourceStream2) { - startupInfo.hasConfiguration = True; - resourceStream2 >> db; + ifstream resourceStream(getConfigFileName(), ios::in); diff --git a/games/bzflag/files/patch-bzfs.cxx b/games/bzflag/files/patch-bzfs.cxx deleted file mode 100644 index 2ffe611b4616..000000000000 --- a/games/bzflag/files/patch-bzfs.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- src/bzfs/bzfs.cxx.orig Sat Nov 23 15:03:31 2002 -+++ src/bzfs/bzfs.cxx Sat Nov 23 15:03:45 2002 -@@ -2805,7 +2805,7 @@ - static WorldInfo *defineWorldFromFile(const char *filename) - { - // open file -- ifstream input(filename, ios::in | ios::nocreate); -+ ifstream input(filename, ios::in); - if (!input) { - cerr << "could not find bzflag world file : " << filename << endl; - return NULL; diff --git a/games/bzflag/files/patch-resources.h b/games/bzflag/files/patch-resources.h index b2ba567920a8..3c694fbca4f7 100644 --- a/games/bzflag/files/patch-resources.h +++ b/games/bzflag/files/patch-resources.h @@ -1,18 +1,11 @@ ---- src/bzflag/resources.h.orig Sat Nov 23 15:18:38 2002 -+++ src/bzflag/resources.h Sat Nov 23 15:18:59 2002 -@@ -20,12 +20,13 @@ - #include "common.h" +--- src/bzflag/resources.h.orig Thu Oct 17 04:38:17 2002 ++++ src/bzflag/resources.h Mon Dec 9 22:11:54 2002 +@@ -21,6 +21,8 @@ #include "BzfString.h" - --#if defined(sun) || defined(macintosh) --// solaris compiler doesn't like declaration of istream -+#if 1 #include "bzfio.h" - #else - class istream; - #endif -+ -+using namespace std; ++using namespace std; ++ class ResourceDatabase { public: + ResourceDatabase(); diff --git a/games/bzflag/pkg-plist b/games/bzflag/pkg-plist index 2b514d782bb8..557a3448a9af 100644 --- a/games/bzflag/pkg-plist +++ b/games/bzflag/pkg-plist @@ -47,6 +47,7 @@ share/bzflag/data/ricochet.wav share/bzflag/data/rlaser.rgb share/bzflag/data/roof.rgb share/bzflag/data/shock.wav +share/bzflag/data/teamgrab.wav share/bzflag/data/teleport.wav share/bzflag/data/timesbi.rgb share/bzflag/data/timesbr.rgb @@ -54,3 +55,5 @@ share/bzflag/data/title.rgb share/bzflag/data/wall.rgb share/bzflag/data/ybolt.rgb share/bzflag/data/ylaser.rgb +@dirrm share/bzflag/data +@dirrm share/bzflag |