- Update to version 1.62.

- Remove USE_REINPLACE.
- Use USE_DOS2UNIX instead of custom post-extract target.
- Remove comments from do-install target.

Approved by:	garga (mentor)

4 files changed, 33 insertions, 51 deletions

diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index f16e8dff6525..f0863dcb3808 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	galaxyhack
-PORTVERSION=	1.55.2
+PORTVERSION=	1.62
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
-		${PORTNAME}-1.5-data${EXTRACT_SUFX}
+		${PORTNAME}-1.61-data${EXTRACT_SUFX}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	AI script based strategy game
@@ -22,43 +22,27 @@ LIB_DEPENDS=	boost_filesystem.3:${PORTSDIR}/devel/boost \
 WRKSRC=		${WRKDIR}/src
 
 USE_BZIP2=	yes
+USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
 USE_SDL=	gfx image mixer sdl
-USE_REINPLACE=	yes
 
 OPTIONS=	OPTIMIZED_CFLAGS "Enable compilation optimizations" on
 
 ALL_TARGET=	${PORTNAME}
-
 SUB_FILES=	${PORTNAME}-sh
-
 DATADIRS=	graphics fleets music gamedata standardpictures
 
-post-extract:
-# Remove CVS directories
-	@${FIND} ${WRKDIR}/${PORTNAME} -type d -name CVS -print0 | \
-		${XARGS} -0 ${RM} -rf
-
-# Convert DOS text files to UNIX
-	@${FIND} -E ${WRKSRC} -type f -iregex "(.*Makefile.*|.*\.(cpp|h))" -print0 | \
-		${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//'
-
 do-install:
-# Script
-	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
-
-# Program
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec
-
-# Data
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/settings.dat ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/settings.dat ${DATADIR}
 .for d in ${DATADIRS}
-	@${CP} -R ${WRKDIR}/${PORTNAME}/${d} ${DATADIR}
+	${CP} -R ${WRKDIR}/${PORTNAME}/${d} ${DATADIR}
 .endfor
 
 post-install:
-# Fix permissions
+# Fix permissions.
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 	@${FIND} ${DATADIR} -type f -print0 | \
 		${XARGS} -0 ${CHMOD} ${SHAREMODE}
@@ -68,17 +52,12 @@ post-install:
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${OSVERSION} < 500000
-BROKEN=	"Does not compile on < 5.x"
+IGNORE=		does not compile on FreeBSD < 5.X
 .endif
 
-post-patch:
-# Fix Makefile
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \
-				${WRKSRC}/${MAKEFILE}
-
-# Enable/disable compilation optimizations
-.if !defined(WITH_OPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/${MAKEFILE}
+# Enable/disable compilation optimizations.
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+MAKE_ENV+=	OPTIMIZED_CFLAGS=-O3
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/galaxyhack/distinfo b/games/galaxyhack/distinfo
index 41dec2b5b891..4f6856296701 100644
--- a/games/galaxyhack/distinfo
+++ b/games/galaxyhack/distinfo
@@ -1,6 +1,6 @@
-MD5 (galaxyhack-1.55.2-src.tar.bz2) = 6f6e83ea38780809d5383d0d30f41926
-SHA256 (galaxyhack-1.55.2-src.tar.bz2) = 0b70494db605e38339c059ab2a70fc32bc51b1980ec554c6e6c3813c2ef0b3f1
-SIZE (galaxyhack-1.55.2-src.tar.bz2) = 75107
-MD5 (galaxyhack-1.5-data.tar.bz2) = 8848e5319c1fdcb3ccb62fe5dc1ab164
-SHA256 (galaxyhack-1.5-data.tar.bz2) = 328037ee7202538c6698f93d570ba6e0cf6cdc92c86e24f4354b03a226c271f0
-SIZE (galaxyhack-1.5-data.tar.bz2) = 9838488
+MD5 (galaxyhack-1.62-src.tar.bz2) = ac13d8ca6d33cea012c2f5cd3aa8e652
+SHA256 (galaxyhack-1.62-src.tar.bz2) = abd3bc7061c1df23e50f208956c3e0e05d444b3c1bf33c47982f8d141171fed7
+SIZE (galaxyhack-1.62-src.tar.bz2) = 77817
+MD5 (galaxyhack-1.61-data.tar.bz2) = b9e8736dd51be8729fdd7e8ebca6c8d0
+SHA256 (galaxyhack-1.61-data.tar.bz2) = df8b1887e2f8b71d1742a6dadd1e6fd25227a9fd56468f5ef1c5416ef03d4831
+SIZE (galaxyhack-1.61-data.tar.bz2) = 9837126
diff --git a/games/galaxyhack/files/patch-Makefile b/games/galaxyhack/files/patch-Makefile
index 2a9578abaec9..2c4f5ad25d3c 100644
--- a/games/galaxyhack/files/patch-Makefile
+++ b/games/galaxyhack/files/patch-Makefile
@@ -1,15 +1,20 @@
---- Makefile.orig	Sat May  7 05:50:48 2005
-+++ Makefile	Sun Oct  9 12:45:33 2005
-@@ -9,10 +9,9 @@
- INSTALL_DIR=/usr/local/share
- INSTALL_BIN_DIR=/usr/local/bin
+--- Makefile.orig	Thu Apr 13 19:11:17 2006
++++ Makefile	Thu Apr 13 19:15:06 2006
+@@ -6,13 +6,11 @@
+ # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
+ #
+ 
+-INSTALL_DIR=/usr/local/share
+-INSTALL_BIN_DIR=/usr/local/bin
++INSTALL_DIR=$(PREFIX)/share
++INSTALL_BIN_DIR=$(PREFIX)/bin
  
 -CXX = g++
 -CXXFLAGS = $(shell sdl-config --cflags) -O3
-+CXXFLAGS = $(CFLAGS) -O3 $(shell sdl-config --cflags) $(shell freetype-config --cflags)
- DEFINES = -D__linux__
+-DEFINES = -D__linux__
 -LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem
-+LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem $(shell freetype-config --libs)
++CXXFLAGS = $(CFLAGS) $(OPTIMIZED_CFLAGS) $(shell $(SDL_CONFIG) --cflags)
++LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem $(shell freetype-config --libs)
  
  OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
  	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o Globals.o \
diff --git a/games/galaxyhack/pkg-plist b/games/galaxyhack/pkg-plist
index 5f8a1e746002..0e99346c095b 100644
--- a/games/galaxyhack/pkg-plist
+++ b/games/galaxyhack/pkg-plist
@@ -1,14 +1,11 @@
 bin/galaxyhack
 libexec/galaxyhack
-%%DATADIR%%/settings.dat
 %%DATADIR%%/fleets/Morennians/Moravator.dat
 %%DATADIR%%/fleets/Morennians/Morennian Corvette.dat
 %%DATADIR%%/fleets/Morennians/Morennians.dat
 %%DATADIR%%/fleets/Morennians/X-Fighter.dat
 %%DATADIR%%/fleets/Morennians/attackcapship.ai
 %%DATADIR%%/fleets/Morennians/moveandfire.ai
-%%DATADIR%%/fleets/Morennians/movetocapship.ai
-%%DATADIR%%/fleets/Morennians/movetoslow.ai
 %%DATADIR%%/fleets/Zenennians/Damascus.dat
 %%DATADIR%%/fleets/Zenennians/Emperor.dat
 %%DATADIR%%/fleets/Zenennians/Solar Cruiser.dat
@@ -47,6 +44,7 @@ libexec/galaxyhack
 %%DATADIR%%/music/11radsat.it
 %%DATADIR%%/music/corruptor.ogg
 %%DATADIR%%/music/fission.ogg
+%%DATADIR%%/settings.dat
 %%DATADIR%%/standardpictures/blue/capship/kasper-capital-1.png
 %%DATADIR%%/standardpictures/blue/capship/kasper-capital-2.png
 %%DATADIR%%/standardpictures/blue/capship/kasper-capital-3.png