9 files changed, 24 insertions, 18 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 03f4f0473ffd..4e059afb73e2 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-client
+PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 81ebe69bf2be..070b4ab1281d 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -45,7 +45,8 @@ OPTIONS=	GNUTAR "use GNU tar" on \
 AMANDA_USER?=		operator
 AMANDA_GROUP?=		operator
 AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
-PLIST_SUB=		SHLIBVER=${PORTVERSION}
+AMANDA_DATES?=		${PREFIX}/var/amanda/amandadates
+PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates
 
 # amanda-server/amanda-client common part
 .if defined (AMANDA_SERVER)
@@ -180,10 +181,11 @@ pre-fetch:
 	@${ECHO} "        between low and high when connecting from the client"
 	@${ECHO} "        to the server. Use ports below 1024."
 	@${ECHO} "        The default is no restriction on UDP ports."
+	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
 CONFLICTS=	amanda-client-2.5.*
-CONFIGURE_ARGS+=--without-server
+CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 
 MAN5=		amanda.conf.5 amanda-client.conf.5
 MAN8=		amanda.8 amrecover.8
@@ -199,8 +201,8 @@ post-install:
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
-	${TOUCH} ${PREFIX}/var/amanda/amandates
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
+	${TOUCH} ${AMANDA_DATES}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}
 
 .if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index fd556666cc49..a061aeee0d62 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -1,4 +1,4 @@
-@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
+@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi
 lib/amanda/libamanda-%%SHLIBVER%%.so
 lib/amanda/libamanda.a
 lib/amanda/libamanda.la
@@ -82,7 +82,6 @@ var/lib/amanda/template.d/amanda-tape-changer.conf
 var/lib/amanda/template.d/chg-manual.conf
 var/lib/amanda/template.d/dumptypes
 var/lib/amanda/template.d/tapetypes
-var/amanda/amandates
 @dirrm %%SITE_PERL%%/auto/Amanda/Util
 @dirrm %%SITE_PERL%%/auto/Amanda/Types
 @dirrm %%SITE_PERL%%/auto/Amanda/Debug
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 03f4f0473ffd..4e059afb73e2 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-client
+PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 81ebe69bf2be..070b4ab1281d 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -45,7 +45,8 @@ OPTIONS=	GNUTAR "use GNU tar" on \
 AMANDA_USER?=		operator
 AMANDA_GROUP?=		operator
 AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
-PLIST_SUB=		SHLIBVER=${PORTVERSION}
+AMANDA_DATES?=		${PREFIX}/var/amanda/amandadates
+PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates
 
 # amanda-server/amanda-client common part
 .if defined (AMANDA_SERVER)
@@ -180,10 +181,11 @@ pre-fetch:
 	@${ECHO} "        between low and high when connecting from the client"
 	@${ECHO} "        to the server. Use ports below 1024."
 	@${ECHO} "        The default is no restriction on UDP ports."
+	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
 CONFLICTS=	amanda-client-2.5.*
-CONFIGURE_ARGS+=--without-server
+CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 
 MAN5=		amanda.conf.5 amanda-client.conf.5
 MAN8=		amanda.8 amrecover.8
@@ -199,8 +201,8 @@ post-install:
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
-	${TOUCH} ${PREFIX}/var/amanda/amandates
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
+	${TOUCH} ${AMANDA_DATES}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}
 
 .if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
diff --git a/misc/amanda26-server/pkg-plist.client b/misc/amanda26-server/pkg-plist.client
index fd556666cc49..a061aeee0d62 100644
--- a/misc/amanda26-server/pkg-plist.client
+++ b/misc/amanda26-server/pkg-plist.client
@@ -1,4 +1,4 @@
-@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
+@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi
 lib/amanda/libamanda-%%SHLIBVER%%.so
 lib/amanda/libamanda.a
 lib/amanda/libamanda.la
@@ -82,7 +82,6 @@ var/lib/amanda/template.d/amanda-tape-changer.conf
 var/lib/amanda/template.d/chg-manual.conf
 var/lib/amanda/template.d/dumptypes
 var/lib/amanda/template.d/tapetypes
-var/amanda/amandates
 @dirrm %%SITE_PERL%%/auto/Amanda/Util
 @dirrm %%SITE_PERL%%/auto/Amanda/Types
 @dirrm %%SITE_PERL%%/auto/Amanda/Debug
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 03f4f0473ffd..4e059afb73e2 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -6,6 +6,7 @@
 #
 
 PKGNAMESUFFIX=	-client
+PORTREVISION=	1
 
 COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
 
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 81ebe69bf2be..070b4ab1281d 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -45,7 +45,8 @@ OPTIONS=	GNUTAR "use GNU tar" on \
 AMANDA_USER?=		operator
 AMANDA_GROUP?=		operator
 AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
-PLIST_SUB=		SHLIBVER=${PORTVERSION}
+AMANDA_DATES?=		${PREFIX}/var/amanda/amandadates
+PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${PREFIX}/var/amanda/amandadates
 
 # amanda-server/amanda-client common part
 .if defined (AMANDA_SERVER)
@@ -180,10 +181,11 @@ pre-fetch:
 	@${ECHO} "        between low and high when connecting from the client"
 	@${ECHO} "        to the server. Use ports below 1024."
 	@${ECHO} "        The default is no restriction on UDP ports."
+	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
 CONFLICTS=	amanda-client-2.5.*
-CONFIGURE_ARGS+=--without-server
+CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 
 MAN5=		amanda.conf.5 amanda-client.conf.5
 MAN8=		amanda.8 amrecover.8
@@ -199,8 +201,8 @@ post-install:
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
-	${TOUCH} ${PREFIX}/var/amanda/amandates
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
+	${TOUCH} ${AMANDA_DATES}
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}
 
 .if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
index fd556666cc49..a061aeee0d62 100644
--- a/misc/amanda32-server/pkg-plist.client
+++ b/misc/amanda32-server/pkg-plist.client
@@ -1,4 +1,4 @@
-@unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
+@unexec if cmp -s %%AMANDA_DATES%% /dev/null; then rm -f %%AMANDA_DATES; fi
 lib/amanda/libamanda-%%SHLIBVER%%.so
 lib/amanda/libamanda.a
 lib/amanda/libamanda.la
@@ -82,7 +82,6 @@ var/lib/amanda/template.d/amanda-tape-changer.conf
 var/lib/amanda/template.d/chg-manual.conf
 var/lib/amanda/template.d/dumptypes
 var/lib/amanda/template.d/tapetypes
-var/amanda/amandates
 @dirrm %%SITE_PERL%%/auto/Amanda/Util
 @dirrm %%SITE_PERL%%/auto/Amanda/Types
 @dirrm %%SITE_PERL%%/auto/Amanda/Debug