17 files changed, 19 insertions, 50 deletions

diff --git a/games/daimonin-music/Makefile b/games/daimonin-music/Makefile
index 45452d136c05..af7c07e281ef 100644
--- a/games/daimonin-music/Makefile
+++ b/games/daimonin-music/Makefile
@@ -12,20 +12,18 @@ DIST_SUBDIR=	daimonin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music for daimonin client
 
-NO_BUILD=	true
-USES=		zip:infozip
+NO_BUILD=	yes
+USES=		zip
 NO_ARCH=	yes
 
 MYDATADIR=	${PREFIX}/share/daimonin
 
-EXTRACT_BEFORE_ARGS=	-aqo
-
 post-extract:
 	@${MV} ${WRKDIR}/media/media.txt ${WRKDIR}/media/media-music.txt
 	@${RM} -f ${WRKDIR}/media/orchestral.ogg
 
 do-install:
-	${MKDIR} ${STAGEDIR}${MYDATADIR}
-	cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/
+	@${MKDIR} ${STAGEDIR}${MYDATADIR}
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/)
 
 .include <bsd.port.mk>
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index 198083319cd3..cc475d147272 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Dungeon Master Java is a remake of the classic Dungeon Master by FTL
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=		zip:infozip
+USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/games/doom-data/Makefile.include b/games/doom-data/Makefile.include
index 5a14b1879f5e..94aaa17126fa 100644
--- a/games/doom-data/Makefile.include
+++ b/games/doom-data/Makefile.include
@@ -14,15 +14,3 @@ SUB_LIST+=	DMDIR="${DMDIR}"
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${DMDIR}:${PORTSDIR}/games/doom-data
 .endif
