From 24e9c2575b3ca1bffd27dc33a8ebb85abb71d21a Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Thu, 11 Nov 2010 12:43:26 +0000
Subject: [PATCH] Some further clean up of the port and garbage collect two
 useless local patches.

From Brad

OK dcoppa@, landry@, jasper@
---
 games/bzflag/Makefile                         | 25 +++++++------------
 .../patches/patch-src_3D_FontManager_cxx      | 12 ---------
 .../patches/patch-src_bzflag_playing_cxx      | 21 ----------------
 3 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 games/bzflag/patches/patch-src_3D_FontManager_cxx
 delete mode 100644 games/bzflag/patches/patch-src_bzflag_playing_cxx

diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index b9d474795ed..cf76c0b2370 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/08 13:51:52 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/11 12:43:26 dcoppa Exp $
 
 COMMENT=	graphical multiplayer 3D tank war game
 
 DISTNAME=	bzflag-2.0.16
+REVISION=	0
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bzflag/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,22 +15,20 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-
-USE_LIBTOOL=	Yes
-USE_GMAKE=	Yes
+WANTLIB=	GL GLEW GLU ICE SDL SM X11 Xau Xdmcp Xext Xrandr Xrender \
+		c cares crypto curl idn m ncurses pthread-stubs pthread \
+		sndio ssl stdc++ usbhid xcb z
 
 MODULES=	devel/gettext
-
 LIB_DEPENDS=	::devel/sdl \
-		::net/curl \
 		::graphics/glew \
+		::net/curl \
 		::net/libcares
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
-WANTLIB=	GL GLU ICE SM X11 Xau Xdmcp Xext Xrandr Xrender c \
-		crypto idn m ncurses pthread-stubs pthread sndio \
-		ssl stdc++ usbhid xcb z SDL.>=4 curl.>=3 GLEW cares
-
+USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
+USE_GROFF=	Yes
 AUTOCONF_VERSION= 2.61
 CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS+= --disable-ccachetest \
@@ -37,12 +36,6 @@ CONFIGURE_ARGS+= --disable-ccachetest \
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		ac_cv_lib_bind_gethostent=no
-USE_GROFF =	Yes
-
-pre-build:
-	@perl -pi -e 's|\@LINUX_TRUE\@||g;' \
-	    -e 's|\@LINUX_FALSE\@|#|g;' \
-	    ${WRKSRC}/src/platform/Makefile.in
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
diff --git a/games/bzflag/patches/patch-src_3D_FontManager_cxx b/games/bzflag/patches/patch-src_3D_FontManager_cxx
deleted file mode 100644
index 1350a94d83e..00000000000
--- a/games/bzflag/patches/patch-src_3D_FontManager_cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_3D_FontManager_cxx,v 1.3 2009/09/02 08:52:22 sthen Exp $
---- src/3D/FontManager.cxx.orig	Sat Apr 12 05:28:51 2008
-+++ src/3D/FontManager.cxx	Thu Apr  9 01:04:26 2009
-@@ -272,6 +272,8 @@ void FontManager::drawString(float x, float y, float z
-   }
- 
- 
-+  OpenGLGState::resetState(); /* full reset needed for bitmap renderer? */
-+
-   /*
-    * Colorize text based on ANSI codes embedded in it
-    * Break the text every time an ANSI code
diff --git a/games/bzflag/patches/patch-src_bzflag_playing_cxx b/games/bzflag/patches/patch-src_bzflag_playing_cxx
deleted file mode 100644
index a48912e90e3..00000000000
--- a/games/bzflag/patches/patch-src_bzflag_playing_cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_bzflag_playing_cxx,v 1.3 2010/07/25 17:14:35 jolan Exp $
---- src/bzflag/playing.cxx.orig	Wed Mar 31 23:21:08 2010
-+++ src/bzflag/playing.cxx	Fri Apr  9 21:23:21 2010
-@@ -6648,11 +6648,12 @@ static void		defaultErrorCallback(const char* msg)
- 
- static void		startupErrorCallback(const char* msg)
- {
--  controlPanel->addMessage(msg);
--  glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
--  glClear(GL_COLOR_BUFFER_BIT);
--  controlPanel->render(*sceneRenderer);
--  mainWindow->getWindow()->swapBuffers();
-+//   controlPanel->addMessage(msg);
-+//   glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-+//   glClear(GL_COLOR_BUFFER_BIT);
-+//   controlPanel->render(*sceneRenderer);
-+//   mainWindow->getWindow()->swapBuffers();
-+  std::cerr << msg << std::endl << std::flush;
- }
- 
-