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

6 files changed, 11 insertions, 12 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 230ebedc3817..28216005e6d6 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -522,10 +522,10 @@ pre-everything::
 
 post-extract:
 .if defined(WITH_SA_EXIM)
-	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
+	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/sa-exim-${SA_EXIM_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 .endif
 .if defined(WITH_SO_1024)
-	@cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
+	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/spamooborona1024-src-${SO_1024_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}
 	@cd ${WRKDIR} && ${PATCH} --quiet < ${FILESDIR}/extra-patch-so_1024-delimiter
 .endif
 
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index b1dc0764e204..f14926ae5f69 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -24,6 +24,8 @@ LICENSE=	GPLv3
 #  installed by this port from the form *mailfilter* to the form
 #  *filtermail*, and similarly the names in the man pages.
 #
+EXTRACT_CMD=	${GZIP_CMD}
+EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filtermail/g' | ${TAR} -xf -
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index 0e48dae956b3..eb0b309ee8e9 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Converts mbox mailboxes to Maildir
 
 RUN_DEPENDS=	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
-EXTRACT_CMD=	${GZIP_CMD} -cd
+EXTRACT_CMD=	${GZIP_CMD}
+EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${PORTNAME}
 
 NO_WRKSUBDIR=	yes
diff --git a/mail/milter-callback/Makefile b/mail/milter-callback/Makefile
index 266a375d6fb6..80d423ee4304 100644
--- a/mail/milter-callback/Makefile
+++ b/mail/milter-callback/Makefile
@@ -22,10 +22,6 @@ MAN8=		milter-callback.8
 
 MAKE_ENV+=	WITH_SPF=yes
 
-# make sure flat distfile gets extracted in ${WRKSRC}
-EXTRACT_AFTER_ARGS=	| (${MKDIR} ${WRKSRC}; ${TAR} -xf - --no-same-owner \
-				--no-same-permissions -C ${WRKSRC})
-
 .if ${CC} == "clang" || ${CXX} == "clang++"
 BROKEN=	does not build with clang, uses nested functions
 .endif
diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile
index 948be08a81ff..2401cfdd5d2b 100644
--- a/mail/msgconvert/Makefile
+++ b/mail/msgconvert/Makefile
@@ -21,6 +21,8 @@ NO_WRKSUBDIR=	yes
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
+EXTRACT_CMD=	${GZCAT}
+EXTRACT_BEFORE_ARGS=	
 EXTRACT_AFTER_ARGS=	> ${PORTNAME}.pl
 
 do-install:
diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile
index 1bcd2bb3def8..d7e3867a0e07 100644
--- a/mail/x-face-e21/Makefile
+++ b/mail/x-face-e21/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	x-face-e21
-# Date created:		10 September 2009
-# Whom:			Hajimu UMEMOTO <ume@FreeBSD.org>
-#
+# Created by: Hajimu UMEMOTO <ume@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	x-face-e21
 PORTVERSION=	20070306
@@ -23,6 +19,8 @@ USE_EMACS=	yes
 .include <bsd.port.pre.mk>
 
 NO_WRKSUBDIR=	yes
+EXTRACT_CMD=	${GZCAT}
+EXTRACT_BEFORE_ARGS=	
 EXTRACT_AFTER_ARGS=	> ${DISTNAME}
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \