From 4a4b5e4725294643af1844ccd266bec313cfeeb1 Mon Sep 17 00:00:00 2001
From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
Date: Mon, 6 Aug 2001 19:54:40 +0000
Subject: o make it PTHREAD_{LIBS,CFLAGS} safe o some Makefile style files: use
 DOCSDIR and extraneous space   removals o support NOPORTDOCS

PR:		29482
Submitted by:	Patrick Li <pat@databits.net>
---
 games/battleball/Makefile       |  6 ++++--
 games/battleball/files/patch-af | 17 ++++++++---------
 games/battleball/pkg-plist      |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'games/battleball')

diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index a3a5e6e1307d..83edce5b6ddd 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -17,15 +17,17 @@ MAINTAINER=	ports@FreeBSD.org
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 WRKSRC=		${WRKDIR}/battleball-2.1-src
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/battleball
+	@${MKDIR} ${DOCSDIR}
 .for file in CHANGELOG README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/battleball
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/games/battleball/files/patch-af b/games/battleball/files/patch-af
index 5c67ec764104..1dc6604a8ba9 100644
--- a/games/battleball/files/patch-af
+++ b/games/battleball/files/patch-af
@@ -1,21 +1,20 @@
---- Makefile	Thu Sep  2 22:25:18 1999
-+++ Makefile.new	Sun Apr 16 17:28:19 2000
-@@ -1,17 +1,18 @@
+--- Makefile.orig	Thu Sep  2 22:25:18 1999
++++ Makefile	Mon Aug  6 00:46:04 2001
+@@ -1,17 +1,14 @@
 -CXX		= g++
-+CXX		?= c++
- 
+-
  # If you don't have OpenGL or Mesa, you can still compile BattleBall;
  # just define the symbol NO_OPENGL when compiling, and don't link with
  # $(GLLIBS) when linking
 -CXXFLAGS	= -O2 -funroll-loops
-+CXXFLAGS	?= -O -pipe
- #CXXFLAGS	= -O2 -funroll-loops -DNO_OPENGL
+-#CXXFLAGS	= -O2 -funroll-loops -DNO_OPENGL
++CXXFLAGS	+= ${PTHREAD_CFLAGS}
  
  INCS		= -Ibsp -Ilib3d
 -XLIBS		= -L/usr/X11R6/lib -lX11
-+X11BASE		?=/usr/X11R6
+-LIBS		= -lm $(XLIBS)
 +XLIBS		= -L$(X11BASE)/lib -lX11
- LIBS		= -lm $(XLIBS)
++LIBS		= -lm $(XLIBS) ${PTHREAD_LIBS}
  
 -GLINCS		= -I/usr/local/X11/include
 -GLLIBS		= -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
diff --git a/games/battleball/pkg-plist b/games/battleball/pkg-plist
index d6efb5917d67..7638c92ae39c 100644
--- a/games/battleball/pkg-plist
+++ b/games/battleball/pkg-plist
@@ -1,4 +1,4 @@
 bin/battleball
-share/doc/battleball/CHANGELOG
-share/doc/battleball/README
-@dirrm share/doc/battleball
+%%PORTDOCS%%share/doc/battleball/CHANGELOG
+%%PORTDOCS%%share/doc/battleball/README
+%%PORTDOCS%%@dirrm share/doc/battleball
-- 
cgit v1.2.3