Update bzflag to 2.0.12; from Brad with some tweaks from ajacoutot

and myself. Amongst other things, this fixes some 64-bit issues.
ok ajacoutot@

games/bzflag/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2009/08/10 06:31:41 kili Exp $
+# $OpenBSD: Makefile,v 1.18 2009/09/02 08:52:22 sthen Exp $
+
+# crashes the X server in some configurations on macppc
+NOT_FOR_ARCHS=	powerpc
 
 COMMENT=	graphical multiplayer 3D tank war game
 
-DISTNAME=	bzflag-2.0.8
+DISTNAME=	bzflag-2.0.12
-PKGNAME=	${DISTNAME}p7
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
 
@@ -23,25 +25,30 @@ MODULES=	devel/gettext
 
 LIB_DEPENDS=	SDL.>=4::devel/sdl \
 		curl.>=3::net/curl \
-		GLEW::graphics/glew
+		GLEW::graphics/glew \
+		cares::net/libcares
+RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
-WANTLIB=	GL GLU ICE SM X11 Xau Xdmcp Xext Xrandr Xrender \
+WANTLIB=	GL GLU ICE SM X11 Xau Xdmcp Xext Xrandr Xrender c \
-		c crypto idn m ncurses pthread sndio ssl pthread-stubs \
+		crypto idn m ncurses pthread-stubs pthread sndio \
-		stdc++ xcb usbhid z
+		ssl stdc++ usbhid xcb z
 
-AUTOCONF_VERSION=2.59
+AUTOCONF_VERSION= 2.61
 CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS+=--enable-debug
+CONFIGURE_ARGS+= --disable-ccachetest \
+		 --with-glew
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_lib_cares_ares_init=no \
 		ac_cv_lib_bind_gethostent=no
 
 pre-build:
-	@sed -e 's|@LINUX_TRUE@||g ; s|@LINUX_FALSE@|#|g' \
+	@perl -pi -e 's|\@LINUX_TRUE\@||g;' \
-		${WRKSRC}/src/platform/Makefile.in > \
+	    -e 's|\@LINUX_FALSE\@|#|g;' \
-		${WRKSRC}/src/platform/Makefile.sed
+	    ${WRKSRC}/src/platform/Makefile.in
-	@mv ${WRKSRC}/src/platform/Makefile.sed \
+
-		${WRKSRC}/src/platform/Makefile.in
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	@mv ${PREFIX}/share/bzflag/bzflag.desktop \
+	    ${PREFIX}/share/applications
 
 .include <bsd.port.mk>

games/bzflag/distinfo

@@ -1,5 +1,5 @@
-MD5 (bzflag-2.0.8.tar.gz) = Y2IejvUAT/73DoTc2ikxLA==
+MD5 (bzflag-2.0.12.tar.gz) = gb9GHk4hHlCxoqf10NZkDw==
-RMD160 (bzflag-2.0.8.tar.gz) = C4hA8lDa08eB2WLGMfZf9kACKiQ=
+RMD160 (bzflag-2.0.12.tar.gz) = urFxIz08VuzGvOGQkZb2g0TCUwg=
-SHA1 (bzflag-2.0.8.tar.gz) = 1Z85ZnV6b+4ki1M+yzgvg+lr9XQ=
+SHA1 (bzflag-2.0.12.tar.gz) = PvFznL3YuIjck+/kJWCk/fwqIXQ=
-SHA256 (bzflag-2.0.8.tar.gz) = V7FKPiMe2kBDx4LDIJEKVDudC9/R+FaPrl1MoGcR9x4=
+SHA256 (bzflag-2.0.12.tar.gz) = 6dSYuG1IhtB9XHOA67FZAeAu8chQ5gzLskg/OX5vEBM=
-SIZE (bzflag-2.0.8.tar.gz) = 11908327
+SIZE (bzflag-2.0.12.tar.gz) = 12071712

games/bzflag/patches/patch-configure_ac

