Date: Thu, 26 Jun 2003 22:35:51 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/53767: Update port: games/bzflag 1.7g.2 Message-ID: <20030626223551.083d449c.tkato@prontomail.com> Resent-Message-ID: <200306261340.h5QDeOgT005114@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 53767
>Category: ports
>Synopsis: Update port: games/bzflag 1.7g.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 26 06:40:23 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.7g2
New file:
files/patch-configure.in
Remove file:
files/config-sys
files/patch-BzfString.h
files/patch-Make-common
files/patch-bzfio.h
files/patch-bzflag.cxx
files/patch-config
files/patch-man-Makefile
files/patch-resources.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/bzflag/Makefile games/bzflag/Makefile
--- /usr/ports/games/bzflag/Makefile Mon May 5 05:54:43 2003
+++ games/bzflag/Makefile Tue Jun 24 15:56:47 2003
@@ -6,7 +6,7 @@
#
PORTNAME= bzflag
-PORTVERSION= 1.7g.0
+PORTVERSION= 1.7g.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,28 +16,20 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiplayer 3D tank battle game
-USE_XLIB= yes
USE_MESA= yes
USE_REINPLACE= yes
-
-MAKE_ENV= PORTCFLAGS="${CFLAGS}" PORTCXXFLAGS="${CXXFLAGS}" \
- PORTPREFIX="${PREFIX}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+USE_GMAKE= yes
+USE_AUTOCONF_VER= 213
+CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
+MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+ AUTOHEADER="${TRUE}"
MAN6= bzflag.6 bzfrelay.6 bzfls.6 bzfs.6
-do-configure:
- @${CP} ${FILESDIR}/config-sys ${WRKSRC}/
- ${REINPLACE_CMD} "s,malloc.h,stdlib.h,g" \
- ${WRKSRC}/src/bzflag/HUDRenderer.cxx
-
-post-build:
- @(cd ${WRKSRC}/man && ${MAKE} targets)
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/man/*.6 ${MANPREFIX}/man/man6/
- @${MKDIR} ${DATADIR}/data
- ${INSTALL_DATA} ${WRKSRC}/data/* ${DATADIR}/data/
+post-patch:
+ @${GREP} -lR "<malloc\.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|<malloc\.h>|<stdlib.h>|g'
+ @${REINPLACE_CMD} -e 's|@LINUX_TRUE@||g ; \
+ s|@LINUX_FALSE@|#|g' ${WRKSRC}/src/platform/Makefile.in
.include <bsd.port.mk>
diff -urN /usr/ports/games/bzflag/distinfo games/bzflag/distinfo
--- /usr/ports/games/bzflag/distinfo Mon Jan 6 15:58:29 2003
+++ games/bzflag/distinfo Tue Jun 24 13:36:56 2003
@@ -1 +1 @@
-MD5 (bzflag-1.7g0.tgz) = 689009fa98416ac1abba4677870c7b9f
+MD5 (bzflag-1.7g2.tgz) = 792f31d0dc91405be3f83ca7a3850ebe
diff -urN /usr/ports/games/bzflag/files/config-sys games/bzflag/files/config-sys
--- /usr/ports/games/bzflag/files/config-sys Tue Sep 10 20:10:41 2002
+++ games/bzflag/files/config-sys Thu Jan 1 09:00:00 1970
@@ -1,105 +0,0 @@
-# bzflag
-# Copyright 1993-1999, Chris Schoeneman
-#
-# This package is free software; you can redistribute it and/or
-# modify it under the terms of the license found in the file
-# named LICENSE that should have accompanied this file.
-#
-# THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-#
-# configuration for generic linux
-#
-CONFIG = linux
-
-#
-# use XF86 vidmode extension (comment out to disable)
-#
-XF86VIDMODE_DEF = -DXF86VIDMODE_EXT
-XF86VIDMODE_LIB = -lXxf86vm
-
-#
-# install locations
-#
-INSTALL_DATA_DIR = ${PORTPREFIX}/share/bzflag/data
-
-#
-# tools
-#
-AR = /usr/bin/ar cru
-#CC = /usr/bin/gcc
-#CXX = /usr/bin/g++
-CD = cd
-CP = /bin/cp
-LD = /usr/bin/ld
-MKDIR = /bin/mkdir
-NROFF = /usr/bin/nroff
-RM = /bin/rm -f
-RMR = $(RM) -r
-SHELL = /bin/sh
-ECHO = echo
-
-#
-# compiler definitions
-#
-PCDEFS = $(XF86VIDMODE_DEF)
-PCXXDEFS = $(XF86VIDMODE_DEF)
-
-#
-# compiler options
-#
-PCOPTS = -Wall -W -ansi $(ACOPTS)
-PCXXOPTS = -Wall -W -fno-exceptions -fno-rtti $(ACXXOPTS)
-COPT = -DNDEBUG ${PORTCFLAGS} -DUSBJOYSTICK
-CXXOPT = -DNDEBUG ${PORTCXXFLAGS} -DUSBJOYSTICK -ffast-math -fomit-frame-pointer \
- -fnonnull-objects -fexpensive-optimizations
-CDEBUG = -DDEBUG -g
-CXXDEBUG = -DDEBUG -g
-CWOFF =
-CXXWOFF =
-
-#
-# search paths
-#
-PCINCS = -I/usr/include -I/usr/X11R6/include
-PCXXINCS = -I/usr/include -I/usr/X11R6/include
-
-#
-# linker options
-#
-PLDOPTS = -L${X11BASE}/lib
-
-#
-# dirt
-#
-PDIRT = *.[eou] a.out core ar.tmp.*
-
-#
-# libraries
-#
-AUDIO_LIBS = \
- $(NULL)
-
-DISPLAY_LIBS = \
- $(XF86VIDMODE_LIB) \
- $(NULL)
-
-GL_LIBS = \
- -lGLU \
- -lGL \
- $(NULL)
-
-IMAGE_LIBS = \
- $(NULL)
-
-NETWORK_LIBS = \
- $(NULL)
-
-WINDOW_LIBS = \
- -lusbhid \
- -lXext \
- -lX11 \
- $(NULL)
-
diff -urN /usr/ports/games/bzflag/files/patch-BzfString.h games/bzflag/files/patch-BzfString.h
--- /usr/ports/games/bzflag/files/patch-BzfString.h Mon Jan 6 15:58:29 2003
+++ games/bzflag/files/patch-BzfString.h Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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"
- #include "bzfio.h"
-
-+using std::ostream;
-+
- class BzfString {
- public:
- BzfString();
diff -urN /usr/ports/games/bzflag/files/patch-Make-common games/bzflag/files/patch-Make-common
--- /usr/ports/games/bzflag/files/patch-Make-common Wed Aug 15 16:09:40 2001
+++ games/bzflag/files/patch-Make-common Thu Jan 1 09:00:00 1970
@@ -1,46 +0,0 @@
---- Make-common.orig Wed Feb 14 03:34:09 2001
-+++ Make-common Fri Aug 10 01:04:44 2001
-@@ -33,7 +33,7 @@
- #
- # C options
- #
--CFLAGS = $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF)
-+CFLAGS = $(LCFLAGS) $(PCFLAGS) $(GCFLAGS) $(COPTIMIZER) $(MKDEPOPT) $(CWOFF) ${PTHREAD_CFLAGS}
- LCFLAGS = $(LCDEFS) $(LCINCS) $(LCOPTS)
- PCFLAGS = $(PCDEFS) $(PCINCS) $(PCOPTS)
- GCFLAGS = $(GCDEFS) $(GCINCS) $(GCOPTS)
-@@ -51,7 +51,7 @@
- #
- # C++ options
- #
--CXXFLAGS = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF)
-+CXXFLAGS = $(LCXXFLAGS) $(PCXXFLAGS) $(GCXXFLAGS) $(CXXOPTIMIZER) $(MKDEPOPT) $(CXXWOFF) ${PTHREAD_CFLAGS}
- LCXXFLAGS = $(LCXXDEFS) $(LCXXINCS) $(LCXXOPTS)
- PCXXFLAGS = $(PCXXDEFS) $(PCXXINCS) $(PCXXOPTS)
- GCXXFLAGS = $(GCXXDEFS) $(GCXXINCS) $(GCXXOPTS)
-@@ -69,7 +69,7 @@
- #
- # ld options
- #
--LDFLAGS = $(LDOPTS) $(LDLIBS)
-+LDFLAGS = $(LDOPTS) $(LDLIBS) ${PTHREAD_LIBS}
- LDOPTS = $(LLDOPTS) $(PLDOPTS) $(GLDOPTS)
- LDLIBS = $(LLDLIBS) $(PLDLIBS) $(GLDLIBS)
-
-@@ -167,13 +167,13 @@
- #
- # default to optimized build
- #
--ifdef DEBUG
-+.ifdef DEBUG
- COPTIMIZER = $(CDEBUG)
- CXXOPTIMIZER = $(CXXDEBUG)
--else
-+.else
- COPTIMIZER = $(COPT)
- CXXOPTIMIZER = $(CXXOPT)
--endif
-+.endif
-
- #
- # slurp up configuration
diff -urN /usr/ports/games/bzflag/files/patch-bzfio.h games/bzflag/files/patch-bzfio.h
--- /usr/ports/games/bzflag/files/patch-bzfio.h Sun Nov 24 22:59:21 2002
+++ games/bzflag/files/patch-bzfio.h Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- include/bzfio.h.orig Sat Nov 23 15:06:09 2002
-+++ include/bzfio.h Sat Nov 23 15:06:17 2002
-@@ -23,7 +23,7 @@
- #endif
- #define NULL 0
-
--#include <iostream.h>
-+#include <iostream>
-
- #endif
-
diff -urN /usr/ports/games/bzflag/files/patch-bzflag.cxx games/bzflag/files/patch-bzflag.cxx
--- /usr/ports/games/bzflag/files/patch-bzflag.cxx Mon Jan 6 15:58:29 2003
+++ games/bzflag/files/patch-bzflag.cxx Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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
- {
-- #ifdef __MWERKS__
-+ #if 1
- ifstream resourceStream(getConfigFileName(), ios::in);
- #else
- ifstream resourceStream(getConfigFileName(), ios::in);
diff -urN /usr/ports/games/bzflag/files/patch-config games/bzflag/files/patch-config
--- /usr/ports/games/bzflag/files/patch-config Tue Mar 27 01:51:54 2001
+++ games/bzflag/files/patch-config Thu Jan 1 09:00:00 1970
@@ -1,14 +0,0 @@
---- config.orig Fri Feb 2 01:04:26 2001
-+++ config Sat Mar 24 02:23:04 2001
-@@ -41,9 +41,9 @@
- #
- # uncomment to enable debug render modes
- #
--ifdef DEBUG
-+.ifdef DEBUG
- DEBUG_RENDERING = -DDEBUG_RENDERING
--endif
-+.endif
-
- #
- # uncomment to enable robot tanks
diff -urN /usr/ports/games/bzflag/files/patch-configure.in games/bzflag/files/patch-configure.in
--- /usr/ports/games/bzflag/files/patch-configure.in Thu Jan 1 09:00:00 1970
+++ games/bzflag/files/patch-configure.in Tue Jun 24 15:07:25 2003
@@ -0,0 +1,36 @@
+--- configure.in.orig Wed Jun 18 04:24:08 2003
++++ configure.in Tue Jun 24 15:07:16 2003
+@@ -20,7 +20,14 @@
+
+ #Checks for types
+ #AM_CHECK_TYPES(socklen_t)
+-AC_TRY_COMPILE([#include <unistd.h>], [socklen_t a;], [AC_DEFINE(HAVE_SOCKLEN_T)])
++AC_TRY_COMPILE([
++#include <sys/types.h>
++#include <sys/socket.h>
++], [
++socklen_t a;
++], [
++AC_DEFINE(HAVE_SOCKLEN_T)
++])
+
+ AC_CANONICAL_HOST
+ AM_CONDITIONAL(LINUX, test x$host_os = xlinux-gnu)
+@@ -86,7 +93,7 @@
+
+ AC_PATH_XTRA
+
+-LDFLAGS=$X_LIBS
++LDFLAGS="$X_LIBS $LDFLAGS"
+ case $host_os in
+ solaris*)
+ GLIBS="-lresolv -laudio $GLIBS";
+@@ -98,7 +105,7 @@
+
+ AC_CHECK_LIB(m, sqrtf)
+
+-CPPFLAGS=
++CPPFLAGS="$X_CFLAGS $CPPFLAGS"
+ if test x$X_DISPLAY_MISSING = x; then
+ GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
+ fi
diff -urN /usr/ports/games/bzflag/files/patch-man-Makefile games/bzflag/files/patch-man-Makefile
--- /usr/ports/games/bzflag/files/patch-man-Makefile Sun Jan 27 02:42:17 2002
+++ games/bzflag/files/patch-man-Makefile Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
---- man/Makefile.orig Sat Aug 12 01:32:07 2000
-+++ man/Makefile Sat Aug 12 01:32:18 2000
-@@ -31,19 +31,19 @@
- sourceform:
- $(PRINTSRC) | \
- sed -e 's/\.\([1-8]\)s$$/.\1/' | \
-- xargs -l10 $(MAKE) $(MFLAGS)
-+ xargs -n10 $(MAKE) $(MFLAGS)
-
- # generate packed compiled nroff
- packed: sourceform
- $(PRINTSRC) | \
- sed -e 's/\.[1-8]s$$/\.z/' | \
-- xargs -l10 $(MAKE) $(MFLAGS)
-+ xargs -n10 $(MAKE) $(MFLAGS)
-
- # generate gzipped compiled nroff
- gzipped: sourceform
- $(PRINTSRC) | \
- sed -e 's/\.[1-8]s$$/\.gz/' | \
-- xargs -l10 $(MAKE) $(MFLAGS)
-+ xargs -n10 $(MAKE) $(MFLAGS)
-
- # replace tokens in source to make nroff source
- .1s.1 .2s.2 .3s.3 .4s.4 .5s.5 .6s.6 .7s.7 .8s.8:
diff -urN /usr/ports/games/bzflag/files/patch-resources.h games/bzflag/files/patch-resources.h
--- /usr/ports/games/bzflag/files/patch-resources.h Mon Jan 6 15:58:30 2003
+++ games/bzflag/files/patch-resources.h Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- 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"
- #include "bzfio.h"
-
-+using namespace std;
-+
- class ResourceDatabase {
- public:
- ResourceDatabase();
diff -urN /usr/ports/games/bzflag/pkg-plist games/bzflag/pkg-plist
--- /usr/ports/games/bzflag/pkg-plist Mon Jan 6 15:58:30 2003
+++ games/bzflag/pkg-plist Tue Jun 24 16:21:21 2003
@@ -2,58 +2,75 @@
bin/bzfls
bin/bzfrelay
bin/bzfs
-share/bzflag/data/Bzflag.fti
-share/bzflag/data/Bzflag.ftr
-share/bzflag/data/Bzfs.fti
-share/bzflag/data/bbolt.rgb
-share/bzflag/data/blaser.rgb
-share/bzflag/data/boom.wav
-share/bzflag/data/boxwall.rgb
-share/bzflag/data/caution.rgb
-share/bzflag/data/clouds.rgb
-share/bzflag/data/explode1.rgb
-share/bzflag/data/explosion.wav
-share/bzflag/data/fire.wav
-share/bzflag/data/fixedbr.rgb
-share/bzflag/data/fixedmr.rgb
-share/bzflag/data/flag.rgb
-share/bzflag/data/flag_alert.wav
-share/bzflag/data/flag_drop.wav
-share/bzflag/data/flag_grab.wav
-share/bzflag/data/flag_lost.wav
-share/bzflag/data/flag_won.wav
-share/bzflag/data/flage.rgb
-share/bzflag/data/gbolt.rgb
-share/bzflag/data/glaser.rgb
-share/bzflag/data/ground.rgb
-share/bzflag/data/helvbi.rgb
-share/bzflag/data/helvbr.rgb
-share/bzflag/data/jump.wav
-share/bzflag/data/killteam.wav
-share/bzflag/data/land.wav
-share/bzflag/data/laser.wav
-share/bzflag/data/lock.wav
-share/bzflag/data/missile.rgb
-share/bzflag/data/missile.wav
-share/bzflag/data/mountain.rgb
-share/bzflag/data/panel.rgb
-share/bzflag/data/pbolt.rgb
-share/bzflag/data/phantom.wav
-share/bzflag/data/plaser.rgb
-share/bzflag/data/pop.wav
-share/bzflag/data/pyrwall.rgb
-share/bzflag/data/rbolt.rgb
-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
-share/bzflag/data/title.rgb
-share/bzflag/data/wall.rgb
-share/bzflag/data/ybolt.rgb
-share/bzflag/data/ylaser.rgb
-@dirrm share/bzflag/data
+share/bzflag/Bzflag.fti
+share/bzflag/Bzflag.ftr
+share/bzflag/Bzfs.fti
+share/bzflag/bbolt.rgb
+share/bzflag/blaser.rgb
+share/bzflag/boom.wav
+share/bzflag/boxwall.rgb
+share/bzflag/btbolt.rgb
+share/bzflag/caution.rgb
+share/bzflag/clouds.rgb
+share/bzflag/explode1.rgb
+share/bzflag/explosion.wav
+share/bzflag/fire.wav
+share/bzflag/fixedbr.rgb
+share/bzflag/fixedmr.rgb
+share/bzflag/flag.rgb
+share/bzflag/flag_alert.wav
+share/bzflag/flag_drop.wav
+share/bzflag/flag_grab.wav
+share/bzflag/flag_lost.wav
+share/bzflag/flag_won.wav
+share/bzflag/flage.rgb
+share/bzflag/gbolt.rgb
+share/bzflag/glaser.rgb
+share/bzflag/ground.rgb
+share/bzflag/gtbolt.rgb
+share/bzflag/helvbi.rgb
+share/bzflag/helvbr.rgb
+share/bzflag/jump.wav
+share/bzflag/killteam.wav
+share/bzflag/l10n/bzflag_da.po
+share/bzflag/l10n/bzflag_de.po
+share/bzflag/l10n/bzflag_en_US_l33t.po
+share/bzflag/l10n/bzflag_en_US_redneck.po
+share/bzflag/l10n/bzflag_es.po
+share/bzflag/l10n/bzflag_fr.po
+share/bzflag/l10n/bzflag_it.po
+share/bzflag/l10n/bzflag_kg.po
+share/bzflag/l10n/bzflag_nl.po
+share/bzflag/l10n/bzflag_pt.po
+share/bzflag/l10n/bzflag_sv.po
+share/bzflag/l10n/bzflag_xx.po
+share/bzflag/land.wav
+share/bzflag/laser.wav
+share/bzflag/lock.wav
+share/bzflag/missile.rgb
+share/bzflag/missile.wav
+share/bzflag/mountain.rgb
+share/bzflag/panel.rgb
+share/bzflag/pbolt.rgb
+share/bzflag/phantom.wav
+share/bzflag/plaser.rgb
+share/bzflag/pop.wav
+share/bzflag/ptbolt.rgb
+share/bzflag/pyrwall.rgb
+share/bzflag/rbolt.rgb
+share/bzflag/ricochet.wav
+share/bzflag/rlaser.rgb
+share/bzflag/roof.rgb
+share/bzflag/rtbolt.rgb
+share/bzflag/shock.wav
+share/bzflag/teamgrab.wav
+share/bzflag/teleport.wav
+share/bzflag/timesbi.rgb
+share/bzflag/timesbr.rgb
+share/bzflag/title.rgb
+share/bzflag/wall.rgb
+share/bzflag/ybolt.rgb
+share/bzflag/ylaser.rgb
+share/bzflag/ytbolt.rgb
+@dirrm share/bzflag/l10n
@dirrm share/bzflag
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030626223551.083d449c.tkato>