Hi.
This diff updates bzflag to version 2.0.10.
This has been successfully tested under i386.
Note that you *need* the recent devel/sdl fix (sdl-1.2.13p0) for it to
work.
Comments/OK?
--
Antoine
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/bzflag/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- Makefile 13 Nov 2007 14:54:31 -0000 1.13
+++ Makefile 13 Dec 2007 10:00:58 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.13 2007/11/13 14:54:31 steven Exp $
COMMENT= graphical multiplayer 3-d tank war game
-DISTNAME= bzflag-2.0.8
-PKGNAME= ${DISTNAME}p3
+DISTNAME= bzflag-2.0.10
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bzflag/}
@@ -20,21 +19,28 @@
MODULES= devel/gettext
-LIB_DEPENDS= SDL.>=4::devel/sdl curl.>=3::net/curl
+LIB_DEPENDS= SDL.>=4::devel/sdl \
+ curl.>=3::net/curl
WANTLIB= GL GLU ICE SM X11 Xau Xdmcp Xext Xrandr Xrender \
c crypto idn m ncurses pthread ssl stdc++ usbhid z
-AUTOCONF_VERSION=2.59
-CONFIGURE_STYLE=gnu autoconf
-CONFIGURE_ARGS+=--disable-adns --enable-debug
-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include"
LDFLAGS="-L${LOCALBASE}/include"
+AUTOCONF_VERSION=2.61
-pre-build:
- @sed -e 's|@LINUX_TRUE@||g ; s|@LINUX_FALSE@|#|g' \
- ${WRKSRC}/src/platform/Makefile.in > \
- ${WRKSRC}/src/platform/Makefile.sed
- @mv ${WRKSRC}/src/platform/Makefile.sed \
+CONFIGURE_STYLE=gnu autoconf
+CONFIGURE_ARGS= --disable-shared \
+ --enable-robots \
+ --enable-bzadmin \
+ --enable-client \
+ --enable-threads \
+ --enable-debug \
+ --disable-ccachetest
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+pre-configure:
+ @perl -pi -e 's,[EMAIL PROTECTED]@,,g;' \
+ -e 's,[EMAIL PROTECTED]@,#,g' \
${WRKSRC}/src/platform/Makefile.in
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/bzflag/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 5 Apr 2007 15:38:09 -0000 1.7
+++ distinfo 13 Dec 2007 10:00:58 -0000
@@ -1,5 +1,5 @@
-MD5 (bzflag-2.0.8.tar.gz) = Y2IejvUAT/73DoTc2ikxLA==
-RMD160 (bzflag-2.0.8.tar.gz) = C4hA8lDa08eB2WLGMfZf9kACKiQ=
-SHA1 (bzflag-2.0.8.tar.gz) = 1Z85ZnV6b+4ki1M+yzgvg+lr9XQ=
-SHA256 (bzflag-2.0.8.tar.gz) = V7FKPiMe2kBDx4LDIJEKVDudC9/R+FaPrl1MoGcR9x4=
-SIZE (bzflag-2.0.8.tar.gz) = 11908327
+MD5 (bzflag-2.0.10.tar.gz) = jCJfOiDQlDl2K36BZtlO1g==
+RMD160 (bzflag-2.0.10.tar.gz) = Dkwk5Zekq4BKjbTx1mfJAPehoYM=
+SHA1 (bzflag-2.0.10.tar.gz) = qQLUdH0cBTZzQydu9+3ApprfkT0=
+SHA256 (bzflag-2.0.10.tar.gz) = k5zOtMPOiQPNoFkJ+0o4KtHLCQ8IvftD53y78RuqjL8=
+SIZE (bzflag-2.0.10.tar.gz) = 12079328
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/games/bzflag/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -r1.3 patch-configure_ac
--- patches/patch-configure_ac 30 Sep 2006 12:45:16 -0000 1.3
+++ patches/patch-configure_ac 13 Dec 2007 10:00:58 -0000
@@ -1,38 +1,12 @@
-$OpenBSD: patch-configure_ac,v 1.3 2006/09/30 12:45:16 steven Exp $
---- configure.ac.orig Mon Apr 17 16:11:11 2006
-+++ configure.ac Sat Sep 23 09:43:43 2006
-@@ -73,12 +73,12 @@ AC_PROG_MAKE_SET
- AC_PROG_CC
- AC_PROG_CXX
+$OpenBSD$
+--- configure.ac.orig Tue Dec 4 11:29:46 2007
++++ configure.ac Tue Dec 4 11:29:55 2007
+@@ -466,7 +466,7 @@ AC_ARG_ENABLE(threads, [ --enable-threads buil
+ if test x$enable_threads = xyes ; then
+ AC_DEFINE(USE_THREADS, 1, [Use threads])
+ CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+- LDFLAGS="$LDFLAGS -lpthread"
++ LDFLAGS="$LDFLAGS -pthread"
+ fi
--AC_PATH_PROG(CCACHE, ccache)
--if test "$CCACHE"
--then
-- CC="ccache $CC"
-- CXX="ccache $CXX"
--fi
-+dnl AC_PATH_PROG(CCACHE, ccache)
-+dnl if test "$CCACHE"
-+dnl then
-+dnl CC="ccache $CC"
-+dnl CXX="ccache $CXX"
-+dnl fi
-
- AC_CHECK_TOOL(WINDRES, windres, :)
-
-@@ -187,6 +187,7 @@ AC_CHECK_HEADERS( \
- SDL/SDL.h \
- X11/Xlib.h \
- bstring.h \
-+ arpa/nameser_compat.h \
- linux/input.h \
- stdint.h \
- sys/param.h \
-@@ -194,6 +195,7 @@ AC_CHECK_HEADERS( \
- values.h \
- dsound.h \
- )
-+# nameser_compat.h used by src/c-ares
-
- #Checks for types
- #AM_CHECK_TYPES(socklen_t)
+ AC_CHECK_LIB(cares, ares_init, BUILDCARES=no, BUILDCARES=yes)
Index: patches/patch-src_3D_FontManager_cxx
===================================================================
RCS file: /cvs/ports/games/bzflag/patches/patch-src_3D_FontManager_cxx,v
retrieving revision 1.2
diff -u -r1.2 patch-src_3D_FontManager_cxx
--- patches/patch-src_3D_FontManager_cxx 22 Sep 2006 03:42:57 -0000
1.2
+++ patches/patch-src_3D_FontManager_cxx 13 Dec 2007 10:00:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_3D_FontManager_cxx,v 1.2 2006/09/22 03:42:57 pvalchev Exp $
---- src/3D/FontManager.cxx.orig Tue Jan 3 19:50:35 2006
-+++ src/3D/FontManager.cxx Sun Aug 6 08:00:32 2006
-@@ -271,6 +271,8 @@ void FontManager::drawString(float x, fl
+--- src/3D/FontManager.cxx.orig Thu Nov 15 23:10:59 2007
++++ src/3D/FontManager.cxx Tue Dec 4 11:15:55 2007
+@@ -271,6 +271,8 @@ void FontManager::drawString(float x, float y, float z
}
Index: patches/patch-src_bzflag_playing_cxx
===================================================================
RCS file: /cvs/ports/games/bzflag/patches/patch-src_bzflag_playing_cxx,v
retrieving revision 1.1
diff -u -r1.1 patch-src_bzflag_playing_cxx
--- patches/patch-src_bzflag_playing_cxx 22 Sep 2006 03:42:57 -0000
1.1
+++ patches/patch-src_bzflag_playing_cxx 13 Dec 2007 10:00:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_bzflag_playing_cxx,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
---- src/bzflag/playing.cxx.orig Sat Aug 5 04:59:14 2006
-+++ src/bzflag/playing.cxx Sat Aug 5 04:59:28 2006
-@@ -6375,11 +6375,12 @@ static void defaultErrorCallback(const
+--- src/bzflag/playing.cxx.orig Thu Nov 15 23:10:59 2007
++++ src/bzflag/playing.cxx Tue Dec 4 11:15:55 2007
+@@ -6437,11 +6437,12 @@ static void defaultErrorCallback(const
char* msg)
static void startupErrorCallback(const char* msg)
{
Index: patches/patch-src_c-ares_ares_expand_name_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_expand_name_c
diff -N patches/patch-src_c-ares_ares_expand_name_c
--- patches/patch-src_c-ares_ares_expand_name_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_expand_name_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_expand_name.c.orig Sun Aug 6 07:59:22 2006
-+++ src/c-ares/ares_expand_name.c Sun Aug 6 07:59:35 2006
-@@ -21,7 +21,9 @@
- #else
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
Index: patches/patch-src_c-ares_ares_expand_string_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_expand_string_c
diff -N patches/patch-src_c-ares_ares_expand_string_c
--- patches/patch-src_c-ares_ares_expand_string_c 22 Sep 2006 03:42:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_expand_string_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_expand_string.c.orig Sun Aug 6 07:59:01 2006
-+++ src/c-ares/ares_expand_string.c Sun Aug 6 07:59:13 2006
-@@ -21,7 +21,9 @@
- #else
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <string.h>
Index: patches/patch-src_c-ares_ares_gethostbyaddr_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_gethostbyaddr_c
diff -N patches/patch-src_c-ares_ares_gethostbyaddr_c
--- patches/patch-src_c-ares_ares_gethostbyaddr_c 22 Sep 2006 03:42:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_gethostbyaddr_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_gethostbyaddr.c.orig Sun Aug 6 07:58:38 2006
-+++ src/c-ares/ares_gethostbyaddr.c Sun Aug 6 07:58:49 2006
-@@ -23,7 +23,9 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdio.h>
Index: patches/patch-src_c-ares_ares_gethostbyname_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_gethostbyname_c
diff -N patches/patch-src_c-ares_ares_gethostbyname_c
--- patches/patch-src_c-ares_ares_gethostbyname_c 22 Sep 2006 03:42:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_gethostbyname_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_gethostbyname.c.orig Sun Aug 6 07:58:06 2006
-+++ src/c-ares/ares_gethostbyname.c Sun Aug 6 07:58:24 2006
-@@ -24,7 +24,9 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdio.h>
Index: patches/patch-src_c-ares_ares_init_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_init_c
diff -N patches/patch-src_c-ares_ares_init_c
--- patches/patch-src_c-ares_ares_init_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_init_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
---- src/c-ares/ares_init.c.orig Sun Aug 6 07:57:42 2006
-+++ src/c-ares/ares_init.c Sun Aug 6 07:57:54 2006
-@@ -31,7 +31,9 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
Index: patches/patch-src_c-ares_ares_mkquery_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_mkquery_c
diff -N patches/patch-src_c-ares_ares_mkquery_c
--- patches/patch-src_c-ares_ares_mkquery_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_mkquery_c,v 1.1 2006/09/22 03:42:57 pvalchev
Exp $
---- src/c-ares/ares_mkquery.c.orig Sun Aug 6 07:57:19 2006
-+++ src/c-ares/ares_mkquery.c Sun Aug 6 07:57:33 2006
-@@ -21,7 +21,9 @@
- #else
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
Index: patches/patch-src_c-ares_ares_parse_a_reply_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_parse_a_reply_c
diff -N patches/patch-src_c-ares_ares_parse_a_reply_c
--- patches/patch-src_c-ares_ares_parse_a_reply_c 22 Sep 2006 03:42:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_parse_a_reply_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_parse_a_reply.c.orig Sun Aug 6 08:03:03 2006
-+++ src/c-ares/ares_parse_a_reply.c Sun Aug 6 08:03:19 2006
-@@ -24,7 +24,9 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
Index: patches/patch-src_c-ares_ares_parse_ptr_reply_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_parse_ptr_reply_c
diff -N patches/patch-src_c-ares_ares_parse_ptr_reply_c
--- patches/patch-src_c-ares_ares_parse_ptr_reply_c 22 Sep 2006 03:42:57
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_parse_ptr_reply_c,v 1.1 2006/09/22 03:42:57
pvalchev Exp $
---- src/c-ares/ares_parse_ptr_reply.c.orig Sun Aug 6 07:56:56 2006
-+++ src/c-ares/ares_parse_ptr_reply.c Sun Aug 6 07:57:10 2006
-@@ -23,7 +23,9 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
Index: patches/patch-src_c-ares_ares_process_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_process_c
diff -N patches/patch-src_c-ares_ares_process_c
--- patches/patch-src_c-ares_ares_process_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_process_c,v 1.1 2006/09/22 03:42:57 pvalchev
Exp $
---- src/c-ares/ares_process.c.orig Sun Aug 6 07:56:27 2006
-+++ src/c-ares/ares_process.c Sun Aug 6 07:56:40 2006
-@@ -27,7 +27,9 @@
- #include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
Index: patches/patch-src_c-ares_ares_query_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_query_c
diff -N patches/patch-src_c-ares_ares_query_c
--- patches/patch-src_c-ares_ares_query_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_query_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp
$
---- src/c-ares/ares_query.c.orig Sun Aug 6 07:56:03 2006
-+++ src/c-ares/ares_query.c Sun Aug 6 07:56:16 2006
-@@ -21,7 +21,9 @@
- #else
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
Index: patches/patch-src_c-ares_ares_send_c
===================================================================
RCS file: patches/patch-src_c-ares_ares_send_c
diff -N patches/patch-src_c-ares_ares_send_c
--- patches/patch-src_c-ares_ares_send_c 22 Sep 2006 03:42:57 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_c-ares_ares_send_c,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
---- src/c-ares/ares_send.c.orig Sun Aug 6 07:55:12 2006
-+++ src/c-ares/ares_send.c Sun Aug 6 07:55:42 2006
-@@ -21,7 +21,9 @@
- #else
- #include <netinet/in.h>
- #include <arpa/nameser.h>
-+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
- #include <arpa/nameser_compat.h>
-+#endif
- #endif
-
- #include <stdlib.h>
