ports/60159: Update port: games/bzflag to version 1.10

Thu Dec 11 18:30:30 UTC 2003

>Number:         60159
>Category:       ports
>Synopsis:       Update port: games/bzflag to version 1.10
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 11 10:30:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Charles Swiger
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
PKIx
>Environment:
System: FreeBSD ns1.pkix.net 4.9-STABLE FreeBSD 4.9-STABLE #9: Tue Dec 2 16:05:30 EST 2003 root at ns1.pkix.net:/usr/obj/usr/src/sys/NORMAL i386

>Description:

A user requested that the games/bzflag port be updated to the latest version,
1.10...

>How-To-Repeat:

N/A.

>Fix:

diff -durP bzflag_orig/Makefile bzflag/Makefile

--- bzflag_orig/Makefile	Wed Dec 10 14:45:36 2003
+++ bzflag/Makefile	Thu Dec 11 13:05:24 2003
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	bzflag
-PORTVERSION=	1.7g.2
+PORTVERSION=	1.10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-${PORTVERSION}.20031209
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	chuck at pkix.net
 COMMENT=	A multiplayer 3D tank battle game
 
-USE_MESA=	yes
+WRKSRC=		${WRKDIR}/bzflag-1.9.10.20031209
+USE_GL=		yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
diff -durP bzflag_orig/distinfo bzflag/distinfo
--- bzflag_orig/distinfo	Wed Dec 10 14:45:36 2003
+++ bzflag/distinfo	Wed Dec 10 14:50:03 2003
@@ -1 +1 @@
-MD5 (bzflag-1.7g2.tgz) = 792f31d0dc91405be3f83ca7a3850ebe
+MD5 (bzflag-1.10.20031209.tar.gz) = 2dd502bfdee96b9d5055ea3125a4b95a
diff -durP bzflag_orig/files/patch-CursesUI.cxx bzflag/files/patch-CursesUI.cxx
--- bzflag_orig/files/patch-CursesUI.cxx	Wed Dec 31 19:00:00 1969
+++ bzflag/files/patch-CursesUI.cxx	Wed Dec 10 15:33:38 2003
@@ -0,0 +1,14 @@
+--- src/bzadmin/CursesUI.cxx~	Tue Dec  9 02:31:33 2003
++++ src/bzadmin/CursesUI.cxx	Wed Dec 10 15:31:37 2003
+@@ -230,9 +230,10 @@
+   return targetIter->first;
+ }
+ 
+-
+ void CursesUI::handleResize(int lines, int cols) {
++#ifdef HAVE_RESIZE_TERM
+   resize_term(lines, cols);
++#endif
+   mvwin(targetWin, lines - 2, 0);
+   wresize(targetWin, 1, cols);
+   mvwin(cmdWin, lines - 1, 0);
Only in bzflag_orig/files: patch-ServerLink.cxx
diff -durP bzflag_orig/files/patch-StdBothUI.cxx bzflag/files/patch-StdBothUI.cxx
--- bzflag_orig/files/patch-StdBothUI.cxx	Wed Dec 31 19:00:00 1969
+++ bzflag/files/patch-StdBothUI.cxx	Wed Dec 10 15:39:26 2003
@@ -0,0 +1,10 @@
+--- src/bzadmin/StdBothUI.cxx~	Tue Dec  9 02:38:14 2003
++++ src/bzadmin/StdBothUI.cxx	Wed Dec 10 15:38:29 2003
+@@ -20,6 +20,7 @@
+ #include <ws2tcpip.h>
+ #include <wincon.h>
+ #else
++#include <sys/types.h>
+ #include <sys/select.h>
+ #endif
+ 
Only in bzflag_orig/files: patch-XWindow.h
diff -durP bzflag_orig/files/patch-configure.in bzflag/files/patch-configure.in
--- bzflag_orig/files/patch-configure.in	Wed Dec 10 14:45:36 2003
+++ bzflag/files/patch-configure.in	Wed Dec 10 15:04:41 2003
@@ -1,22 +1,6 @@
---- 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 @@
+--- configure.in_orig	Wed Dec 10 15:01:15 2003
++++ configure.in	Wed Dec 10 15:03:17 2003
+@@ -113,7 +113,7 @@
  
  AC_PATH_XTRA
  
@@ -25,12 +9,12 @@
  case $host_os in
    solaris*)
      GLIBS="-lresolv -laudio $GLIBS";
-@@ -98,7 +105,7 @@
- 
- AC_CHECK_LIB(m, sqrtf)
+@@ -137,7 +137,7 @@
  
--CPPFLAGS=
-+CPPFLAGS="$X_CFLAGS $CPPFLAGS"
- if test x$X_DISPLAY_MISSING = x; then
-   GLIBS="$X_PRE_LIBS -lX11 $EXTRA_LIBS $GLIBS"
- fi
+ # 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
Only in bzflag_orig/files: patch-usbjoy.cxx
diff -durP bzflag_orig/pkg-plist bzflag/pkg-plist
--- bzflag_orig/pkg-plist	Wed Dec 10 14:45:36 2003
+++ bzflag/pkg-plist	Wed Dec 10 15:51:29 2003
@@ -1,37 +1,37 @@
 bin/bzflag
-bin/bzfls
+bin/bzadmin
 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/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

>Release-Note:
>Audit-Trail:
>Unformatted:

