Finally upgrade to 2.6.0p2.

Old 2.5.x version is repocopied as misc/amanda25-{server,client}.
If you have backup clients which cannot be upgraded to 2.6.x, use these
old ports or disable usetimestamps option (enabled by default, which
is incompatible with 2.5.x) in amanda.conf.

More minor improvements will follow.

PR:		ports/128836
Submitted by:	Goran Lowkrantz <glz@hidden-powers.com>
Urged by:	many

17 files changed, 349 insertions, 264 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 1d1bc274cfb7..e707f6eaee5b 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.5.1p3
-PORTREVISION?=	5
-PKGNAMESUFFIX?=	-server
+PORTVERSION=	2.6.0p2
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	amanda
+PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
@@ -21,15 +20,20 @@ WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
-USE_AUTOTOOLS=	autoconf:262
+GNU_CONFIGURE=	yes
+USE_GNOME=	pkgconfig glib20
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 PATCH_STRIP=
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
+		--without-amlibexecdir \
 		--with-amandahosts --with-fqdn \
 		--with-dump-honor-nodump --with-buffered-dump \
 		--disable-libtool --prefix=${PREFIX} \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
+		--disable-glibtest \
+		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-bsdtcp-security --with-bsdudp-security
+
 USE_LDCONFIG=	yes
 WANT_PERL=	yes
 
@@ -61,10 +65,6 @@ CONFIGURE_ARGS+=	--with-udpportrange=${AMANDA_UDPPORTRANGE}
 CONFIGURE_ARGS+=	--with-ssh-security
 .endif
 
-# AMANDA_PORTRANGE is obsoleted.  Use AMANDA_TCPPORTRANGE instead.
-.if defined (AMANDA_PORTRANGE)
-AMANDA_TCPPORTRANGE=	${AMANDA_PORTRANGE}
-.endif
 .if defined (AMANDA_TCPPORTRANGE)
 CONFIGURE_ARGS+=	--with-tcpportrange=${AMANDA_TCPPORTRANGE}
 .endif
@@ -103,24 +103,22 @@ pre-fetch:
 	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} ""
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|^OPENSSL=.*$$|OPENSSL=${OPENSSLBASE}/bin/openssl|' \
-		${WRKSRC}/server-src/amcrypt-ossl.sh.in \
-		${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
-
 USE_PERL5=	yes
+CONFLICTS=	amanda-server-2.5.*
 
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
-RUN_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
+BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
+RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS+=--without-client
 
-MAN8=		amadmin.8 amaespipe.8 amcheck.8 \
-		amcheckdb.8 amcleanup.8 \
-		amcrypt.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 amdd.8 \
-		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
-		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
+MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
+		amcheckdb.8 amcheckdump.8 amcleanup.8 \
+		amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
+		amdd.8 amdevcheck.8 \
+		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
+		amlabel.8 ammt.8 \
+		amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
+		amserverconfig.8 amstatus.8 \
 		amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8
 
 OPTIONS+=	PLOT "enable ploting, requires X11 libraries" off\
@@ -194,10 +192,11 @@ pre-fetch:
 	@${ECHO} "        The default is no restriction on UDP ports."
 	@${ECHO} ""
 
+CONFLICTS=	amanda-client-2.5.*
 CONFIGURE_ARGS+=--without-server
 
 MAN5=		amanda.conf.5 amanda-client.conf.5
-MAN8=		amanda.8 amrecover.8 amrestore.8
+MAN8=		amanda.8 amrecover.8
 
 OPTIONS+=	DUMP_SNAPSHOT "use snapshot by using dump -L" off
 
@@ -210,8 +209,8 @@ post-install:
 		${PREFIX}/share/examples/amanda
 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
 	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
-	${TOUCH} /etc/amandates
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} /etc/amandates
+	${TOUCH} ${PREFIX}/var/amanda/amandates
+	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${PREFIX}/var/amanda/amandates
 
 .if defined (WITH_DUMP_SNAPSHOT)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
