Rely on bsdtar to autodetermine the format of the distfiles when possible

For a while now bsdtar is able to autotermine compression and archive format.
Let's then use tar directly instead of piping to tar.

Now USE_BZIP2 and USE_XZ only set EXTRACT_SUFX to the right format

7 files changed, 10 insertions, 40 deletions

diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile
index 30da704ebbad..c2cace7e6a29 100644
--- a/games/alienarena/Makefile
+++ b/games/alienarena/Makefile
@@ -28,7 +28,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS+=--with-xf86vm \
 		--with-xf86dga
 
-EXTRACT_AFTER_ARGS=	| ${TAR} --exclude "data1" -xf -
+EXTRACT_AFTER_ARGS=	--exclude "data1"
 
 MAKE_ENV=	WITH_DATADIR=yes WITH_LIBDIR=yes \
 		DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 72a43e686ca2..fe9ed665b9d5 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bogged
-# Date created:				18 May 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	bogged
 PORTVERSION=	1.0.0
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index eb25d7bd3240..a2ff4198063b 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	crossfire-server
-# Date created:				Jan 30, 2002
-# Whom:			Jasper Jongmans <j.jongmans@aprogas.net>
-#
+# Created by: Jasper Jongmans <j.jongmans@aprogas.net>
 # $FreeBSD$
-#
 
 PORTNAME=	crossfire
 PORTVERSION=	1.70.0
@@ -40,7 +36,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-extract:
-	@cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} \
+	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/${DISTNAME}.maps.tar.bz2 ${EXTRACT_AFTER_ARGS}
 	@${CHMOD} a+x ${WRKSRC}/utils/install-sh
 
diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile
index 5020c57e0114..d4dfa182848e 100644
--- a/games/fretsonfire-data/Makefile
+++ b/games/fretsonfire-data/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fretsonfire-data
-# Date created:		2006-10-02
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	data
 PORTVERSION=	1.3.110
@@ -21,7 +17,7 @@ DATADIR=	share/${PKGNAMEPREFIX:S/-//}
 RESTRICTED=	Only Unreal Voodoo site is allowed to distribute the music
 WRKSRC=		${WRKDIR}/Frets\ on\ Fire-${PORTVERSION}
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}"
+EXTRACT_AFTER_ARGS=	--exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}"
 
 do-install:
 	@${MKDIR} ${PREFIX}/${DATADIR}
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 4082ee8d88fe..e3cd848f7664 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fretsonfire
-# Date created:		2006-09-01
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
+# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	fretsonfire
 PORTVERSION=	1.3.110
@@ -27,7 +23,7 @@ USE_DOS2UNIX=	*.txt
 NO_BUILD=	yes
 
 DATADIR=	share/${PORTNAME}
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude 'data'
+EXTRACT_AFTER_ARGS=	--exclude 'data'
 SUB_FILES=	pkg-message FretsOnFire
 SUB_LIST=	PROGRAM_DIR="${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}"
 WRKSRC=		"${WRKDIR}/Frets on Fire-${PORTVERSION}"
diff --git a/games/linux-warsow/Makefile b/games/linux-warsow/Makefile
index 5ca3d9a44613..acf5bd7fc28f 100644
--- a/games/linux-warsow/Makefile
+++ b/games/linux-warsow/Makefile
@@ -1,6 +1,4 @@
-# New ports collection makefile for:	warsow
-# Date created:		2005-11-12
-# Whom:			Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
+# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
 #
 # $FreeBSD$
 #
@@ -37,7 +35,7 @@ NO_BUILD=	yes
 SUB_FILES=	warsow-wrapper wsw_server-wrapper
 WARSOW_EXTRACT+=${PORTNAME}/basewsw/game${ARCHSUFFIX}.so
 WARSOW_DIR=	${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${WARSOW_EXTRACT}
+EXTRACT_AFTER_ARGS=	${WARSOW_EXTRACT}
 
 DESKTOP_ENTRIES="Warsow" \
 		"Shoot cartoon enemies" \
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 7a312ae52385..bbb63c479843 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -62,18 +62,6 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS+=	fltk:${PORTSDIR}/x11-toolkits/fltk
 .endif
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR}; \
-	for distfile in ${DISTFILES}; do \
-		if ${ECHO_CMD} $$distfile | ${GREP} -q txz$$; then \
-			${XZ_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \
-		else \
-			${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \
-		fi; \
-	done
-
 post-patch:
 	@${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'