From ab01754ae814671ecd2c5313a22166248dcf50cd Mon Sep 17 00:00:00 2001 From: vs Date: Fri, 29 Apr 2005 09:16:30 +0000 Subject: Use MAKE_ARGS & PLIST/PORTDOCS --- games/battleball/Makefile | 16 ++++++++++++---- games/battleball/files/patch-af | 25 ------------------------- games/battleball/pkg-plist | 4 ---- 3 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 games/battleball/files/patch-af delete mode 100644 games/battleball/pkg-plist (limited to 'games/battleball') diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 7ed92eb..2f4f8eb 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 @@ -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 1dc6604..0000000 --- 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 9b7b471..0000000 --- a/games/battleball/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/battleball -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit v1.1