- Update to version 1.10.0

PR:		60139
Submitted by:	Ports Fury
This commit is contained in:
Kirill Ponomarev 2003-12-11 14:23:16 +00:00
parent 64b3fe8cd6
commit e1ef7f6b8f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=95601
10 changed files with 135 additions and 95 deletions

View file

@ -6,29 +6,28 @@
#
PORTNAME= bzflag
PORTVERSION= 1.7g.2
PORTVERSION= 1.10.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
EXTRACT_SUFX= .tgz
DISTNAME= ${PORTNAME}-${PORTVERSION:R}.20031209
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiplayer 3D tank battle game
USE_MESA= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-1.9.10.20031209
USE_GL= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_AUTOCONF_VER= 213
GNU_CONFIGURE= yes
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
MAN6= bzadmin.6 bzflag.6 bzfls.6 bzfquery.6 bzfrelay.6 bzfs.6
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

View file

@ -1 +1 @@
MD5 (bzflag-1.7g2.tgz) = 792f31d0dc91405be3f83ca7a3850ebe
MD5 (bzflag-1.10.20031209.tar.gz) = 2dd502bfdee96b9d5055ea3125a4b95a

View file

@ -1,11 +0,0 @@
--- src/bzflag/ServerLink.cxx.orig Sat Jan 26 09:26:30 2002
+++ src/bzflag/ServerLink.cxx Sat Jan 26 09:25:55 2002
@@ -781,7 +781,7 @@
if ((urecvfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
return; // we cannot comply
}
- for (int portno=17200; portno < 65000; portno++) {
+ for (int portno=49152; portno < 65535; portno++) {
::memset((unsigned char *)&serv_addr, 0, sizeof(serv_addr));
serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);

View file

@ -0,0 +1,20 @@
--- configure.orig Tue Dec 9 17:08:21 2003
+++ configure Thu Dec 11 00:55:53 2003
@@ -2515,7 +2515,7 @@
fi
-LDFLAGS=$X_LIBS
+LDFLAGS="$X_LIBS $LDFLAGS"
case $host_os in
solaris*)
GLIBS="-lresolv -laudio $GLIBS";
@@ -2724,7 +2724,7 @@
# avoid using X11 in BeOS
if test $host_os != beos; then
- CPPFLAGS=
+ CPPFLAGS="$X_CFLAGS $CPPFLAGS"
if test x$no_x = x; then
GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
fi

View file

@ -1,36 +0,0 @@
--- 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

View file

@ -0,0 +1,14 @@
--- src/bzadmin/CursesUI.cxx.orig Tue Dec 9 16:31:33 2003
+++ src/bzadmin/CursesUI.cxx Thu Dec 11 01:44:31 2003
@@ -232,7 +232,11 @@
void CursesUI::handleResize(int lines, int cols) {
+#ifdef __FreeBSD__
+ resizeterm(lines, cols);
+#else
resize_term(lines, cols);
+#endif
mvwin(targetWin, lines - 2, 0);
wresize(targetWin, 1, cols);
mvwin(cmdWin, lines - 1, 0);

View file

@ -0,0 +1,10 @@
--- src/bzadmin/StdBothUI.cxx.orig Tue Dec 9 16:38:14 2003
+++ src/bzadmin/StdBothUI.cxx Thu Dec 11 01:25:29 2003
@@ -20,6 +20,7 @@
#include <ws2tcpip.h>
#include <wincon.h>
#else
+#include <sys/types.h>
#include <sys/select.h>
#endif

View file

@ -0,0 +1,11 @@
--- src/bzflag/HUDRenderer.cxx.orig Tue Dec 9 16:38:59 2003
+++ src/bzflag/HUDRenderer.cxx Thu Dec 11 00:58:54 2003
@@ -11,7 +11,7 @@
*/
// system headers
-#if !defined(__APPLE__)
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
#include <malloc.h>
#endif
#include <stdio.h>

View file

@ -0,0 +1,28 @@
--- src/bzflag/Makefile.in.orig Wed Dec 10 09:09:45 2003
+++ src/bzflag/Makefile.in Thu Dec 11 02:09:15 2003
@@ -168,7 +168,6 @@
@MACOS_FALSE@ ../scene/libSceneDB.a \
@MACOS_FALSE@ ../geometry/libGeometry.a \
@MACOS_FALSE@ ../mediafile/libMediaFile.a \
-@MACOS_FALSE@ ../zlib/libz.a \
@MACOS_FALSE@ $(RESOURCE) \
@MACOS_FALSE@ $(GLIBS)
# This is required to hook in ogg/vorbis libraries
@@ -176,7 +175,7 @@
AM_CPPFLAGS = $(X_CFLAGS)
-bzflag_LDFLAGS = ../date/buildDate.o
+bzflag_LDFLAGS = ../date/buildDate.o -lz
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../include/config.h
CONFIG_CLEAN_FILES =
@@ -207,7 +206,7 @@
@MACOS_FALSE@../common/libCommon.a ../obstacle/libObstacle.a \
@MACOS_FALSE@../platform/libPlatform.a ../ogl/libGLKit.a \
@MACOS_FALSE@../scene/libSceneDB.a ../geometry/libGeometry.a \
-@MACOS_FALSE@../mediafile/libMediaFile.a ../zlib/libz.a
+@MACOS_FALSE@../mediafile/libMediaFile.a
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)

View file

@ -1,37 +1,37 @@
bin/bzadmin
bin/bzflag
bin/bzfls
bin/bzfrelay
bin/bzfs
share/bzflag/Bzflag.fti
share/bzflag/Bzflag.ftr
share/bzflag/Bzfs.fti
share/bzflag/bbolt.rgb
share/bzflag/blaser.rgb
share/bzflag/bbolt.png
share/bzflag/blaser.png
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/boxwall.png
share/bzflag/btbolt.png
share/bzflag/caution.png
share/bzflag/clouds.png
share/bzflag/explode1.png
share/bzflag/explosion.wav
share/bzflag/fire.wav
share/bzflag/fixedbr.rgb
share/bzflag/fixedmr.rgb
share/bzflag/flag.rgb
share/bzflag/fixedbr.png
share/bzflag/fixedmr.png
share/bzflag/flag.png
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/flage.png
share/bzflag/gbolt.png
share/bzflag/glaser.png
share/bzflag/ground.png
share/bzflag/gtbolt.png
share/bzflag/helvbi.png
share/bzflag/helvbr.png
share/bzflag/hunt.wav
share/bzflag/hunt_select.wav
share/bzflag/jump.wav
share/bzflag/killteam.wav
share/bzflag/l10n/bzflag_cs_CZ.po
share/bzflag/l10n/bzflag_da.po
share/bzflag/l10n/bzflag_de.po
share/bzflag/l10n/bzflag_en_US_l33t.po
@ -47,30 +47,35 @@ 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.png
share/bzflag/missile.wav
share/bzflag/mountain.rgb
share/bzflag/panel.rgb
share/bzflag/pbolt.rgb
share/bzflag/mountain.png
share/bzflag/panel.png
share/bzflag/pbolt.png
share/bzflag/phantom.wav
share/bzflag/plaser.rgb
share/bzflag/plaser.png
share/bzflag/pop.wav
share/bzflag/ptbolt.rgb
share/bzflag/pyrwall.rgb
share/bzflag/rbolt.rgb
share/bzflag/ptbolt.png
share/bzflag/pyrwall.png
share/bzflag/rbolt.png
share/bzflag/ricochet.wav
share/bzflag/rlaser.rgb
share/bzflag/roof.rgb
share/bzflag/rtbolt.rgb
share/bzflag/rlaser.png
share/bzflag/roof.png
share/bzflag/rtbolt.png
share/bzflag/shock.wav
share/bzflag/steamroller.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
share/bzflag/thief.png
share/bzflag/timesbi.png
share/bzflag/timesbr.png
share/bzflag/title.png
share/bzflag/wall.png
share/bzflag/wbolt.png
share/bzflag/wlaser.png
share/bzflag/wtbolt.png
share/bzflag/ybolt.png
share/bzflag/ylaser.png
share/bzflag/ytbolt.png
@dirrm share/bzflag/l10n
@dirrm share/bzflag