From 0b50a757e52f47c25d023005938c29eb7cb72093 Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Fri, 18 Jul 2003 17:00:48 +0000
Subject: Fix build, remove BROKEN and refuce newline. Also use %%DOCSDIR%% for
 pkg-plist.

Patches submitted by:	Simon Barner <barner@in.tum.de>
---
 games/battleball/Makefile                    | 10 ++--------
 games/battleball/files/patch-lib3d-general.h | 18 ++++++++++++++++++
 games/battleball/files/patch-lib3d-xform.h   | 10 ++++++++++
 games/battleball/pkg-plist                   |  6 +++---
 4 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 games/battleball/files/patch-lib3d-general.h
 create mode 100644 games/battleball/files/patch-lib3d-xform.h

(limited to 'games/battleball')

diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index e53db21910ff..2b1daf2735ae 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	battleball
 PORTVERSION=	2.1
 CATEGORIES=	games
 MASTER_SITES=	http://home.austin.rr.com/pah/
-
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/.//}.src
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,12 +19,7 @@ USE_MESA=	yes
 WRKSRC=		${WRKDIR}/battleball-2.1-src
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+CFLAGS+=	-Wno-deprecated
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
@@ -38,4 +32,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/battleball/files/patch-lib3d-general.h b/games/battleball/files/patch-lib3d-general.h
new file mode 100644
index 000000000000..e795d45e4463
--- /dev/null
+++ b/games/battleball/files/patch-lib3d-general.h
@@ -0,0 +1,18 @@
+--- lib3d/general.h.orig	Fri Sep  3 04:25:19 1999
++++ lib3d/general.h	Fri Jul 18 17:42:41 2003
+@@ -25,9 +25,15 @@
+ typedef unsigned int  uint;
+ typedef unsigned long ulong;
+ 
++#ifdef __GNUC__
++#if __GNUC__ < 3
+ #define and &&
+ #define or  ||
+ #define not !
++#endif
++
++// TODO - what about non-GNU C++ compilers?
++#endif
+ 
+ #define forii(limit) for (int i= 0; i <limit; i++)
+ #define forij(limit) for (int j= 0; j <limit; j++)
diff --git a/games/battleball/files/patch-lib3d-xform.h b/games/battleball/files/patch-lib3d-xform.h
new file mode 100644
index 000000000000..bca2ac7076d7
--- /dev/null
+++ b/games/battleball/files/patch-lib3d-xform.h
@@ -0,0 +1,10 @@
+--- lib3d/xform.h.orig	Fri Jul 18 17:28:08 2003
++++ lib3d/xform.h	Fri Jul 18 17:26:11 2003
+@@ -64,6 +64,7 @@
+ 
+ //===========================================================================
+ class tmtrx {
++  friend struct player;
+   typedef double fourby3[4][3];
+   fourby3 m;
+ 
diff --git a/games/battleball/pkg-plist b/games/battleball/pkg-plist
index 7638c92ae39c..9b7b471802da 100644
--- a/games/battleball/pkg-plist
+++ b/games/battleball/pkg-plist
@@ -1,4 +1,4 @@
 bin/battleball
-%%PORTDOCS%%share/doc/battleball/CHANGELOG
-%%PORTDOCS%%share/doc/battleball/README
-%%PORTDOCS%%@dirrm share/doc/battleball
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit v1.2.3