Attachment #119199 for bug #161659

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

Lines 6-53 Link Here

(-)games/battalion/Makefile (-28 / +38 lines)
6	#	6	#
7		7
8	PORTNAME= battalion	8	PORTNAME= battalion
9	PORTVERSION= 1.4	9	PORTVERSION= 1.4b
10	PORTREVISION= 3
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.evl.uic.edu/aej/BATTALION/	11	MASTER_SITES= http://www.evl.uic.edu/aej/BATTALION/
13	DISTFILES= battalionSource1.4.tar.Z battalionSUN4.tar.gz	12	DISTNAME= ${PORTNAME}${PORTVERSION}
		13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} battalionSUN4.tar.gz
		14	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14		15
15	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Monsters, explosions, destruction game for X Window System	17	COMMENT= Monsters, explosions, destruction game for X Window System
17		18
18	WRKSRC= ${WRKDIR}/battalionSource	19	USE_BZIP2= yes
19		20	USE_GL= glu
20	ALL_TARGET= # empty	21	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LIBS="${LDFLAGS}"
21	USE_GL= glu gl	22	MAKE_JOBS_SAFE= yes
22	MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	23
23	PTHREAD_LIBS="${PTHREAD_LIBS}"	24	CFLAGS+= -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \
		25	-DLINUXVERSION -DLINUXAUDIO
		26	LDFLAGS= -L${LOCALBASE}/lib
