View | Details | Raw Unified | Return to bug 53767
Collapse All | Expand All

(-)games/bzflag/Makefile (-19 / +11 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	bzflag
8
PORTNAME=	bzflag
9
PORTVERSION=	1.7g.0
9
PORTVERSION=	1.7g.2
10
CATEGORIES=	games
10
CATEGORIES=	games
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 16-43 Link Here
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	A multiplayer 3D tank battle game
17
COMMENT=	A multiplayer 3D tank battle game
18
18
19
USE_XLIB=	yes
20
USE_MESA=	yes
19
USE_MESA=	yes
21
USE_REINPLACE=	yes
20
USE_REINPLACE=	yes
22
21
USE_GMAKE=	yes
23
MAKE_ENV=	PORTCFLAGS="${CFLAGS}" PORTCXXFLAGS="${CXXFLAGS}" \
22
USE_AUTOCONF_VER=	213
24
		PORTPREFIX="${PREFIX}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
23
CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
25
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
24
MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
25
		AUTOHEADER="${TRUE}"
26
26
27
MAN6=	bzflag.6 bzfrelay.6 bzfls.6 bzfs.6
27
MAN6=	bzflag.6 bzfrelay.6 bzfls.6 bzfs.6
28
28
29
do-configure:
29
post-patch:
30
	@${CP} ${FILESDIR}/config-sys ${WRKSRC}/
30
	@${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
31
	${REINPLACE_CMD} "s,malloc.h,stdlib.h,g" \
31
		's|<malloc\.h>|<stdlib.h>|g'
32
		${WRKSRC}/src/bzflag/HUDRenderer.cxx
32
	@${REINPLACE_CMD} -e 's|@LINUX_TRUE@||g ; \
33
33
		 s|@LINUX_FALSE@|#|g' ${WRKSRC}/src/platform/Makefile.in
34
post-build:
35
	@(cd ${WRKSRC}/man && ${MAKE} targets)
36
37
do-install:
38
	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
39
	${INSTALL_MAN} ${WRKSRC}/man/*.6 ${MANPREFIX}/man/man6/
40
	@${MKDIR} ${DATADIR}/data
41
	${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data/
42
34
43
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)games/bzflag/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (bzflag-1.7g0.tgz) = 689009fa98416ac1abba4677870c7b9f
1
MD5 (bzflag-1.7g2.tgz) = 792f31d0dc91405be3f83ca7a3850ebe
(-)games/bzflag/files/config-sys (-105 lines)
Lines 1-105 Link Here
1
# bzflag
2
# Copyright 1993-1999, Chris Schoeneman
3
#
4
# This package is free software;  you can redistribute it and/or
5
# modify it under the terms of the license found in the file
6
# named LICENSE that should have accompanied this file.
7
#
8
# THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
9
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
10
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
11
12
#
13
# configuration for generic linux
14
#
15
CONFIG	= linux
16
17
#
18
# use XF86 vidmode extension (comment out to disable)
19
#
20
XF86VIDMODE_DEF = -DXF86VIDMODE_EXT
21
XF86VIDMODE_LIB = -lXxf86vm
22
23
#
24
# install locations
25
#
26
INSTALL_DATA_DIR = ${PORTPREFIX}/share/bzflag/data
27
28
#
29
# tools
30
#
31
AR	= /usr/bin/ar cru
32
#CC	= /usr/bin/gcc
33
#CXX	= /usr/bin/g++
34
CD	= cd
35
CP	= /bin/cp
36
LD	= /usr/bin/ld
37
MKDIR	= /bin/mkdir
38
NROFF	= /usr/bin/nroff
39
RM	= /bin/rm -f
40
RMR	= $(RM) -r
41
SHELL	= /bin/sh
42
ECHO	= echo
43
44
#
45
# compiler definitions
46
#
47
PCDEFS   = $(XF86VIDMODE_DEF)
48
PCXXDEFS = $(XF86VIDMODE_DEF)
49
50
#
51
# compiler options
52
#
53
PCOPTS   = -Wall -W -ansi $(ACOPTS)
54
PCXXOPTS = -Wall -W -fno-exceptions -fno-rtti $(ACXXOPTS)
55
COPT     = -DNDEBUG ${PORTCFLAGS} -DUSBJOYSTICK
56
CXXOPT   = -DNDEBUG ${PORTCXXFLAGS} -DUSBJOYSTICK -ffast-math -fomit-frame-pointer \
57
	-fnonnull-objects -fexpensive-optimizations
58
CDEBUG   = -DDEBUG -g
59
CXXDEBUG = -DDEBUG -g
60
CWOFF    =
61
CXXWOFF  =
62
63
#
64
# search paths
65
#
66
PCINCS   = -I/usr/include -I/usr/X11R6/include
67
PCXXINCS = -I/usr/include -I/usr/X11R6/include
68
69
#
70
# linker options
71
#
72
PLDOPTS  = -L${X11BASE}/lib
73
74
#
75
# dirt
76
#
77
PDIRT    = *.[eou] a.out core ar.tmp.*
78
79
#
80
# libraries
81
#
82
AUDIO_LIBS =				\
83
	$(NULL)
84
85
DISPLAY_LIBS =				\
86
	$(XF86VIDMODE_LIB)		\
87
	$(NULL)
88
89
GL_LIBS =				\
90
	-lGLU				\
91
	-lGL				\
92
	$(NULL)
93
94
IMAGE_LIBS =				\
95
	$(NULL)
96
97
NETWORK_LIBS =				\
98
	$(NULL)
99
100
WINDOW_LIBS =				\
101
	-lusbhid			\
102
	-lXext				\
103
	-lX11				\
104
	$(NULL)
105
(-)games/bzflag/files/patch-BzfString.h (-11 lines)
Lines 1-11 Link Here
1
--- include/BzfString.h.orig	Thu Oct 17 04:29:38 2002
2
+++ include/BzfString.h	Mon Dec  9 22:08:01 2002
3
@@ -40,6 +40,8 @@
4
 #include "common.h"
5
 #include "bzfio.h"
6
 
7
+using std::ostream;
8
+
9
 class BzfString {
10
   public:
11
 			BzfString();
(-)games/bzflag/files/patch-Make-common (-46 lines)
Lines 1-46 Link Here
1
--- Make-common.orig	Wed Feb 14 03:34:09 2001
2
+++ Make-common	Fri Aug 10 01:04:44 2001
3
@@ -33,7 +33,7 @@
4
 #
5
 # C options
6
 #
7
-CFLAGS	= $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF)
8
+CFLAGS	= $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF) ${PTHREAD_CFLAGS}
9
 LCFLAGS	= $(LCDEFS) $(LCINCS) $(LCOPTS)
10
 PCFLAGS	= $(PCDEFS) $(PCINCS) $(PCOPTS)
11
 GCFLAGS	= $(GCDEFS) $(GCINCS) $(GCOPTS)
12
@@ -51,7 +51,7 @@
13
 #
14
 # C++ options
15
 #
16
-CXXFLAGS  = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF)
17
+CXXFLAGS  = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF) ${PTHREAD_CFLAGS}
18
 LCXXFLAGS = $(LCXXDEFS) $(LCXXINCS) $(LCXXOPTS)
19
 PCXXFLAGS = $(PCXXDEFS) $(PCXXINCS) $(PCXXOPTS)
20
 GCXXFLAGS = $(GCXXDEFS) $(GCXXINCS) $(GCXXOPTS)
21
@@ -69,7 +69,7 @@
22
 #
23
 # ld options
24
 #
25
-LDFLAGS	  = $(LDOPTS) $(LDLIBS)
26
+LDFLAGS	  = $(LDOPTS) $(LDLIBS) ${PTHREAD_LIBS}
27
 LDOPTS	  = $(LLDOPTS) $(PLDOPTS) $(GLDOPTS)
28
 LDLIBS	  = $(LLDLIBS) $(PLDLIBS) $(GLDLIBS)
29
 
30
@@ -167,13 +167,13 @@
31
 #
32
 # default to optimized build
33
 #
34
-ifdef DEBUG
35
+.ifdef DEBUG
36
 COPTIMIZER    = $(CDEBUG)
37
 CXXOPTIMIZER  = $(CXXDEBUG)
38
-else
39
+.else
40
 COPTIMIZER    = $(COPT)
41
 CXXOPTIMIZER  = $(CXXOPT)
42
-endif
43
+.endif
44
 
45
 #
46
 # slurp up configuration
(-)games/bzflag/files/patch-bzfio.h (-11 lines)
Lines 1-11 Link Here
1
--- include/bzfio.h.orig	Sat Nov 23 15:06:09 2002
2
+++ include/bzfio.h	Sat Nov 23 15:06:17 2002
3
@@ -23,7 +23,7 @@
4
 #endif
5
 #define NULL 0
6
 
7
-#include <iostream.h>
8
+#include <iostream>
9
 
10
 #endif
11
 
(-)games/bzflag/files/patch-bzflag.cxx (-11 lines)
Lines 1-11 Link Here
1
--- src/bzflag/bzflag.cxx.orig	Fri Dec  6 02:22:44 2002
2
+++ src/bzflag/bzflag.cxx	Mon Dec  9 22:09:36 2002
3
@@ -769,7 +769,7 @@
4
 
5
   // read resources
6
   {
7
-    #ifdef __MWERKS__
8
+    #if 1
9
 	ifstream resourceStream(getConfigFileName(), ios::in);
10
      #else
11
     ifstream resourceStream(getConfigFileName(), ios::in);
(-)games/bzflag/files/patch-config (-14 lines)
Lines 1-14 Link Here
1
--- config.orig	Fri Feb  2 01:04:26 2001
2
+++ config	Sat Mar 24 02:23:04 2001
3
@@ -41,9 +41,9 @@
4
 #
5
 # uncomment to enable debug render modes
6
 #
7
-ifdef DEBUG
8
+.ifdef DEBUG
9
 DEBUG_RENDERING = -DDEBUG_RENDERING
10
-endif
11
+.endif
12
 
13
 #
14
 # uncomment to enable robot tanks
(-)games/bzflag/files/patch-configure.in (+36 lines)
Line 0 Link Here
1
--- configure.in.orig	Wed Jun 18 04:24:08 2003
2
+++ configure.in	Tue Jun 24 15:07:16 2003
3
@@ -20,7 +20,14 @@
4
 
5
 #Checks for types
6
 #AM_CHECK_TYPES(socklen_t)
7
-AC_TRY_COMPILE([#include <unistd.h>], [socklen_t a;], [AC_DEFINE(HAVE_SOCKLEN_T)])
8
+AC_TRY_COMPILE([
9
+#include <sys/types.h>
10
+#include <sys/socket.h>
11
+], [
12
+socklen_t a;
13
+], [
14
+AC_DEFINE(HAVE_SOCKLEN_T)
15
+])
16
 
17
 AC_CANONICAL_HOST
18
 AM_CONDITIONAL(LINUX, test x$host_os = xlinux-gnu)
19
@@ -86,7 +93,7 @@
20
 
21
 AC_PATH_XTRA
22
 
23
-LDFLAGS=$X_LIBS
24
+LDFLAGS="$X_LIBS $LDFLAGS"
25
 case $host_os in
26
   solaris*)
27
     GLIBS="-lresolv -laudio $GLIBS";
28
@@ -98,7 +105,7 @@
29
 
30
 AC_CHECK_LIB(m, sqrtf)
31
 
32
-CPPFLAGS=
33
+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
34
 if test x$X_DISPLAY_MISSING = x; then
35
   GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
36
 fi
(-)games/bzflag/files/patch-man-Makefile (-25 lines)
Lines 1-25 Link Here
1
--- man/Makefile.orig	Sat Aug 12 01:32:07 2000
2
+++ man/Makefile	Sat Aug 12 01:32:18 2000
3
@@ -31,19 +31,19 @@
4
 sourceform:
5
 	$(PRINTSRC) |						\
6
 	sed -e 's/\.\([1-8]\)s$$/.\1/' |			\
7
-	xargs -l10 $(MAKE) $(MFLAGS)
8
+	xargs -n10 $(MAKE) $(MFLAGS)
9
 
10
 # generate packed compiled nroff
11
 packed: sourceform
12
 	$(PRINTSRC) |						\
13
 	sed -e 's/\.[1-8]s$$/\.z/' |				\
14
-	xargs -l10 $(MAKE) $(MFLAGS)
15
+	xargs -n10 $(MAKE) $(MFLAGS)
16
 
17
 # generate gzipped compiled nroff
18
 gzipped: sourceform
19
 	$(PRINTSRC) |						\
20
 	sed -e 's/\.[1-8]s$$/\.gz/' |				\
21
-	xargs -l10 $(MAKE) $(MFLAGS)
22
+	xargs -n10 $(MAKE) $(MFLAGS)
23
 
24
 # replace tokens in source to make nroff source
25
 .1s.1 .2s.2 .3s.3 .4s.4 .5s.5 .6s.6 .7s.7 .8s.8:
(-)games/bzflag/files/patch-resources.h (-11 lines)
Lines 1-11 Link Here
1
--- src/bzflag/resources.h.orig	Thu Oct 17 04:38:17 2002
2
+++ src/bzflag/resources.h	Mon Dec  9 22:11:54 2002
3
@@ -21,6 +21,8 @@
4
 #include "BzfString.h"
5
 #include "bzfio.h"
6
 
7
+using namespace std;
8
+
9
 class ResourceDatabase {
10
   public:
11
 			ResourceDatabase();
(-)games/bzflag/pkg-plist (-54 / +71 lines)
Lines 2-59 Link Here
2
bin/bzfls
2
bin/bzfls
3
bin/bzfrelay
3
bin/bzfrelay
4
bin/bzfs
4
bin/bzfs
5
share/bzflag/data/Bzflag.fti
5
share/bzflag/Bzflag.fti
6
share/bzflag/data/Bzflag.ftr
6
share/bzflag/Bzflag.ftr
7
share/bzflag/data/Bzfs.fti
7
share/bzflag/Bzfs.fti
8
share/bzflag/data/bbolt.rgb
8
share/bzflag/bbolt.rgb
9
share/bzflag/data/blaser.rgb
9
share/bzflag/blaser.rgb
10
share/bzflag/data/boom.wav
10
share/bzflag/boom.wav
11
share/bzflag/data/boxwall.rgb
11
share/bzflag/boxwall.rgb
12
share/bzflag/data/caution.rgb
12
share/bzflag/btbolt.rgb
13
share/bzflag/data/clouds.rgb
13
share/bzflag/caution.rgb
14
share/bzflag/data/explode1.rgb
14
share/bzflag/clouds.rgb
15
share/bzflag/data/explosion.wav
15
share/bzflag/explode1.rgb
16
share/bzflag/data/fire.wav
16
share/bzflag/explosion.wav
17
share/bzflag/data/fixedbr.rgb
17
share/bzflag/fire.wav
18
share/bzflag/data/fixedmr.rgb
18
share/bzflag/fixedbr.rgb
19
share/bzflag/data/flag.rgb
19
share/bzflag/fixedmr.rgb
20
share/bzflag/data/flag_alert.wav
20
share/bzflag/flag.rgb
21
share/bzflag/data/flag_drop.wav
21
share/bzflag/flag_alert.wav
22
share/bzflag/data/flag_grab.wav
22
share/bzflag/flag_drop.wav
23
share/bzflag/data/flag_lost.wav
23
share/bzflag/flag_grab.wav
24
share/bzflag/data/flag_won.wav
24
share/bzflag/flag_lost.wav
25
share/bzflag/data/flage.rgb
25
share/bzflag/flag_won.wav
26
share/bzflag/data/gbolt.rgb
26
share/bzflag/flage.rgb
27
share/bzflag/data/glaser.rgb
27
share/bzflag/gbolt.rgb
28
share/bzflag/data/ground.rgb
28
share/bzflag/glaser.rgb
29
share/bzflag/data/helvbi.rgb
29
share/bzflag/ground.rgb
30
share/bzflag/data/helvbr.rgb
30
share/bzflag/gtbolt.rgb
31
share/bzflag/data/jump.wav
31
share/bzflag/helvbi.rgb
32
share/bzflag/data/killteam.wav
32
share/bzflag/helvbr.rgb
33
share/bzflag/data/land.wav
33
share/bzflag/jump.wav
34
share/bzflag/data/laser.wav
34
share/bzflag/killteam.wav
35
share/bzflag/data/lock.wav
35
share/bzflag/l10n/bzflag_da.po
36
share/bzflag/data/missile.rgb
36
share/bzflag/l10n/bzflag_de.po
37
share/bzflag/data/missile.wav
37
share/bzflag/l10n/bzflag_en_US_l33t.po
38
share/bzflag/data/mountain.rgb
38
share/bzflag/l10n/bzflag_en_US_redneck.po
39
share/bzflag/data/panel.rgb
39
share/bzflag/l10n/bzflag_es.po
40
share/bzflag/data/pbolt.rgb
40
share/bzflag/l10n/bzflag_fr.po
41
share/bzflag/data/phantom.wav
41
share/bzflag/l10n/bzflag_it.po
42
share/bzflag/data/plaser.rgb
42
share/bzflag/l10n/bzflag_kg.po
43
share/bzflag/data/pop.wav
43
share/bzflag/l10n/bzflag_nl.po
44
share/bzflag/data/pyrwall.rgb
44
share/bzflag/l10n/bzflag_pt.po
45
share/bzflag/data/rbolt.rgb
45
share/bzflag/l10n/bzflag_sv.po
46
share/bzflag/data/ricochet.wav
46
share/bzflag/l10n/bzflag_xx.po
47
share/bzflag/data/rlaser.rgb
47
share/bzflag/land.wav
48
share/bzflag/data/roof.rgb
48
share/bzflag/laser.wav
49
share/bzflag/data/shock.wav
49
share/bzflag/lock.wav
50
share/bzflag/data/teamgrab.wav
50
share/bzflag/missile.rgb
51
share/bzflag/data/teleport.wav
51
share/bzflag/missile.wav
52
share/bzflag/data/timesbi.rgb
52
share/bzflag/mountain.rgb
53
share/bzflag/data/timesbr.rgb
53
share/bzflag/panel.rgb
54
share/bzflag/data/title.rgb
54
share/bzflag/pbolt.rgb
55
share/bzflag/data/wall.rgb
55
share/bzflag/phantom.wav
56
share/bzflag/data/ybolt.rgb
56
share/bzflag/plaser.rgb
57
share/bzflag/data/ylaser.rgb
57
share/bzflag/pop.wav
58
@dirrm share/bzflag/data
58
share/bzflag/ptbolt.rgb
59
share/bzflag/pyrwall.rgb
60
share/bzflag/rbolt.rgb
61
share/bzflag/ricochet.wav
62
share/bzflag/rlaser.rgb
63
share/bzflag/roof.rgb
64
share/bzflag/rtbolt.rgb
65
share/bzflag/shock.wav
66
share/bzflag/teamgrab.wav
67
share/bzflag/teleport.wav
68
share/bzflag/timesbi.rgb
69
share/bzflag/timesbr.rgb
70
share/bzflag/title.rgb
71
share/bzflag/wall.rgb
72
share/bzflag/ybolt.rgb
73
share/bzflag/ylaser.rgb
74
share/bzflag/ytbolt.rgb
75
@dirrm share/bzflag/l10n
59
@dirrm share/bzflag
76
@dirrm share/bzflag

Return to bug 53767