Add a WITHOUT_GNUTAR option in preperation of the MFC of a newer version

of tar.  The GNUTar is know to work in some specific conditions the previous
native version did not.  This allows an easy way for those that don't need
tar with Amanda or want to try the new version an easy way to do so.

Suggested by:	Mikhail Teterin <mi@aldan.algebra.com>

10 files changed, 110 insertions, 55 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index ccc658396421..b628acef5816 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda24-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 0b27fb544673..f36ae4febe2c 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.2p2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -36,6 +36,8 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
@@ -44,16 +46,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-client --with-gnutar=${PREFIX}/bin/gtar
+		--without-client
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
 		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
@@ -74,6 +74,12 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
@@ -102,20 +108,19 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-server --with-gnutar=${PREFIX}/bin/gtar
+		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -127,6 +132,12 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index ccc658396421..b628acef5816 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda24-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index 0b27fb544673..f36ae4febe2c 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.2p2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -36,6 +36,8 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
@@ -44,16 +46,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-client --with-gnutar=${PREFIX}/bin/gtar
+		--without-client
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
 		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
@@ -74,6 +74,12 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
@@ -102,20 +108,19 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-server --with-gnutar=${PREFIX}/bin/gtar
+		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -127,6 +132,12 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index ccc658396421..b628acef5816 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda24-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 0b27fb544673..f36ae4febe2c 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.2p2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -36,6 +36,8 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
@@ -44,16 +46,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-client --with-gnutar=${PREFIX}/bin/gtar
+		--without-client
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
 		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
@@ -74,6 +74,12 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
@@ -102,20 +108,19 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-server --with-gnutar=${PREFIX}/bin/gtar
+		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -127,6 +132,12 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index ccc658396421..b628acef5816 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda24-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 0b27fb544673..f36ae4febe2c 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.2p2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -36,6 +36,8 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
@@ -44,16 +46,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-client --with-gnutar=${PREFIX}/bin/gtar
+		--without-client
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
 		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
@@ -74,6 +74,12 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
@@ -102,20 +108,19 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-server --with-gnutar=${PREFIX}/bin/gtar
+		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -127,6 +132,12 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index ccc658396421..b628acef5816 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	0
+PORTREVISION=	1
 
 MASTERDIR=	${.CURDIR}/../amanda24-server
 COMMENT=	${PKGDIR}/pkg-comment.client
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 0b27fb544673..f36ae4febe2c 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.2p2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
@@ -36,6 +36,8 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "    -DWITH_PLOT to enable ploting, requires X11 libraries"
 	@${ECHO} "    -DWITH_SAMBA to enable the use of smbclient"
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
@@ -44,16 +46,14 @@ pre-fetch:
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
-BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client \
-		gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
+BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda24-client
 
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-client --with-gnutar=${PREFIX}/bin/gtar
+		--without-client
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdump.8 \
 		amflush.8 amgetconf.8 amlabel.8 amoverview.8 amreport.8 \
@@ -74,6 +74,12 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
@@ -102,20 +108,19 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
+	@${ECHO} "    -DWITHOUT_GNUTAR to NOT use GNUTar and use the"
+	@${ECHO} "        native FreeBSD version"
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
 	@${ECHO} "        The default is user"
 	@${ECHO} ""
 
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--with-user=operator --with-group=operator \
-		--without-server --with-gnutar=${PREFIX}/bin/gtar
+		--without-server
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -127,6 +132,12 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 
+.if !defined (WITHOUT_GNUTAR)
+CONFIGURE_ARGS+=	--with-gnutar=${PREFIX}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+.endif
+
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}