Attachment #15983 for bug #29482

View | Details | Raw Unified | Return to bug 29482
Collapse All | Expand All




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} ${DOCSDIR}
.for file in CHANGELOG README
	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif





--- 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

Lines 1-4 Link Here

(-)battleball/pkg-plist (-3 / +3 lines)
1	bin/battleball	1	bin/battleball
2	share/doc/battleball/CHANGELOG	2	%%PORTDOCS%%share/doc/battleball/CHANGELOG
3	share/doc/battleball/README	3	%%PORTDOCS%%share/doc/battleball/README
4	@dirrm share/doc/battleball	4	%%PORTDOCS%%@dirrm share/doc/battleball

Return to bug 29482

Lines 17-31 Link Here

(-)battleball/Makefile (-2 / +4 lines)
17	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
18	USE_MESA= yes	18	USE_MESA= yes
19	WRKSRC= ${WRKDIR}/battleball-2.1-src	19	WRKSRC= ${WRKDIR}/battleball-2.1-src
		20	MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \
		21	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
20		22
21	do-install:	23	do-install:
22	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin	24	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
23		25
24	post-install:	26	post-install:
25	.if !defined(NOPORTDOCS)	27	.if !defined(NOPORTDOCS)
26	@ ${MKDIR} ${PREFIX}/share/doc/battleball	28	@${MKDIR} ${DOCSDIR}
27	.for file in CHANGELOG README	29	.for file in CHANGELOG README
28	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/battleball	30	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
29	.endfor	31	.endfor
30	.endif	32	.endif
31		33

Lines 1-21 Link Here

(-)battleball/files/patch-af (-9 / +8 lines)
1	--- Makefile Thu Sep 2 22:25:18 1999	1	--- Makefile.orig Thu Sep 2 22:25:18 1999
2	+++ Makefile.new Sun Apr 16 17:28:19 2000	2	+++ Makefile Mon Aug 6 00:46:04 2001
3	@@ -1,17 +1,18 @@	3	@@ -1,17 +1,14 @@
4	-CXX = g++	4	-CXX = g++
5	+CXX ?= c++	5	-
6
7	# If you don't have OpenGL or Mesa, you can still compile BattleBall;	6	# If you don't have OpenGL or Mesa, you can still compile BattleBall;
8	# just define the symbol NO_OPENGL when compiling, and don't link with	7	# just define the symbol NO_OPENGL when compiling, and don't link with
9	# $(GLLIBS) when linking	8	# $(GLLIBS) when linking
10	-CXXFLAGS = -O2 -funroll-loops	9	-CXXFLAGS = -O2 -funroll-loops
11	+CXXFLAGS ?= -O -pipe	10	-#CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL
12	#CXXFLAGS = -O2 -funroll-loops -DNO_OPENGL	11	+CXXFLAGS += ${PTHREAD_CFLAGS}
13		12
14	INCS = -Ibsp -Ilib3d	13	INCS = -Ibsp -Ilib3d
15	-XLIBS = -L/usr/X11R6/lib -lX11	14	-XLIBS = -L/usr/X11R6/lib -lX11
16	+X11BASE ?=/usr/X11R6	15	-LIBS = -lm $(XLIBS)
17	+XLIBS = -L$(X11BASE)/lib -lX11	16	+XLIBS = -L$(X11BASE)/lib -lX11
18	LIBS = -lm $(XLIBS)	17	+LIBS = -lm $(XLIBS) ${PTHREAD_LIBS}
19		18
20	-GLINCS = -I/usr/local/X11/include	19	-GLINCS = -I/usr/local/X11/include
21	-GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL	20	-GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL