***

       games/affenspiel
       - Support CC properly
       ***
       games/battalion
       - Support PREFIX properly
       ***
       games/block
       - Support CC/CFLAGS properly
       ***
       games/blue
       - Support CC/CFLAGS properly
       - Add WWW: line into pkg/DESCR

       New file:
       patches/patch-aa
       ***
       games/bs
       - Add WWW: line into pkg/DESCR
       ***
       games/columns
       - Support CXXFLAGS properly
       - Support sdl-config
       ***
       games/empire
       - Exclude GPL doc from package
       - Add WWW: line into pkg/DESCR
       ***
       games/freesweep to 0.87
       - Update to version 0.87
       ***
       games/galaxis
       - Support CC properly
       - Add WWW: line into pkg/DESCR
       ***
       games/garith
       - Support CC/CFLAGS properly
       - Support GTK_CONFIG
       ***
       games/gemdropx to 0.7
       - Update to version 0.7
       ***
       games/gtkballs
       - Exclude GPL doc from package
       - Support GTK_CONFIG
       ***
       games/icbm3d
       - Update WWW: line of pkg/DESCR
       ***
       games/mirrormagic
       - Support CC/X11BASE properly
       ***
       games/phalanx to 22
       - Update to version 22
       - Add WWW: line into pkg/DESCR
       ***
       games/spellcast
       - Update MASTER_SITES and WWW: line of pkg/DESCR
       - Support CFLAGS properly
       - Exclude GPL doc from package
       ***
       games/starlanes
       - Support CC properly
       - Exclude GPL doc from package
       ***
       games/xdigger to 1.0.10
       - Update to version 1.0.10

       New file:
       patches/patch-ad  patches/patch-ae
       ***
       games/xtron
       - Support PREFIX properly
       - Exclude GPL doc from package
       ***
       games/xtruco
       - Support CC/CFLAGS/X11BASE properly
       ***
       games/xvier
       - Support X11BASE properly
       ***

PR: 17741
Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>

4 files changed, 43 insertions, 36 deletions

diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index fc9ff1baf134..e456618a8666 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -13,43 +13,38 @@ DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3 \
-		GLU.14:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/battalionSource
 
 MAN6=		battalion.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/man/man6/battalion.6
-	@ ${MKDIR} ${PREFIX}/share/battalion
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion
-	@ ${MKDIR} ${PREFIX}/share/battalion/DATA
-.for file in road tank tree
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/${file}.data ${PREFIX}/share/battalion/DATA
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/MUSIC
-.for file in 1 2 3 4 5 d1 d2 d3 d4 d5
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/${file}.au ${PREFIX}/share/battalion/MUSIC
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/SOUNDS
-.for file in beam boom crash monsterbeam rocket slag tank tech
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/${file}.au ${PREFIX}/share/battalion/SOUNDS
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/TEXTURES
-.for file in road screenleft screenright treewood
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/${file}.tex ${PREFIX}/share/battalion/TEXTURES
-.endfor
-
+	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \
+		${PREFIX}/man/man6/battalion.6
+	@${MKDIR} ${PREFIX}/share/battalion
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \
+		${PREFIX}/share/battalion
+	@${MKDIR} ${PREFIX}/share/battalion/DATA
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/*.data \
+		${PREFIX}/share/battalion/DATA
+	@${MKDIR} ${PREFIX}/share/battalion/MUSIC
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/*.au \
+		${PREFIX}/share/battalion/MUSIC
+	@${MKDIR} ${PREFIX}/share/battalion/SOUNDS
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/*.au \
+		${PREFIX}/share/battalion/SOUNDS
+	@${MKDIR} ${PREFIX}/share/battalion/TEXTURES
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/*.tex \
+		${PREFIX}/share/battalion/TEXTURES
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/battalion
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/battalion
-.for file in 01 02 03 04 05 06 07 08 09 10 11
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/bathelp${file}.gif ${PREFIX}/share/doc/battalion
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/battalion
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/battalion
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif \
+		${PREFIX}/share/doc/battalion
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/battalion/files/patch-aa b/games/battalion/files/patch-aa
index efebb49826d4..d6684ec366d9 100644
--- a/games/battalion/files/patch-aa
+++ b/games/battalion/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	Thu Jan 16 16:31:58 1997
-+++ /home/andy/tmp/wrk/Makefile	Sun May 17 15:46:52 1998
+--- Makefile.orig	Thu Jan 16 16:31:58 1997
++++ Makefile	Wed Mar 29 13:08:11 1998
 @@ -23,7 +23,7 @@
  # (the program should compile with no warning messages - if you
  #  see a warning message please let me know about it)
@@ -46,7 +46,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${X11BASE}/include
++CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
  
  
  # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
@@ -55,7 +55,7 @@
  
  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/usr/X11R6/lib -lm -lX11 -lXext -lcompat
++LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
  
  all:	$(TARGET)
  
diff --git a/games/battalion/files/patch-ab b/games/battalion/files/patch-ab
index 8e702743f9bd..2cf03af86541 100644
--- a/games/battalion/files/patch-ab
+++ b/games/battalion/files/patch-ab
@@ -1,12 +1,12 @@
---- battalion.c	Thu Jan 16 16:31:59 1997
-+++ /home/andy/tmp/wrk/battalion.c	Sun May 17 15:46:57 1998
+--- 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 = "/usr/X11R6/share/battalion";
++    dataPtr = PREFIX "/share/battalion";
      if (dataPtr != NULL)
  	{
  	strcpy(dataPath, dataPtr);
diff --git a/games/battalion/files/patch-ac b/games/battalion/files/patch-ac
new file mode 100644
index 000000000000..add8c0d83324
--- /dev/null
+++ b/games/battalion/files/patch-ac
@@ -0,0 +1,12 @@
+--- 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
+