@@ -222,5 +221,7 @@ EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendbackup-dump.c
 # Maintainer TODO:
 #   o amanda-server installs lib/libamandad.a which should be handled by
 #     amanda-client only.
+#   o man pages have incorrect markups.
+#   o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index a0ceb02da1d3..dba0b6fe453e 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.5.1p3.tar.gz) = 7232da6d43543f2c7dac2ded21c65ee9
-SHA256 (amanda-2.5.1p3.tar.gz) = 64e60f323a89a8a064936334335cfde6cf41e6127f7f8b1c9b6de2d393de3f72
-SIZE (amanda-2.5.1p3.tar.gz) = 1905664
+MD5 (amanda-2.6.0p2.tar.gz) = 75dcba5a75327ebcd4f197a93b8e8c9c
+SHA256 (amanda-2.6.0p2.tar.gz) = 3830d9c95cfe72e63aea5179208851a141481b037ec4060bf3d5829bf50e6ae3
+SIZE (amanda-2.6.0p2.tar.gz) = 2402088
diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa
deleted file mode 100644
index 3f21a3181ae0..000000000000
--- a/misc/amanda-server/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- man/Makefile.in.orig	Tue Sep  5 23:08:22 2006
-+++ man/Makefile.in	Thu Sep  7 14:14:52 2006
-@@ -193,8 +193,8 @@
- WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
- WANT_RECOVER_FALSE = @WANT_RECOVER_FALSE@
- WANT_RECOVER_TRUE = @WANT_RECOVER_TRUE@
--WANT_RESTORE_FALSE = @WANT_RESTORE_FALSE@
--WANT_RESTORE_TRUE = @WANT_RESTORE_TRUE@
-+WANT_CLIENT_FALSE = @WANT_CLIENT_FALSE@
-+WANT_CLIENT_TRUE = @WANT_CLIENT_TRUE@
- WANT_RUNTIME_PSEUDO_RELOC_FALSE = @WANT_RUNTIME_PSEUDO_RELOC_FALSE@
- WANT_RUNTIME_PSEUDO_RELOC_TRUE = @WANT_RUNTIME_PSEUDO_RELOC_TRUE@
- WANT_SAMBA_FALSE = @WANT_SAMBA_FALSE@
-@@ -261,13 +261,13 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- @WANT_AMPLOT_TRUE@AMPLOT_MAN8_PAGES = amplot.8
--COMMON_MAN8_PAGES = amanda.8
--COMMON_MAN5_PAGES = amanda.conf.5 \
-+@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8
-+@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5 \
- 		    amanda-client.conf.5
- 
- 
- #if WANT_SERVER
--SERVER_MAN8_PAGES = amadmin.8 \
-+@WANT_SERVER_TRUE@SERVER_MAN8_PAGES = amadmin.8 \
- 		    amcheck.8 \
- 		    amcheckdb.8 \
- 		    amcleanup.8 \
-@@ -294,7 +294,7 @@
- 
- #endif
- @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
--@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
-+@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8
- man8_MANS = $(COMMON_MAN8_PAGES) \
- 	    $(AMPLOT_MAN8_PAGES) \
- 	    $(SERVER_MAN8_PAGES) \
diff --git a/misc/amanda-server/files/patch-ab b/misc/amanda-server/files/patch-ab
deleted file mode 100644
index 4f6bc0ca5d58..000000000000
--- a/misc/amanda-server/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- common-src/Makefile.in	Fri Nov 30 11:33:48 2001
-+++ common-src/Makefile.in.new	Fri Nov 30 18:03:29 2001
-@@ -611,7 +611,8 @@
- 
- install-data-am:
- 
--install-exec-am: install-libLTLIBRARIES
-+@WANT_CLIENT_TRUE@install-exec-am: @WANT_CLIENT_TRUE@install-libLTLIBRARIES
-+@WANT_SERVER_TRUE@install-exec-am:
- 
- install-info:
- 
diff --git a/misc/amanda-server/files/patch-ac b/misc/amanda-server/files/patch-ac
deleted file mode 100644
index a9e95a3a6607..000000000000
--- a/misc/amanda-server/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- tape-src/Makefile.in.orig	Tue Oct 25 06:23:42 2005
-+++ tape-src/Makefile.in	Wed Mar 22 12:10:00 2006
-@@ -43,7 +43,7 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
-+@WANT_SERVER_TRUE@sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
- EXTRA_PROGRAMS = $(am__EXEEXT_1)
- subdir = tape-src
- DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
diff --git a/misc/amanda-server/files/patch-ad b/misc/amanda-server/files/patch-ad
index 8d41e16eb9cb..3fff9c551c52 100644
--- a/misc/amanda-server/files/patch-ad
+++ b/misc/amanda-server/files/patch-ad
@@ -1,14 +1,14 @@
---- client-src/calcsize.c.orig	Mon Nov  4 20:37:53 2002
-+++ client-src/calcsize.c	Thu Oct 23 19:25:07 2003
-@@ -130,7 +130,11 @@
- 	dump_total += (ST_BLOCKS(finfo) + 1)/2 + 1;
- 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + 1));
+--- client-src/calcsize.c.orig	2008-01-18 09:31:16.000000000 +0900
++++ client-src/calcsize.c	2008-08-30 20:11:59.000000000 +0900
+@@ -160,7 +160,11 @@
+ 	dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
+ 	gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
      }
 +#ifdef GNUTAR