24		27
25	MAN6= battalion.6	28	MAN6= battalion.6
26		29
		30	post-extract:
		31	@${GZCAT} ${DISTDIR}/battalionSUN4.tar.gz \| \
		32	(cd ${WRKDIR} && ${TAR} --unlink -xf -)
		33	@${RM} -f ${WRKSRC}/*.o
		34
		35	post-patch:
		36	@${REINPLACE_CMD} -e \
		37	'/dataPtr/s\| = getenv.*\| = "${DATADIR}";\|' ${WRKSRC}/battalion.c
		38	@${REINPLACE_CMD} -e \
		39	's\|<malloc\.h>\|<stdlib.h>\| ; \
		40	s\|<linux/soundcard\.h>\|<sys/soundcard.h>\|' ${WRKSRC}/soundIt.c
		41
27	do-install:	42	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin	43	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
29	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \	44	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \
30	${PREFIX}/man/man6/battalion.6	45	${MAN6PREFIX}/man/man6/battalion.6
31	@${MKDIR} ${PREFIX}/share/battalion	46	@${MKDIR} ${DATADIR}
32	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \	47	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \
33	${PREFIX}/share/battalion	48	${DATADIR}
34	@${MKDIR} ${PREFIX}/share/battalion/DATA	49	@${MKDIR} ${DATADIR}/DATA
35	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/*.data \	50	${INSTALL_DATA} ${WRKSRC}/DATA/*.data ${DATADIR}/DATA
36	${PREFIX}/share/battalion/DATA	51	@${MKDIR} ${DATADIR}/MUSIC
37	@${MKDIR} ${PREFIX}/share/battalion/MUSIC	52	${INSTALL_DATA} ${WRKSRC}/MUSIC/*.au ${DATADIR}/MUSIC
38	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/*.au \	53	@${MKDIR} ${DATADIR}/SOUNDS
39	${PREFIX}/share/battalion/MUSIC	54	${INSTALL_DATA} ${WRKSRC}/SOUNDS/*.au ${DATADIR}/SOUNDS
40	@${MKDIR} ${PREFIX}/share/battalion/SOUNDS	55	@${MKDIR} ${DATADIR}/TEXTURES
41	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/*.au \	56	${INSTALL_DATA} ${WRKSRC}/TEXTURES/*.tex ${DATADIR}/TEXTURES
42	${PREFIX}/share/battalion/SOUNDS
43	@${MKDIR} ${PREFIX}/share/battalion/TEXTURES
44	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/*.tex \
45	${PREFIX}/share/battalion/TEXTURES
46	.if !defined(NOPORTDOCS)	57	.if !defined(NOPORTDOCS)
47	@${MKDIR} ${PREFIX}/share/doc/battalion	58	@${MKDIR} ${DOCSDIR}
48	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/battalion	59	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
49	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif \	60	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif ${DOCSDIR}
50	${PREFIX}/share/doc/battalion
51	.endif	61	.endif
52		62
53	.include <bsd.port.mk>	63	.include <bsd.port.mk>

Lines 1-4 Link Here

(-)games/battalion/distinfo (-2 / +2 lines)
1	SHA256 (battalionSource1.4.tar.Z) = 2a8871b990dfe69df5a9d3af7f97c8cf12aa0b357ff9b0dc86e8573965e06889	1	SHA256 (battalion1.4b.tar.bz2) = f9506f8fbb544a77373e01f8bda93ac339433b0ea84296fe0c287f2bf37bf8b3
2	SIZE (battalionSource1.4.tar.Z) = 186221	2	SIZE (battalion1.4b.tar.bz2) = 1103031
3	SHA256 (battalionSUN4.tar.gz) = b805518e773095aa747cff62dd9f193ca8293743e6636f3e2f3a283fb6d8afd2	3	SHA256 (battalionSUN4.tar.gz) = b805518e773095aa747cff62dd9f193ca8293743e6636f3e2f3a283fb6d8afd2
4	SIZE (battalionSUN4.tar.gz) = 1593265	4	SIZE (battalionSUN4.tar.gz) = 1593265




--- Makefile.orig	Thu Jan 16 08:31:58 1997
+++ Makefile	Thu Nov  6 14:56:38 2003
@@ -23,7 +23,7 @@
 # (the program should compile with no warning messages - if you
 #  see a warning message please let me know about it)
 # ------------------------------------------------------------
-CC = CC
+#CC = CC
 
 
 # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
@@ -51,9 +51,9 @@
 #         with the other Makefile.)
 #
 # ------------------------------------------------------------
-OS = -DSGIVERSION
+#OS = -DSGIVERSION
 # or
-#OS = -DSUNVERSION
+OS = -DSUNVERSION
 # or
 #OS = -DLINUXVERSION
 # or
@@ -77,8 +77,8 @@
 # in audio.c then everything works fine.
 #
 # ------------------------------------------------------------
-AUDIOLIB = -laudio -laudiofile
-AUDIODEF = -DSGIAUDIO
+#AUDIOLIB = -laudio -laudiofile
+#AUDIODEF = -DSGIAUDIO
 
 
 # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
@@ -91,7 +91,7 @@
 
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
 # ------------------------------------------------------------
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
+CFLAGS+= -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\"
 
 
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
@@ -106,12 +106,12 @@
 TARGET 	= battalion
 
 OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
+LIBS    = -L./. -L${LOCALBASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS)
 
 all:	$(TARGET)
 
 $(OBJ): $(?:.o=.c)
-	$(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
+	$(CC) $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
 
 $(TARGET): $(OBJ)
 	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)




--- battalion.c.orig	Thu Jan 16 16:31:59 1997
+++ battalion.c	Wed Mar 29 13:10:21 1998
@@ -2867,7 +2867,8 @@
 	roadFile = fopen(fullPath, "rb");	
 #else
 
-    dataPtr = getenv("BATTALIONDATADIR");
+/*    dataPtr = getenv("BATTALIONDATADIR"); */
+    dataPtr = PREFIX "/share/battalion";
     if (dataPtr != NULL)
 	{
 	strcpy(dataPath, dataPtr);




--- battalion.h.orig	Fri Jan 17 01:31:59 1997
+++ battalion.h	Sat Apr  1 00:37:23 2000
@@ -59,7 +59,9 @@
 #endif
 
 #ifndef MACVERSION
+#ifndef __STDC__
 #include <malloc.h>
+#endif
 #include <pwd.h>
 #endif
 




bin/battalion
%%DATADIR%%/battalion.sho
%%DATADIR%%/DATA/road.data
%%DATADIR%%/DATA/tank.data
%%DATADIR%%/DATA/tree.data
%%DATADIR%%/MUSIC/1.au
%%DATADIR%%/MUSIC/2.au
%%DATADIR%%/SOUNDS/beam.au
%%DATADIR%%/SOUNDS/boom.au
%%DATADIR%%/SOUNDS/crash.au
%%DATADIR%%/SOUNDS/monsterbeam.au
%%DATADIR%%/SOUNDS/rocket.au
%%DATADIR%%/SOUNDS/slag.au
%%DATADIR%%/SOUNDS/tank.au
%%DATADIR%%/SOUNDS/tech.au
%%DATADIR%%/TEXTURES/road.tex
%%DATADIR%%/TEXTURES/screenleft.tex
%%DATADIR%%/TEXTURES/screenright.tex
%%DATADIR%%/TEXTURES/treewood.tex
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/bathelp01.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp02.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp03.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp04.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp05.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp06.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp07.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp08.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp09.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp10.gif
%%PORTDOCS%%%%DOCSDIR%%/bathelp11.gif
@dirrm %%DATADIR%%/MUSIC
@dirrm %%DATADIR%%/SOUNDS
@dirrm %%DATADIR%%/TEXTURES
@dirrm %%DATADIR%%/DATA
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%share/doc/battalion/bathelp10.gif
%%PORTDOCS%%share/doc/battalion/bathelp11.gif
@dirrm share/battalion/DATA
@dirrm share/battalion/MUSIC
@dirrm share/battalion/SOUNDS
@dirrm share/battalion/TEXTURES
@dirrm share/battalion
%%PORTDOCS%%@dirrm share/doc/battalion

Return to bug 161659

Lines 1-58 Link Here

(-)games/battalion/files/patch-aa (-58 lines)
1	--- Makefile.orig Thu Jan 16 08:31:58 1997
2	+++ Makefile Thu Nov 6 14:56:38 2003
3	@@ -23,7 +23,7 @@
4	# (the program should compile with no warning messages - if you
5	# see a warning message please let me know about it)
6	# ------------------------------------------------------------
7	-CC = CC
8	+#CC = CC
9
10
11	# STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
12	@@ -51,9 +51,9 @@
13	# with the other Makefile.)
14	#
15	# ------------------------------------------------------------
16	-OS = -DSGIVERSION
17	+#OS = -DSGIVERSION
18	# or
19	-#OS = -DSUNVERSION
20	+OS = -DSUNVERSION
21	# or
22	#OS = -DLINUXVERSION
23	# or
24	@@ -77,8 +77,8 @@
25	# in audio.c then everything works fine.
26	#
27	# ------------------------------------------------------------
28	-AUDIOLIB = -laudio -laudiofile
29	-AUDIODEF = -DSGIAUDIO
30	+#AUDIOLIB = -laudio -laudiofile
31	+#AUDIODEF = -DSGIAUDIO
32
33
34	# STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
35	@@ -91,7 +91,7 @@
36
37	# STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
38	# ------------------------------------------------------------
39	-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
40	+CFLAGS+= -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\"
41
42
43	# STEP 8: ADD ANY SPECIAL LIBRARY PATHS
44	@@ -106,12 +106,12 @@
45	TARGET = battalion
46
47	OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
48	-LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
49	+LIBS = -L./. -L${LOCALBASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS)
50
51	all: $(TARGET)
52
53	$(OBJ): $(?:.o=.c)
54	- $(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
55	+ $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $?
56
57	$(TARGET): $(OBJ)
58	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)

Lines 1-12 Link Here

(-)games/battalion/files/patch-ab (-12 lines)
1	--- battalion.c.orig Thu Jan 16 16:31:59 1997
2	+++ battalion.c Wed Mar 29 13:10:21 1998
3	@@ -2867,7 +2867,8 @@
4	roadFile = fopen(fullPath, "rb");
5	#else
6
7	- dataPtr = getenv("BATTALIONDATADIR");
8	+/* dataPtr = getenv("BATTALIONDATADIR"); */
9	+ dataPtr = PREFIX "/share/battalion";
10	if (dataPtr != NULL)
11	{
12	strcpy(dataPath, dataPtr);

Lines 1-12 Link Here

(-)games/battalion/files/patch-ac (-12 lines)
1	--- battalion.h.orig Fri Jan 17 01:31:59 1997
2	+++ battalion.h Sat Apr 1 00:37:23 2000
3	@@ -59,7 +59,9 @@
4	#endif
5
6	#ifndef MACVERSION
7	+#ifndef __STDC__
8	#include <malloc.h>
9	+#endif
10	#include <pwd.h>
11	#endif
12

Lines 1-45 Link Here

(-)games/battalion/pkg-plist (-44 / +36 lines)
1	bin/battalion	1	bin/battalion
2	share/battalion/battalion.sho	2	%%DATADIR%%/battalion.sho
3	share/battalion/DATA/road.data	3	%%DATADIR%%/DATA/road.data
4	share/battalion/DATA/tank.data	4	%%DATADIR%%/DATA/tank.data
5	share/battalion/DATA/tree.data	5	%%DATADIR%%/DATA/tree.data
6	share/battalion/MUSIC/1.au	6	%%DATADIR%%/MUSIC/1.au
7	share/battalion/MUSIC/2.au	7	%%DATADIR%%/MUSIC/2.au
8	share/battalion/MUSIC/3.au	8	%%DATADIR%%/SOUNDS/beam.au
9	share/battalion/MUSIC/4.au	9	%%DATADIR%%/SOUNDS/boom.au
10	share/battalion/MUSIC/5.au	10	%%DATADIR%%/SOUNDS/crash.au
11	share/battalion/MUSIC/d1.au	11	%%DATADIR%%/SOUNDS/monsterbeam.au
12	share/battalion/MUSIC/d2.au	12	%%DATADIR%%/SOUNDS/rocket.au
13	share/battalion/MUSIC/d3.au	13	%%DATADIR%%/SOUNDS/slag.au
14	share/battalion/MUSIC/d4.au	14	%%DATADIR%%/SOUNDS/tank.au
15	share/battalion/MUSIC/d5.au	15	%%DATADIR%%/SOUNDS/tech.au
16	share/battalion/SOUNDS/beam.au	16	%%DATADIR%%/TEXTURES/road.tex
17	share/battalion/SOUNDS/boom.au	17	%%DATADIR%%/TEXTURES/screenleft.tex
18	share/battalion/SOUNDS/crash.au	18	%%DATADIR%%/TEXTURES/screenright.tex
19	share/battalion/SOUNDS/monsterbeam.au	19	%%DATADIR%%/TEXTURES/treewood.tex
20	share/battalion/SOUNDS/rocket.au	20	%%PORTDOCS%%%%DOCSDIR%%/README
21	share/battalion/SOUNDS/slag.au	21	%%PORTDOCS%%%%DOCSDIR%%/bathelp01.gif
22	share/battalion/SOUNDS/tank.au	22	%%PORTDOCS%%%%DOCSDIR%%/bathelp02.gif
23	share/battalion/SOUNDS/tech.au	23	%%PORTDOCS%%%%DOCSDIR%%/bathelp03.gif
24	share/battalion/TEXTURES/road.tex	24	%%PORTDOCS%%%%DOCSDIR%%/bathelp04.gif
25	share/battalion/TEXTURES/screenleft.tex	25	%%PORTDOCS%%%%DOCSDIR%%/bathelp05.gif
26	share/battalion/TEXTURES/screenright.tex	26	%%PORTDOCS%%%%DOCSDIR%%/bathelp06.gif
27	share/battalion/TEXTURES/treewood.tex	27	%%PORTDOCS%%%%DOCSDIR%%/bathelp07.gif
28	%%PORTDOCS%%share/doc/battalion/README	28	%%PORTDOCS%%%%DOCSDIR%%/bathelp08.gif
29	%%PORTDOCS%%share/doc/battalion/bathelp01.gif	29	%%PORTDOCS%%%%DOCSDIR%%/bathelp09.gif
30	%%PORTDOCS%%share/doc/battalion/bathelp02.gif	30	%%PORTDOCS%%%%DOCSDIR%%/bathelp10.gif
31	%%PORTDOCS%%share/doc/battalion/bathelp03.gif	31	%%PORTDOCS%%%%DOCSDIR%%/bathelp11.gif
32	%%PORTDOCS%%share/doc/battalion/bathelp04.gif	32	@dirrm %%DATADIR%%/MUSIC
33	%%PORTDOCS%%share/doc/battalion/bathelp05.gif	33	@dirrm %%DATADIR%%/SOUNDS
34	%%PORTDOCS%%share/doc/battalion/bathelp06.gif	34	@dirrm %%DATADIR%%/TEXTURES
35	%%PORTDOCS%%share/doc/battalion/bathelp07.gif	35	@dirrm %%DATADIR%%/DATA
36	%%PORTDOCS%%share/doc/battalion/bathelp08.gif	36	@dirrm %%DATADIR%%
37	%%PORTDOCS%%share/doc/battalion/bathelp09.gif	37	%%PORTDOCS%%@dirrm %%DOCSDIR%%
38	%%PORTDOCS%%share/doc/battalion/bathelp10.gif
39	%%PORTDOCS%%share/doc/battalion/bathelp11.gif
40	@dirrm share/battalion/DATA
41	@dirrm share/battalion/MUSIC
42	@dirrm share/battalion/SOUNDS
43	@dirrm share/battalion/TEXTURES
44	@dirrm share/battalion
45	%%PORTDOCS%%@dirrm share/doc/battalion