From 95833ffed94e611f5d85643beed49d79515a92c3 Mon Sep 17 00:00:00 2001
From: "James E. Housley" <jeh@FreeBSD.org>
Date: Tue, 16 Nov 2004 15:27:57 +0000
Subject: [PATCH] GNUTAR_LISTDIR was partialaly a variable and partially
 hardcoded

PR:		73956
Submitted By:	Phil Homewood <pdh@bne.snapgear.com>
---
 misc/amanda-client/Makefile   |  2 +-
 misc/amanda-server/Makefile   | 22 ++++++++++------------
 misc/amanda25-client/Makefile |  2 +-
 misc/amanda25-server/Makefile | 22 ++++++++++------------
 misc/amanda26-client/Makefile |  2 +-
 misc/amanda26-server/Makefile | 22 ++++++++++------------
 misc/amanda32-client/Makefile |  2 +-
 misc/amanda32-server/Makefile | 22 ++++++++++------------
 8 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 231ee1b83e8b..187bccf91d60 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index effa72195e98..834141e1e2b7 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,8 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-AMANDA_USER?=	operator
-AMANDA_GROUP?=	operator
+AMANDA_USER?=		operator
+AMANDA_GROUP?=		operator
+AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 
 # amanda-server part
 .if !defined(CLIENT_ONLY)
@@ -76,7 +77,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-client --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -172,8 +174,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-server --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
-
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -184,8 +186,8 @@ post-install:
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
-	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
+	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
@@ -198,10 +200,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_GNUTAR_LISTDIR)
-CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 231ee1b83e8b..187bccf91d60 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index effa72195e98..834141e1e2b7 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,8 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-AMANDA_USER?=	operator
-AMANDA_GROUP?=	operator
+AMANDA_USER?=		operator
+AMANDA_GROUP?=		operator
+AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 
 # amanda-server part
 .if !defined(CLIENT_ONLY)
@@ -76,7 +77,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-client --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -172,8 +174,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-server --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
-
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -184,8 +186,8 @@ post-install:
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
-	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
+	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
@@ -198,10 +200,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_GNUTAR_LISTDIR)
-CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 231ee1b83e8b..187bccf91d60 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index effa72195e98..834141e1e2b7 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,8 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-AMANDA_USER?=	operator
-AMANDA_GROUP?=	operator
+AMANDA_USER?=		operator
+AMANDA_GROUP?=		operator
+AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 
 # amanda-server part
 .if !defined(CLIENT_ONLY)
@@ -76,7 +77,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-client --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -172,8 +174,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-server --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
-
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -184,8 +186,8 @@ post-install:
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
-	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
+	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
@@ -198,10 +200,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_GNUTAR_LISTDIR)
-CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 231ee1b83e8b..187bccf91d60 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
-PORTREVISION=	1
+PORTREVISION=	2
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index effa72195e98..834141e1e2b7 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,8 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-AMANDA_USER?=	operator
-AMANDA_GROUP?=	operator
+AMANDA_USER?=		operator
+AMANDA_GROUP?=		operator
+AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 
 # amanda-server part
 .if !defined(CLIENT_ONLY)
@@ -76,7 +77,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-client --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -172,8 +174,8 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--without-server --disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
-
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -184,8 +186,8 @@ post-install:
 		${WRKSRC}/example/chg-scsi.conf \
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
-	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
+	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
 	${TOUCH} /etc/amandates
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
@@ -198,10 +200,6 @@ CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_GNUTAR_LISTDIR)
-CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif