aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-04-29 17:16:30 +0800
committervs <vs@FreeBSD.org>2005-04-29 17:16:30 +0800
commitab01754ae814671ecd2c5313a22166248dcf50cd (patch)
tree43093e40b9a484e79e3b9eeba5a424542e2cbc51
parent3035bd51bfa3d856396020051a91443f28db6da8 (diff)
downloadfreebsd-ports-gnome-ab01754ae814671ecd2c5313a22166248dcf50cd.tar.gz
freebsd-ports-gnome-ab01754ae814671ecd2c5313a22166248dcf50cd.tar.zst
freebsd-ports-gnome-ab01754ae814671ecd2c5313a22166248dcf50cd.zip
Use MAKE_ARGS & PLIST/PORTDOCS
-rw-r--r--games/battleball/Makefile16
-rw-r--r--games/battleball/files/patch-af25
-rw-r--r--games/battleball/pkg-plist4
3 files changed, 12 insertions, 33 deletions
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 7ed92eb60877..2f4f8ebf99c9 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -17,9 +17,17 @@ COMMENT= 3D single/multiplayer military soccer game for X Window System
USE_X_PREFIX= yes
USE_GL= yes
WRKSRC= ${WRKDIR}/battleball-2.1-src
-MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
- PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-CFLAGS+= -Wno-deprecated
+CFLAGS+= -Wno-deprecated ${PTHREAD_CFLAGS}
+MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+ XLIBS="-L${X11BASE}/lib -lX11" \
+ LIBS="-lm ${XLIBS} ${PTHREAD_LIBS}" \
+ GLINCS="-I${X11BASE}/include" \
+ GLLIBS="-lXi -lXmu -lXext -L${X11BASE}/lib -lGL"
+
+PLIST_FILES= bin/battleball
+.if !defined(NOPORTDOCS)
+PORTDOCS= CHANGELOG README
+.endif
.include <bsd.port.pre.mk>
@@ -33,7 +41,7 @@ do-install:
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG README
+.for file in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
diff --git a/games/battleball/files/patch-af b/games/battleball/files/patch-af
deleted file mode 100644
index 1dc6604a8ba9..000000000000
--- a/games/battleball/files/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.orig Thu Sep 2 22:25:18 1999
-+++ Makefile Mon Aug 6 00:46:04 2001
-@@ -1,17 +1,14 @@
--CXX = g++
--
- # 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 = -O2 -funroll-loops -DNO_OPENGL
-+CXXFLAGS += ${PTHREAD_CFLAGS}
-
- INCS = -Ibsp -Ilib3d
--XLIBS = -L/usr/X11R6/lib -lX11
--LIBS = -lm $(XLIBS)
-+XLIBS = -L$(X11BASE)/lib -lX11
-+LIBS = -lm $(XLIBS) ${PTHREAD_LIBS}
-
--GLINCS = -I/usr/local/X11/include
--GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL
-+GLINCS = -I$(X11BASE)/include
-+GLLIBS = -lXi -lXmu -lXext -L$(X11BASE)/lib -lGL
- #GLLIBS =
-
- BSPOBJS = bsp/brep.o bsp/bsp.o bsp/polygon.o
diff --git a/games/battleball/pkg-plist b/games/battleball/pkg-plist
deleted file mode 100644
index 9b7b471802da..000000000000
--- a/games/battleball/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/battleball
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%