@@ -1,38 +1,30 @@
-$OpenBSD: patch-configure_ac,v 1.3 2006/09/30 12:45:16 steven Exp $
+$OpenBSD: patch-configure_ac,v 1.4 2009/09/02 08:52:22 sthen Exp $
---- configure.ac.orig	Mon Apr 17 16:11:11 2006
+--- configure.ac.orig	Wed Jun 25 14:00:55 2008
-+++ configure.ac	Sat Sep 23 09:43:43 2006
++++ configure.ac	Wed Apr 29 03:19:29 2009
-@@ -73,12 +73,12 @@ AC_PROG_MAKE_SET
+@@ -236,7 +236,7 @@ fi
- AC_PROG_CC
+ AC_MSG_RESULT([$ac_ff_effect_directional]) 
- AC_PROG_CXX
  
--AC_PATH_PROG(CCACHE, ccache)
+ case $host_os in
--if test "$CCACHE"
+-     linux*|kfreebsd*|freebsd*|netbsd*|dragonfly*) linux=true;;
--then
++     linux*|kfreebsd*|freebsd*|netbsd*|openbsd*|dragonfly*) linux=true;;
--  CC="ccache $CC"
+      *) linux=false;;
--  CXX="ccache $CXX"
+ esac
--fi
+ AM_CONDITIONAL(LINUX, $linux)
-+dnl AC_PATH_PROG(CCACHE, ccache)
+@@ -690,7 +690,7 @@ esac
-+dnl if test "$CCACHE"
+ if test x$enable_debug = xyes ; then
-+dnl then
+    FLAGS="$FLAGS -O0"
-+dnl   CC="ccache $CC"
+    case $host_os in
-+dnl   CXX="ccache $CXX"
+-     linux*|cygwin|mingw32*)
-+dnl fi
++     linux*|openbsd*|cygwin|mingw32*)
- 
+ 	FLAGS="$FLAGS -Werror -Wshadow"
- AC_CHECK_TOOL(WINDRES, windres, :)
+ 	if test x$enable_profiling = xyes ; then
- 
+ 	  FLAGS="$FLAGS -pg"
-@@ -187,6 +187,7 @@ AC_CHECK_HEADERS( \
+@@ -708,7 +708,7 @@ if test x$enable_debug = xyes ; then
- 	SDL/SDL.h \
+     AC_DEFINE(DEBUG, 1, [Debugging enabled])
- 	X11/Xlib.h \
+ else
- 	bstring.h \
+     case $host_os in
-+	arpa/nameser_compat.h \
+-	linux*|cygwin|mingw32*)
- 	linux/input.h \
++	linux*|openbsd*|cygwin|mingw32*)
- 	stdint.h \
+ 	    FLAGS="$FLAGS -ffast-math -fno-exceptions"
- 	sys/param.h \
+ 	    ;;
-@@ -194,6 +195,7 @@ AC_CHECK_HEADERS( \
+ 	solaris*)
- 	values.h \
- 	dsound.h \
- )
-+# nameser_compat.h used by src/c-ares
- 
- #Checks for types
- #AM_CHECK_TYPES(socklen_t)

