From fe3d6ef70f129afb81a1cada3b83e575cb8b1f0f Mon Sep 17 00:00:00 2001
From: "James E. Housley" <jeh@FreeBSD.org>
Date: Mon, 15 Nov 2004 11:20:22 +0000
Subject: [PATCH] As pointed out in PR ports/73956, even if a user and/or group
 was specified there were two chown statements they were ignored.

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

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 9de355565384..231ee1b83e8b 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}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index ef10443fe5ec..effa72195e98 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,6 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+AMANDA_USER?=	operator
+AMANDA_GROUP?=	operator
+
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
@@ -72,7 +75,8 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-client --disable-libtool --prefix=${PREFIX}
+		--without-client --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -112,18 +116,6 @@ CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
@@ -179,7 +171,9 @@ pre-fetch:
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-server --disable-libtool --prefix=${PREFIX}
+		--without-server --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -191,9 +185,9 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} operator:operator ${PREFIX}/var/amanda/gnutar-lists
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
 	${TOUCH} /etc/amandates
-	${CHOWN} operator:operator /etc/amandates
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
@@ -208,18 +202,6 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.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 9de355565384..231ee1b83e8b 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}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index ef10443fe5ec..effa72195e98 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,6 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+AMANDA_USER?=	operator
+AMANDA_GROUP?=	operator
+
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
@@ -72,7 +75,8 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-client --disable-libtool --prefix=${PREFIX}
+		--without-client --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -112,18 +116,6 @@ CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
@@ -179,7 +171,9 @@ pre-fetch:
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-server --disable-libtool --prefix=${PREFIX}
+		--without-server --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -191,9 +185,9 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} operator:operator ${PREFIX}/var/amanda/gnutar-lists
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
 	${TOUCH} /etc/amandates
-	${CHOWN} operator:operator /etc/amandates
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
@@ -208,18 +202,6 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.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 9de355565384..231ee1b83e8b 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}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index ef10443fe5ec..effa72195e98 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,6 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+AMANDA_USER?=	operator
+AMANDA_GROUP?=	operator
+
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
@@ -72,7 +75,8 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-client --disable-libtool --prefix=${PREFIX}
+		--without-client --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -112,18 +116,6 @@ CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
@@ -179,7 +171,9 @@ pre-fetch:
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-server --disable-libtool --prefix=${PREFIX}
+		--without-server --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -191,9 +185,9 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} operator:operator ${PREFIX}/var/amanda/gnutar-lists
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
 	${TOUCH} /etc/amandates
-	${CHOWN} operator:operator /etc/amandates
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
@@ -208,18 +202,6 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.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 9de355565384..231ee1b83e8b 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}/../amanda-server
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index ef10443fe5ec..effa72195e98 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	2.4.4p4
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -34,6 +34,9 @@ PATCH_STRIP=
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+AMANDA_USER?=	operator
+AMANDA_GROUP?=	operator
+
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
@@ -72,7 +75,8 @@ BUILD_DEPENDS=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-client --disable-libtool --prefix=${PREFIX}
+		--without-client --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
 
 MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
 		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
@@ -112,18 +116,6 @@ CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
 CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif
@@ -179,7 +171,9 @@ pre-fetch:
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
-		--without-server --disable-libtool --prefix=${PREFIX}
+		--without-server --disable-libtool --prefix=${PREFIX} \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+
 
 MAN8=		amanda.8 amrecover.8 amrestore.8
 
@@ -191,9 +185,9 @@ post-install:
 		${WRKSRC}/example/disklist \
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${PREFIX}/var/amanda/gnutar-lists
-	${CHOWN} operator:operator ${PREFIX}/var/amanda/gnutar-lists
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/gnutar-lists
 	${TOUCH} /etc/amandates
-	${CHOWN} operator:operator /etc/amandates
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
 
 .if defined (AMANDA_SERVER)
 CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
@@ -208,18 +202,6 @@ CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
 CONFIGURE_ARGS+=	--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR}
 .endif
 
-.if defined (AMANDA_USER)
-CONFIGURE_ARGS+=	--with-user=${AMANDA_USER}
-.else
-CONFIGURE_ARGS+=	--with-user=operator
-.endif
-
-.if defined (AMANDA_GROUP)
-CONFIGURE_ARGS+=	--with-group=${AMANDA_GROUP}
-.else
-CONFIGURE_ARGS+=	--with-group=operator
-.endif
-
 .if defined (AMANDA_UDPPORTRANGE)
 CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 .endif