-+    printf("           GNUTAR           dump\n");
++    g_printf("           GNUTAR           dump\n");
 +#else
-     printf("           gtar           dump\n");
+     g_printf("           gtar           dump\n");
 +#endif
-     printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
+     g_printf("total      %-9lu         %-9lu\n",gtar_total,dump_total);
      return 0;
  #else
diff --git a/misc/amanda-server/files/patch-ae b/misc/amanda-server/files/patch-ae
deleted file mode 100644
index 5b539bea3d43..000000000000
--- a/misc/amanda-server/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- client-src/sendbackup-gnutar.c.orig	Wed Jul 26 03:35:21 2006
-+++ client-src/sendbackup-gnutar.c	Thu Sep  7 12:13:59 2006
-@@ -543,7 +543,11 @@
- 	    my_argv[i++] = g_options->config;
- 	else
- 	    my_argv[i++] = "NOCONFIG";
-+#ifdef GNUTAR
-+	my_argv[i++] = "GNUTAR";
-+#else
- 	my_argv[i++] = "gtar";
-+#endif
- 	my_argv[i++] = "--create";
- 	my_argv[i++] = "--file";
- 	my_argv[i++] = "-";
diff --git a/misc/amanda-server/files/patch-chg-zd-mtx.sh.in b/misc/amanda-server/files/patch-chg-zd-mtx.sh.in
index 555c4dffe362..589218b5d2c2 100644
--- a/misc/amanda-server/files/patch-chg-zd-mtx.sh.in
+++ b/misc/amanda-server/files/patch-chg-zd-mtx.sh.in
@@ -1,6 +1,6 @@
---- changer-src/chg-zd-mtx.sh.in.orig	Wed Feb  9 21:58:30 2005
-+++ changer-src/chg-zd-mtx.sh.in	Wed Feb  9 21:58:49 2005
-@@ -413,7 +413,7 @@
+--- changer-src/chg-zd-mtx.sh.orig	2008-05-27 02:25:32.000000000 +0900
++++ changer-src/chg-zd-mtx.sh	2009-01-05 07:34:15.000000000 +0900
+@@ -411,7 +411,7 @@
  
  IsNumeric() {
  	test -z "$1" && return 1
@@ -9,3 +9,12 @@
  	return `expr X"$1" != X"$x"`
  }
  