-
-.if defined(USE_CRLF)
-.   if defined(USE_ZIP)
-EXTRACT_BEFORE_ARGS=	-aqo
-.   else
-pre-patch:
-	@${FIND} ${WRKDIR} -type f -print0 | \
-		${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
-		${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
-		${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
-.   endif
-.endif
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index 3ab413845f2d..6f230e8b587f 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-iwad-${PORTVERSION}
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Complete Doom-based game IWAD that is Free Software
 
-USES=		zip:infozip
+USES=		zip
 NO_BUILD=	yes
 
 DATADIR=	${DMDIR}/${PORTNAME}
diff --git a/games/doom-hr/Makefile b/games/doom-hr/Makefile
index 7e289354b639..61c65460c4c6 100644
--- a/games/doom-hr/Makefile
+++ b/games/doom-hr/Makefile
@@ -17,9 +17,10 @@ DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hell Revealed is a megawad, a 32-level replacement for DooM II
 
-USES=		zip:infozip
+USES=		zip
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+EXTRACT_BEFORE_ARGS=	-Lqo
 
 OPTIONS_DEFINE=	DEMO_NM DEMO_UV DOCS
 OPTIONS_DEFAULT=	DEMO_NM DEMO_UV
@@ -33,9 +34,6 @@ DATADIR=	${DMDIR}/${PORTNAME}
 DEMO_NM_DISTFILES=	hrhelp${EXTRACT_SUFX}
 DEMO_UV_DISTFILES=	hruvlmp2${EXTRACT_SUFX}
 
-post-extract:
-	@(cd ${WRKDIR} && ${SH} ${SCRIPTDIR}/lowercase.sh)
-
 .include "${.CURDIR}/../doom-data/Makefile.include"
 
 .include <bsd.port.options.mk>
diff --git a/games/doom-hr/scripts/lowercase.sh b/games/doom-hr/scripts/lowercase.sh
deleted file mode 100644
index 0a61219d046d..000000000000
--- a/games/doom-hr/scripts/lowercase.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-for x in *; do
-	y=`echo $x | tr '[A-Z]' '[a-z]'`
-	if [ $x != $y ]; then
-		mv $x $y
-	fi
-done
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index 9f67df56f3a8..8ab6ae8449b5 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -58,7 +58,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-data
 
 NO_BUILD=	yes
-USES=		zip:infozip
+USES=		zip
 WRKSRC=	${WRKDIR}/fgaircraft
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 DATADIR=	${PREFIX}/share/flightgear/Aircraft
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index 4a041d5d47e1..ccd514b71960 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/flightgear/version:${PORTSDIR}/games/flightgear-
 RESTRICTED=	Redistribution prohibited
 
 NO_BUILD=	yes
-USES=		zip:infozip
+USES=		zip
 WRKSRC=	${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 DATADIR=	${PREFIX}/share/flightgear/Aircraft
diff --git a/games/freedoko/Makefile b/games/freedoko/Makefile
index bf94b8443ae1..f02d2178a028 100644
--- a/games/freedoko/Makefile
+++ b/games/freedoko/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgnet-2.0.so:${PORTSDIR}/net/gnet2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/\.src$//}/src
 
-USES=		gmake pkgconfig zip:infozip
+USES=		gmake pkgconfig zip
 USE_GNOME=	gtkmm24
 MAKE_ENV=	OS="${OPSYS}" DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
 
diff --git a/games/glest/Makefile b/games/glest/Makefile
index 3788c937bfdf..554018571226 100644
--- a/games/glest/Makefile
+++ b/games/glest/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 RUN_DEPENDS=	${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data
 
-USES=		dos2unix openal:al,alut pkgconfig zip:infozip lua:51
+USES=		dos2unix openal:al,alut pkgconfig zip lua:51
 USE_AUTOTOOLS=	automake:env autoconf:env
 USE_SDL=	yes
 USE_GL=		yes
diff --git a/games/hlstatsx/Makefile b/games/hlstatsx/Makefile
index 67eba7359d13..eae5e9917040 100644
--- a/games/hlstatsx/Makefile
+++ b/games/hlstatsx/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Real-time player and clan rankings and statistics for HL2 and mods
 NO_BUILD=	yes
 USE_APACHE_RUN=	22+
 USE_PHP=	gd mysql
-USES=		perl5 zip:infozip
+USES=		perl5 zip
 USE_PERL5=	run
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index b38e9271116f..201b2a37f430 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=		dos2unix zip:infozip
+USES=		dos2unix zip
 DOS2UNIX_REGEX= .*.[^jp][^an][^rg]$
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
diff --git a/games/megamario/Makefile b/games/megamario/Makefile
index e498ad504f7a..6bb95592b4a9 100644
--- a/games/megamario/Makefile
+++ b/games/megamario/Makefile
@@ -15,7 +15,7 @@ LICENSE=	LGPL21
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-USES=		dos2unix gmake zip:infozip
+USES=		dos2unix gmake zip
 DOS2UNIX_GLOB=	*.cpp *.h *.ini Makefile* *.txt *.desktop
 USE_SDL=	sdl image mixer ttf
 USE_GL=		glu
diff --git a/games/openjazz/Makefile b/games/openjazz/Makefile
index bee753c4042b..2f638513a1b5 100644
--- a/games/openjazz/Makefile
+++ b/games/openjazz/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 WRKSRC=	${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
-USES=	dos2unix gmake zip:infozip
+USES=	dos2unix gmake zip
 DOS2UNIX_REGEX=	.*\.(h|cpp)
 ALL_TARGET=	OpenJazz
 USE_XORG=	x11 xext xrandr xrender xau xdmcp
diff --git a/games/pykawari/Makefile b/games/pykawari/Makefile
index f183ad1a3c41..73fd484ced4d 100644
--- a/games/pykawari/Makefile
+++ b/games/pykawari/Makefile
@@ -9,18 +9,16 @@ MASTER_SITES=	SF/kawari/kawari/${PORTVERSION}
 DISTNAME=	kawari-${PORTVERSION:S/.//g}
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
-COMMENT=	A real kawari8 module for ninix-aya
+COMMENT=	Real kawari8 module for ninix-aya
 
-EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 RUN_DEPENDS=	ninix:${PORTSDIR}/games/ninix-aya
 
-EXTRACT_CMD=	${UNZIP_CMD}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE}
 
-USES=		gmake zip:infozip
+USES=		gmake zip
 USE_PYTHON=	yes
 
 WRKSRC=		${WRKDIR}/kawari-${PORTVERSION:S/.//g}
diff --git a/games/quake3-data/Makefile.include b/games/quake3-data/Makefile.include
index a7f196158479..466a586e7ee5 100644
--- a/games/quake3-data/Makefile.include
+++ b/games/quake3-data/Makefile.include
@@ -15,8 +15,3 @@ SUB_LIST+=	Q3DIR="${Q3DIR}"
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
 .endif
-
-# When extracting ZIP archives, ask it to convert text files to Unix style
-.if defined(USE_ZIP)
-EXTRACT_BEFORE_ARGS=	-aqo
-.endif
diff --git a/games/smashbattle/Makefile b/games/smashbattle/Makefile
index f9c1c80d2579..8ac31af9ee45 100644
--- a/games/smashbattle/Makefile
+++ b/games/smashbattle/Makefile
@@ -14,7 +14,7 @@ COMMENT=	8-bit style platform battle game
 WRKSRC=		${WRKDIR}/${DISTNAME}/battle/Battle
 
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
-USES=		dos2unix gmake zip:infozip
+USES=		dos2unix gmake zip
 DOS2UNIX_FILES=	*.cpp *.h Makefile
 USE_SDL=	sdl image mixer
 ALL_TARGET=	battle