***

       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>

2 files changed, 31 insertions, 27 deletions

diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 53425d8a240c..a7e9f77ffbf4 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -6,37 +6,37 @@
 # $FreeBSD$
 #
 
-DISTNAME=		mirrormagic-1.3
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+DISTNAME=	mirrormagic-1.3
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_X_PREFIX=		yes
+USE_X_PREFIX=	yes
 
-pre-build:
+post-extract:
 .for file in DoubleRayDoor DoubleRayFont DoubleRayFont2 DoubleRayScreen
-	@ ${GUNZIP_CMD} ${WRKSRC}/graphics/${file}.xpm
+	@${GUNZIP_CMD} ${WRKSRC}/graphics/${file}.xpm
 .endfor
-	@ (cd ${WRKDIR}; ${CP} ${FILESDIR}/RAY.* .; uudecode *.uu; ${RM} *.uu)
+	@(cd ${WRKDIR}; ${CP} ${FILESDIR}/RAY.* .; uudecode *.uu; ${RM} *.uu)
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/graphics
-	@ ${INSTALL_DATA} ${WRKSRC}/graphics/* ${PREFIX}/share/mirrormagic/graphics
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/sounds
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/*.8svx ${PREFIX}/share/mirrormagic/sounds
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/data
-	@ ${INSTALL_DATA} ${WRKSRC}/RAY.level ${PREFIX}/share/mirrormagic/data
-	@ ${INSTALL_DATA} ${WRKDIR}/RAY.* ${PREFIX}/share/mirrormagic/data
-	@ ${MKDIR} ${PREFIX}/share/doc/mirrormagic
+	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/mirrormagic/graphics
+	${INSTALL_DATA} ${WRKSRC}/graphics/* ${PREFIX}/share/mirrormagic/graphics
+	@${MKDIR} ${PREFIX}/share/mirrormagic/sounds
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.8svx ${PREFIX}/share/mirrormagic/sounds
+	@${MKDIR} ${PREFIX}/share/mirrormagic/data
+	${INSTALL_DATA} ${WRKSRC}/RAY.level ${PREFIX}/share/mirrormagic/data
+	${INSTALL_DATA} ${WRKDIR}/RAY.* ${PREFIX}/share/mirrormagic/data
+	@${MKDIR} ${PREFIX}/share/doc/mirrormagic
 .for file in CHANGES COPYRIGHT DISCLAIMER README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mirrormagic
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mirrormagic
 .endfor
-#	@ ${CHMOD} a=rwx ${PREFIX}/share/mirrormagic/data
-	@ ${CHMOD} a=rw  ${PREFIX}/share/mirrormagic/data/RAY.*
+#	@${CHMOD} a=rwx ${PREFIX}/share/mirrormagic/data
+	@${CHMOD} a=rw  ${PREFIX}/share/mirrormagic/data/RAY.*
 
 .include <bsd.port.mk>
diff --git a/games/mirrormagic/files/patch-aa b/games/mirrormagic/files/patch-aa
index ddcc59f7d645..9ef3d983f05f 100644
--- a/games/mirrormagic/files/patch-aa
+++ b/games/mirrormagic/files/patch-aa
@@ -1,7 +1,11 @@
---- Makefile	Wed Sep  6 11:56:17 1995
-+++ /home/andy/tmp/wrk/Makefile	Tue Mar 31 23:07:25 1998
-@@ -8,11 +8,17 @@
- CC = gcc
+--- Makefile.orig	Wed Sep  6 20:56:17 1995
++++ Makefile	Thu Mar 30 01:11:44 2000
+@@ -5,14 +5,20 @@
+ PROGNAME = mirrormagic
+ 
+ RM = rm -f
+-CC = gcc
++CC ?= gcc
  # CC = cc				# for HP-UX and others
  
 -GFX_PATH = -DGFX_PATH=\"./graphics\"	# path where the graphics are
@@ -37,8 +41,8 @@
  # LIBS = -lXpm -lX11 -lm
  # LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm # for HP-UX and others
 -LIBS = -lXpm -lXpm -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
-+INCL = -I/usr/X11R6/include
-+LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
++INCL = -I${X11BASE}/include
++LIBS = -L${X11BASE}/lib -lXpm -lX11 -lm
  
  # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 -CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)