games/bzflag/patches/patch-src_3D_FontManager_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_3D_FontManager_cxx,v 1.2 2006/09/22 03:42:57 pvalchev Exp $
+$OpenBSD: patch-src_3D_FontManager_cxx,v 1.3 2009/09/02 08:52:22 sthen Exp $
---- src/3D/FontManager.cxx.orig	Tue Jan  3 19:50:35 2006
+--- src/3D/FontManager.cxx.orig	Sat Apr 12 05:28:51 2008
-+++ src/3D/FontManager.cxx	Sun Aug  6 08:00:32 2006
++++ src/3D/FontManager.cxx	Thu Apr  9 01:04:26 2009
-@@ -271,6 +271,8 @@ void FontManager::drawString(float x, fl
+@@ -272,6 +272,8 @@ void FontManager::drawString(float x, float y, float z
    }
  
  

games/bzflag/patches/patch-src_bzflag_playing_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_bzflag_playing_cxx,v 1.1 2006/09/22 03:42:57 pvalchev Exp $
+$OpenBSD: patch-src_bzflag_playing_cxx,v 1.2 2009/09/02 08:52:22 sthen Exp $
---- src/bzflag/playing.cxx.orig	Sat Aug  5 04:59:14 2006
+--- src/bzflag/playing.cxx.orig	Tue Jun 24 18:10:21 2008
-+++ src/bzflag/playing.cxx	Sat Aug  5 04:59:28 2006
++++ src/bzflag/playing.cxx	Thu Apr  9 01:04:26 2009
-@@ -6375,11 +6375,12 @@ static void		defaultErrorCallback(const 
+@@ -6433,11 +6433,12 @@ static void		defaultErrorCallback(const char* msg)
  
  static void		startupErrorCallback(const char* msg)
  {

games/bzflag/patches/patch-src_c-ares_ares_expand_name_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_expand_string_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_gethostbyaddr_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_gethostbyname_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_init_c

@@ -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

games/bzflag/patches/patch-src_c-ares_ares_mkquery_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_parse_a_reply_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_parse_ptr_reply_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_process_c

@@ -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

games/bzflag/patches/patch-src_c-ares_ares_query_c

@@ -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>

games/bzflag/patches/patch-src_c-ares_ares_send_c

@@ -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>

games/bzflag/patches/patch-src_mediafile_PNGImageFile_cxx

@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_mediafile_PNGImageFile_cxx,v 1.1 2006/09/30 12:45:16 steven Exp $
+$OpenBSD: patch-src_mediafile_PNGImageFile_cxx,v 1.2 2009/09/02 08:52:22 sthen Exp $
---- src/mediafile/PNGImageFile.cxx.orig	Fri Sep 22 13:10:00 2006
+--- src/mediafile/PNGImageFile.cxx.orig	Sun Apr  6 01:30:49 2008
-+++ src/mediafile/PNGImageFile.cxx	Fri Sep 22 13:10:11 2006
++++ src/mediafile/PNGImageFile.cxx	Thu Apr  9 01:04:26 2009
-@@ -15,8 +15,7 @@
+@@ -16,8 +16,7 @@
- #include <iostream>
+ #include <string.h>
  #include "Pack.h"
  #include "bzfio.h"
 -#include "../zlib/zconf.h"

games/bzflag/patches/patch-src_platform_SDLMedia_cxx

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.1 2009/01/31 10:11:38 jakemsr Exp $
+$OpenBSD: patch-src_platform_SDLMedia_cxx,v 1.2 2009/09/02 08:52:22 sthen Exp $
---- src/platform/SDLMedia.cxx.orig	Sat Jan 24 06:56:49 2009
+--- src/platform/SDLMedia.cxx.orig	Thu Nov 15 17:10:47 2007
-+++ src/platform/SDLMedia.cxx	Sat Jan 24 15:59:52 2009
++++ src/platform/SDLMedia.cxx	Sat Jan 31 21:26:00 2009
-@@ -68,8 +68,7 @@ bool			SDLMedia::openAudio()
+@@ -106,8 +106,7 @@ bool			SDLMedia::openAudio()
  
    // how big a fragment to use?  we want to hold at around 1/10th of
    // a second.

games/bzflag/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/04/13 23:29:44 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/09/02 08:52:22 sthen Exp $
 @bin bin/bzadmin
 @bin bin/bzflag
 @bin bin/bzfs
@@ -7,6 +7,7 @@
 @man man/man6/bzflag.6
 @man man/man6/bzfquery.6
 @man man/man6/bzfs.6
+share/applications/bzflag.desktop
 share/bzflag/
 share/bzflag/automatic_icon.png
 share/bzflag/blend_flash.png
@@ -177,3 +178,5 @@ share/bzflag/title.png
 share/bzflag/wall.png
 share/bzflag/water.png
 share/bzflag/zone_ground.png
+@exec %D/bin/update-desktop-database
+@unexec %D/bin/update-desktop-database