+@@ -797,7 +797,7 @@
+ max_drive_wait=${max_drive_wait:-'120'}			# default: two minutes
+ 
+ # check MT and MTX for sanity
+-if test "${MTX:0:1}" = "/"; then
++if test "${MTX%${MTX#?}}" = "/"; then
+     if ! test -f "${MTX}"; then
+ 	Exit 2 \
+ 	    `_ '<none>'` \
diff --git a/misc/amanda-server/files/patch-common-src::Makefile.in b/misc/amanda-server/files/patch-common-src::Makefile.in
new file mode 100644
index 000000000000..099a8ffb5dec
--- /dev/null
+++ b/misc/amanda-server/files/patch-common-src::Makefile.in
@@ -0,0 +1,42 @@
+--- common-src/Makefile.in.orig	2008-08-23 03:20:00.000000000 +0900
++++ common-src/Makefile.in	2008-09-01 07:42:20.000000000 +0900
+@@ -926,12 +926,14 @@
+ sbin_SCRIPTS_PERL = \
+ 	    amgpgcrypt \
+ 	    amcryptsimple
++@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =
+ 
+ sbin_SCRIPTS_SHELL = \
+ 	    amcrypt \
+ 	    amaespipe \
+ 	    amcrypt-ossl \
+ 	    amcrypt-ossl-asym
++@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL =
+ 
+ amlibexec_SCRIPTS_PERL = 
+ SCRIPTS_INCLUDE = \
+@@ -985,15 +987,15 @@
+ versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
+-	@list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
+-	  else :; fi; \
+-	done
++@WANT_CLIENT_TRUE@	@$(NORMAL_INSTALL)
++@WANT_CLIENT_TRUE@	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
++@WANT_CLIENT_TRUE@	@list='$(amlib_LTLIBRARIES)'; for p in $$list; do \
++@WANT_CLIENT_TRUE@	  if test -f $$p; then \
++@WANT_CLIENT_TRUE@	    f=$(am__strip_dir) \
++@WANT_CLIENT_TRUE@	    echo " $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(amlibdir)/$$f'"; \
++@WANT_CLIENT_TRUE@	    $(LIBTOOL) --mode=install $(amlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(amlibdir)/$$f"; \
++@WANT_CLIENT_TRUE@	  else :; fi; \
++@WANT_CLIENT_TRUE@	done
+ 
+ uninstall-amlibLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/misc/amanda-server/files/patch-man::Makefile.in b/misc/amanda-server/files/patch-man::Makefile.in
new file mode 100644
index 000000000000..5f44834fe522
--- /dev/null
+++ b/misc/amanda-server/files/patch-man::Makefile.in
@@ -0,0 +1,10 @@
+--- man/Makefile.in.orig	2008-08-31 22:27:26.000000000 +0900
++++ man/Makefile.in	2008-08-31 22:27:46.000000000 +0900
+@@ -565,6 +565,7 @@
+ COMMON_MAN_PAGES = amanda.8 \
+ 		    amanda.conf.5 \
+ 		    amanda-client.conf.5
++@WANT_SERVER_TRUE@COMMON_MAN_PAGES =
+ 
+ SERVER_MAN_PAGES = amadmin.8 \
+ 		    amcheck.8 \
diff --git a/misc/amanda-server/files/patch-perl::Makefile.in b/misc/amanda-server/files/patch-perl::Makefile.in
new file mode 100644
index 000000000000..49f6a8c6e4c6
--- /dev/null
+++ b/misc/amanda-server/files/patch-perl::Makefile.in
@@ -0,0 +1,115 @@
+--- perl/Makefile.in.orig	2008-08-23 03:20:01.000000000 +0900
++++ perl/Makefile.in	2008-09-02 07:36:59.000000000 +0900
+@@ -291,15 +291,15 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
+-libConfig_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)
+ libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)
+ libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@
+-libDebug_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)
+ libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)
+ libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -343,22 +343,22 @@
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libTapefile_la_LDFLAGS) $(LDFLAGS) -o $@
+ @WANT_SERVER_TRUE@am_libTapefile_la_rpath = -rpath $(libTapefiledir)
+-libTypes_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ am_libTypes_la_OBJECTS = Types.lo $(am__objects_1)
+ libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS)
+ libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@
+-libUtil_la_DEPENDENCIES = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
+-am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
++@WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
+ libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)
+ libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libUtil_la_LDFLAGS) $(LDFLAGS) -o $@
+ libamglue_la_LIBADD =
+-am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
++@WANT_CLIENT_TRUE@am_libamglue_la_OBJECTS = ghashtable.lo bigint.lo
+ libamglue_la_OBJECTS = $(am_libamglue_la_OBJECTS)
+ libamglue_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -914,39 +914,39 @@
+ 
+ 
+ # PACKAGE: Amanda::Debug
+-libDebugdir = $(amperldir)/auto/Amanda/Debug
+-libDebug_LTLIBRARIES = libDebug.la
+-libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
+-libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libDebug_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug
++@WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la
++@WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Config
+-libConfigdir = $(amperldir)/auto/Amanda/Config
+-libConfig_LTLIBRARIES = libConfig.la
+-libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
+-libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libConfig_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config
++@WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la
++@WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Util
+-libUtildir = $(amperldir)/auto/Amanda/Util
+-libUtil_LTLIBRARIES = libUtil.la
+-libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
+-libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libUtil_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util
++@WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la
++@WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # PACKAGE: Amanda::Types
+-libTypesdir = $(amperldir)/auto/Amanda/Types
+-libTypes_LTLIBRARIES = libTypes.la
+-libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
+-libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
+-libTypes_la_LIBADD = libamglue.la \
+-	$(top_builddir)/common-src/libamanda.la
++@WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types
++@WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la
++@WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
++@WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
++@WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \
++@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
+ 
+ 
+ # perl doesn't use the cyg prefix and it doesn't search in the bin
diff --git a/misc/amanda-server/files/patch-sendsize.c b/misc/amanda-server/files/patch-sendsize.c
deleted file mode 100644
index 1279be968739..000000000000
--- a/misc/amanda-server/files/patch-sendsize.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- client-src/sendsize.c.orig	Thu Feb 15 11:11:39 2007
-+++ client-src/sendsize.c	Thu Feb 15 11:12:03 2007
-@@ -1190,7 +1190,7 @@
- #  endif
- 	dumpkeys = vstralloc(level_str,
- 			     PARAM_DUMP_ESTIMATE,
--			     PARAM_DUMP_ESTIMATE,
-+			     PARAM_HONOR_NODUMP,
- 			     "s", "f", NULL);
- 
- #  ifdef HAVE_DUMP_ESTIMATE
diff --git a/misc/amanda-server/files/patch-server-src::amcleanup.sh b/misc/amanda-server/files/patch-server-src::amcleanup.sh
new file mode 100644
index 000000000000..f566f64e6504
--- /dev/null
+++ b/misc/amanda-server/files/patch-server-src::amcleanup.sh
@@ -0,0 +1,11 @@
+--- server-src/amcleanup.sh.orig	2009-01-05 07:37:09.000000000 +0900
++++ server-src/amcleanup.sh	2009-01-05 07:37:26.000000000 +0900
+@@ -75,7 +75,7 @@
+ #   after receiving SIGTERM,  if yes send SIGKILL  
+ #
+ 
+-function killpid() {
++killpid() {
+ 
+ killPID=$1
+ SIGTERM=15
diff --git a/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in b/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
deleted file mode 100644
index eeb0ea70129c..000000000000
--- a/misc/amanda-server/files/patch-server-src::amcrypt-ossl-asym.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- server-src/amcrypt-ossl-asym.sh.in.orig	2006-07-04 13:28:47.000000000 +0200
-+++ server-src/amcrypt-ossl-asym.sh.in	2008-07-12 12:11:30.000000000 +0200
-@@ -36,7 +36,7 @@
- # change these as needed
- OPENSSL=			# whatever's in $PATH
- CIPHER=aes-256-cbc		# see `openssl help` for more ciphers
--AMANDA_HOME=~amandabackup
-+AMANDA_HOME=~@CLIENT_LOGIN@
- RANDFILE=$AMANDA_HOME/.rnd
- export RANDFILE
- PASSPHRASE=$AMANDA_HOME/.am_passphrase	# optional
diff --git a/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in b/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in
deleted file mode 100644
index 2eb587feb9af..000000000000
--- a/misc/amanda-server/files/patch-server-src::amcrypt-ossl.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- server-src/amcrypt-ossl.sh.in.orig	2006-07-04 13:28:47.000000000 +0200
-+++ server-src/amcrypt-ossl.sh.in	2008-07-12 12:11:35.000000000 +0200
-@@ -7,7 +7,7 @@
- # change these as needed
- OPENSSL=			# whatever's in $PATH
- CIPHER=aes-256-cbc		# see `openssl help` for more ciphers
--AMANDA_HOME=~amandabackup
-+AMANDA_HOME=~@CLIENT_LOGIN@
- RANDFILE=$AMANDA_HOME/.rnd
- export RANDFILE
- PASSPHRASE=$AMANDA_HOME/.am_passphrase	# required
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 807ba8730fc9..b946a403aa01 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -1,15 +1,36 @@
-lib/libamserver-%%SHLIBVER%%.so
-lib/libamserver.so
-lib/libamserver.la
-lib/libamserver.a
-lib/libamtape-%%SHLIBVER%%.so
-lib/libamtape.so
-lib/libamtape.la
-lib/libamtape.a
-lib/librestore-%%SHLIBVER%%.so
-lib/librestore.a
-lib/librestore.la
-lib/librestore.so
+lib/amanda/libamdevice-%%SHLIBVER%%.so
+lib/amanda/libamdevice.a
+lib/amanda/libamdevice.la
+lib/amanda/libamdevice.so
+lib/amanda/libamserver-%%SHLIBVER%%.so
+lib/amanda/libamserver.a
+lib/amanda/libamserver.la
+lib/amanda/libamserver.so
+lib/amanda/libamtape-%%SHLIBVER%%.so
+lib/amanda/libamtape.a
+lib/amanda/libamtape.la
+lib/amanda/libamtape.so
+lib/amanda/librestore-%%SHLIBVER%%.so
+lib/amanda/librestore.a
+lib/amanda/librestore.la
+lib/amanda/librestore.so
+%%SITE_PERL%%/Amanda/Changer.pm
+%%SITE_PERL%%/Amanda/Cmdline.pm
+%%SITE_PERL%%/Amanda/Device.pm
+%%SITE_PERL%%/Amanda/Logfile.pm
+%%SITE_PERL%%/Amanda/Tapefile.pm
+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
+%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
+%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
+%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
+%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
+%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.a
+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.la
+%%SITE_PERL%%/auto/Amanda/Tapefile/libTapefile.so
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
@@ -24,6 +45,7 @@ libexec/amanda/chg-chs
 libexec/amanda/chg-disk
 libexec/amanda/chg-iomega
 libexec/amanda/chg-juke
+libexec/amanda/chg-lib.sh
 libexec/amanda/chg-manual
 libexec/amanda/chg-mcutil
 libexec/amanda/chg-mtx
@@ -39,15 +61,14 @@ libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
+sbin/amaddclient
 sbin/amadmin
-sbin/amaespipe
 sbin/amcheck
 sbin/amcheckdb
+sbin/amcheckdump
 sbin/amcleanup
-sbin/amcrypt
-sbin/amcrypt-ossl
-sbin/amcrypt-ossl-asym
 sbin/amdd
+sbin/amdevcheck
 sbin/amdump
 sbin/amfetchdump
 sbin/amflush
@@ -59,9 +80,15 @@ sbin/amoverview
 sbin/amreport
 sbin/amrestore
 sbin/amrmtape
+sbin/amserverconfig
 sbin/amstatus
 sbin/amtape
 sbin/amtapetype
 sbin/amtoc
 sbin/amverify
 sbin/amverifyrun
+@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
+@dirrm %%SITE_PERL%%/auto/Amanda/Device
+@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
+@dirrm %%SITE_PERL%%/auto/Amanda/Tapefile
+@dirrm include/amanda
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index d0b17f759f71..fd556666cc49 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -1,19 +1,23 @@
 @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
-dumper/generic-dumper
-dumper/gnutar
-lib/libamandad-%%SHLIBVER%%.so
-lib/libamandad.so
-lib/libamandad.la
-lib/libamandad.a
-lib/libamanda-%%SHLIBVER%%.so
-lib/libamanda.so
-lib/libamanda.la
-lib/libamanda.a
-lib/libamclient-%%SHLIBVER%%.so
-lib/libamclient.so
-lib/libamclient.la
-lib/libamclient.a
+lib/amanda/libamanda-%%SHLIBVER%%.so
+lib/amanda/libamanda.a
+lib/amanda/libamanda.la
+lib/amanda/libamanda.so
+lib/amanda/libamandad-%%SHLIBVER%%.so
+lib/amanda/libamandad.a
+lib/amanda/libamandad.la
+lib/amanda/libamandad.so
+lib/amanda/libamclient-%%SHLIBVER%%.so
+lib/amanda/libamclient.a
+lib/amanda/libamclient.la
+lib/amanda/libamclient.so
+lib/amanda/libamglue.a
+lib/amanda/libamglue.la
+lib/amanda/libamglue.so
+libexec/amanda/amanda-sh-lib.sh
 libexec/amanda/amandad
+libexec/amanda/application/amgtar
+libexec/amanda/application/generic-dumper
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
 libexec/amanda/noop
@@ -24,102 +28,77 @@ libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/versionsuffix
-sbin/amrecover
+%%SITE_PERL%%/Amanda/Config.pm
+%%SITE_PERL%%/Amanda/Debug.pm
+%%SITE_PERL%%/Amanda/Paths.pm
+%%SITE_PERL%%/Amanda/Types.pm
+%%SITE_PERL%%/Amanda/Util.pm
+%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
+%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
+%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
+%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
+%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
+%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
+%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
+%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
+%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
+%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
+sbin/amaespipe
+sbin/amcrypt
+sbin/amcrypt-ossl
+sbin/amcrypt-ossl-asym
+sbin/amcryptsimple
+sbin/amgpgcrypt
 sbin/amoldrecover
-share/amanda/Appendix.txt
+sbin/amrecover
 share/amanda/COPYRIGHT
-share/amanda/COPYRIGHT-APACHE
-share/amanda/COPYRIGHT-REGEX
+share/amanda/ChangeLog
+share/amanda/NEWS
 share/amanda/ReleaseNotes
-share/amanda/amadmin.8.txt
-share/amanda/amaespipe.8.txt
-share/amanda/amanda-client.conf.5.txt
-share/amanda/amanda.8.txt
-share/amanda/amanda.conf.5.txt
-share/amanda/amcheck.8.txt
-share/amanda/amcheckdb.8.txt
-share/amanda/amcleanup.8.txt
-share/amanda/amcrypt-asym-ossl.8.txt
-share/amanda/amcrypt-ossl.8.txt
-share/amanda/amcrypt.8.txt
-share/amanda/amdd.8.txt
-share/amanda/amdump.8.txt
-share/amanda/amfetchdump.8.txt
-share/amanda/amflush.8.txt
-share/amanda/amgetconf.8.txt
-share/amanda/amlabel.8.txt
-share/amanda/ammt.8.txt
-share/amanda/amoverview.8.txt
-share/amanda/amplot.8.txt
-share/amanda/amrecover.8.txt
-share/amanda/amreport.8.txt
-share/amanda/amrestore.8.txt
-share/amanda/amrmtape.8.txt
-share/amanda/amstatus.8.txt
-share/amanda/amtape.8.txt
-share/amanda/amtapetype.8.txt
-share/amanda/amtoc.8.txt
-share/amanda/amverify.8.txt
-share/amanda/amverifyrun.8.txt
-share/amanda/chgscsi.txt
-share/amanda/dumperapi.txt
-share/amanda/eventapi.txt
-share/amanda/exclude.txt
-share/amanda/faq.txt
-share/amanda/historical.txt
-share/amanda/howto-afs.txt
-share/amanda/howto-auth.txt
-share/amanda/howto-cygwin.txt
-share/amanda/howto-filedriver.txt
-share/amanda/howto-gpg.txt
-share/amanda/howto-wrapper.txt
-share/amanda/howtos.txt
-share/amanda/index.txt
-share/amanda/indexing.txt
-share/amanda/install.txt
-share/amanda/internals.txt
-share/amanda/introduction.txt
-share/amanda/ix01.txt
-share/amanda/kerberos.txt
-share/amanda/labelprinting.txt
-share/amanda/links.txt
-share/amanda/manpages.txt
-share/amanda/multitape.txt
-share/amanda/portusage.txt
-share/amanda/pr01.txt
-share/amanda/pr02.txt
-share/amanda/pr03.txt
-share/amanda/pr04.txt
-share/amanda/rait.txt
-share/amanda/references.txt
-share/amanda/restore.txt
-share/amanda/samba.txt
-share/amanda/security-api.txt
-share/amanda/security.txt
-share/amanda/strategy-api.txt
-share/amanda/survey.txt
-share/amanda/systemnotes.txt
-share/amanda/tapechangers.txt
-share/amanda/tapesnchangers.txt
-share/amanda/tapetypes.txt
-share/amanda/technical.txt
-share/amanda/topten.txt
-share/amanda/upgrade.txt
-share/amanda/using.txt
-share/amanda/various.txt
-share/amanda/vtape-api.txt
-share/amanda/whatwasnew.txt
-share/amanda/wishlist.txt
-share/amanda/y2k.txt
-share/amanda/zftape.txt
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-multi.conf
 share/examples/amanda/chg-scsi.conf
 share/examples/amanda/disklist
+var/lib/amanda/example/amanda-client.conf
+var/lib/amanda/example/amanda.conf
+var/lib/amanda/example/inetd.conf.amandaclient
+var/lib/amanda/example/label-templates/3hole.ps
+var/lib/amanda/example/label-templates/8.5x11.ps
+var/lib/amanda/example/label-templates/DIN-A4.ps
+var/lib/amanda/example/label-templates/DLT-A4.ps
+var/lib/amanda/example/label-templates/DLT.ps
+var/lib/amanda/example/label-templates/EXB-8500.ps
+var/lib/amanda/example/label-templates/HP-DAT.ps
+var/lib/amanda/example/xinetd.amandaclient
+var/lib/amanda/example/xinetd.amandaserver
+var/lib/amanda/template.d/README
+var/lib/amanda/template.d/advanced.conf
+var/lib/amanda/template.d/amanda-S3.conf
+var/lib/amanda/template.d/amanda-harddisk.conf
+var/lib/amanda/template.d/amanda-single-tape.conf
+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
+@dirrm %%SITE_PERL%%/auto/Amanda/Config
+@dirrm %%SITE_PERL%%/auto/Amanda
+@dirrm %%SITE_PERL%%/Amanda
+@dirrm var/lib/amanda/template.d
+@dirrm var/lib/amanda/example/label-templates
+@dirrm var/lib/amanda/example
+@dirrm var/lib/amanda
+@dirrmtry var/lib
 @dirrmtry var/amanda/gnutar-lists
 @dirrmtry var/amanda
 @dirrmtry var
 @dirrm share/examples/amanda
 @dirrm share/amanda
+@dirrm libexec/amanda/application
 @dirrm libexec/amanda
-@dirrm dumper
+@dirrm lib/amanda