Update to 2.5.2p1, provided by Nick Goffee of BBN.

[bugfixes and minor improvements omitted; see NEWS]

Changes in release 2.5.2

   * krb5 auth is working
   * Works with IPv6 address
   * Amanda configuration file changes
         o amanda.conf changes
               + debugging is enabled in the config file
                 see all debug_* config option
               + tapetype 'readblocksize', if maxtapeblocksize is set too
                 larger for your hardware
   * Amanda command changes
         o amadmin: new 'holding list' and 'holding delete' subcommand.

Changes in release 2.5.1p3

   * Works with tar-1.16 and exit status of 1.

Changes in release 2.5.1p2

   * amoverview is working
   * dumptype starttime is working

   * Amanda command changes
         o amtape accept the -o arguments
         o amgetconf --list to list all tapetype, dumptype, holdingdisk
           or interface
         o amgetconf can return a value of a specific tapetype, dumptype,
           holdingdisk or interface

Changes in release 2.5.1p1

   * Remove contrib/sst.

Changes in release 2.5.1

   * Defects found by Coverity scan and Klocwork K7 analysis tools fixed.
   * Works with GNU tar 1.15.91 - work with new gtar state file format.
   * Open SSL encryption support
   * Two new authentication methods: bsdtcp, bsdudp.
   * Unlimited number of DLEs on a client with bsdtcp, rsh and ssh
     authentication methods.
   * Recovery process amrecover uses Secure API. amoldrecover command
     (same syntax and functionality as amrecover command) is provided for
     compatibility with old Amanda releases. amoldrecover command uses old
     amidxtaped/amindexd protocol.
   * Amanda debug files are separated into client/server/amandad and
     are also classified based on Amanda configuration name.

   * Amanda command changes
         o amfetchdump -o is replaced by -O.
         o amcheck -w option does all tests including the tape writable test.
           Use amcheck -t -w to do only the tape writable test.
         o -o command option to override Amanda configuration. See amanda man
           page for details.
         o amgetconf command doesn't write the BUGGY message when a entry
           is not found in the configuration file.

   * Amanda configuration file changes
         o amanda.conf changes
               + amrecover_do_fsf in amanda.conf defaults to yes
               + amrecover_check_label in amanda.conf defaults to yes
               + usetimestamps in amanda.conf to support multiple
                 backup runs in a calendar day.
               + holdingdisk in amanda.conf supports new values:
                 NEVER, AUTO, REQUIRED.
               + amandad_path, client_username and ssh_keys in
                 amanda.conf for ssh/rsh authentication.
         o New amanda client configuration file - amanda-client.conf.
           Different client configuration file can be used for each Amanda
           configuration.
               + gnutar_list-dir and amandates can be specified in
                 Amanda client configuration file - amanda-client.conf
         o .amandahosts format changes to allow use of secure API for recovery.
         o Amanda service entries in xinetd configuration has changed.

Changes in release 2.5.0p1

* Add the 'amtape update' command.

Changes in release 2.5.0

* Communication security/authentication: Kerberos 4/5, OpenSSH
* Data security: Symmetric/Assymetric encrytion algorithms (aesutil
  and gpg encryption),  Encryption can be done on server or client,
  Custom encryption utilities can be used.
* Compression: Ability to add custom compression tools. This is a
  really useful feature especially since it can specified for a DLE.  You
  can use different compression algorithm for images, binaries, ascii files
  and so on.
* Dump images spanning multiple media volumes - Dump images are no
  longer restricted to a single media volume (tape or vtape).  Data restoration
  can be done using amrecover and amfetchdump commands.
* Auto tape labelling - This optional feature is good for disk backups.

Change in release 2.4.5

* new displayunit global option to select the unit use to display number
  k=kilo, m=mega, g=giga, t=tera.
* new amoverview -skipmissed option.

Change in release 2.4.5b1

* holding disk disk use timestamped directory.
* autoflush flush today's dump.
* new bumppercent global option, this should improve bumping criteria,
  the bumpsize is set to a fixed value which can be adequate for small
  and large disk.
* bumpsize, bumppercent, bumpdays and bumpmult can be in a dumptype.
* calcsize support include and exclude like gnutar.
* new 'estimate' dumptype option to select estimate type:
    CLIENT: estimate by the dumping program.
    CALCSIZE: estimate by the calcsize program, a lot faster but less acurate.
    SERVER: estimate based on statistic from previous run, take second but
            can be wrong on the estimate size.

14 files changed, 266 insertions, 130 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index ffa59de69f3..a9c19e467fc 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.44 2007/11/08 19:39:42 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2008/02/15 16:23:09 gdt Exp $
 #
 
 PKGNAME=		amanda-client-${VERS}
-PKGREVISION=		5
 SVR4_PKGNAME=		amacl
 
 COMMENT=		Client part of Amanda, a network backup system
 
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		awk:run perl:run
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
 .include "../../sysutils/amanda-common/buildlink3.mk"
 #.include "../../devel/readline/buildlink3.mk"
 
-CONFIGURE_ARGS+=	--without-server --without-restore
+CONFIGURE_ARGS+=	--without-server
 
-BUILD_DEFS+=	AMANDA_DUMP_SNAP
+BUILD_DEFS+=		AMANDA_SMB AMANDA_DUMP_SNAP
 
 # Prevent configure script from finding unnecessary libraries.  We'll patch
 # the amrecover Makefile to add the readline libraries as it's the only
diff --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST
index 62372a7899c..fea02ef25a4 100644
--- a/sysutils/amanda-client/PLIST
+++ b/sysutils/amanda-client/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/02/15 16:23:09 gdt Exp $
+dumper/amgtar
+dumper/generic-dumper
 lib/libamclient.la
 libexec/amandad
-libexec/amqde
 libexec/calcsize
 libexec/killpgrp
+libexec/noop
 libexec/patch-system
 libexec/rundump
 libexec/runtar
@@ -12,4 +14,6 @@ libexec/sendbackup
 libexec/sendsize
 libexec/versionsuffix
 man/man8/amrecover.8
+sbin/amoldrecover
 sbin/amrecover
+@dirrm dumper
diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo
index 8b3a3f75ac7..234a170b10d 100644
--- a/sysutils/amanda-client/distinfo
+++ b/sysutils/amanda-client/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.8 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2008/02/15 16:23:09 gdt Exp $
 
-SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
-RMD160 (amanda-2.4.4p4.tar.gz) = d145a5ebb0df340af6aee0e8a15da6b54dfb3051
-Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
-SHA1 (patch-aa) = 2a7dde94ea59ed017d3b05fc33fd98b840126cfb
-SHA1 (patch-ab) = c37b50640d53619ef5ec07d6e63817b3070b7e66
-SHA1 (patch-ac) = e04871589a719e1b1502f8609cf6e04cc6f76428
-SHA1 (patch-ad) = b0ce806ccb513674b68ef1bf2e683d2191636717
-SHA1 (patch-ae) = 2eb02a96fc493a2093dd73ff9e38eb82ca08a7ea
-SHA1 (patch-af) = 2cdea33419fbdce2854c4e9911d1193c5b96aa9b
-SHA1 (patch-ag) = 0a98cce093882315b8f9df2f732d6596ade64e7f
-SHA1 (patch-ah) = 7a06873415a058518afb6ebd0829ff97840ebdf9
-SHA1 (patch-ai) = 11d1012fb1e95aea4bbf0933f4c601ea3581de7c
+SHA1 (amanda-2.5.2p1.tar.gz) = 0969376590a93b2c060dbe9d2573bf335614a4c2
+RMD160 (amanda-2.5.2p1.tar.gz) = 31a81a7c5c0d953a6dffa575a7c3edc14d41f236
+Size (amanda-2.5.2p1.tar.gz) = 1967240 bytes
+SHA1 (patch-aa) = b76a56b28aba238d838764b9d562e29cbb882553
+SHA1 (patch-ab) = c2b966dae6007ae320b0f31051d463e4e51b054b
+SHA1 (patch-ac) = 6327632e03e635c515789db9590d2eee6ebf121b
+SHA1 (patch-ad) = 0cef70057b2003ac9de7ac130c84746504981a95
+SHA1 (patch-ae) = 00f5f000c0d6ff3e655ecbbe30183529bb244b66
+SHA1 (patch-af) = 97c97b0ea1b73c03606e9cea6921391c569538d2
+SHA1 (patch-ag) = dbf2a86ad1bf394cd47bdf6f8e8b279fe621ce04
+SHA1 (patch-ah) = 9df6c042739b6948d4dd61e5b66cad81b86de792
+SHA1 (patch-ai) = 40a5114c5aa5d467982546af5de960cfeff96c60
+SHA1 (patch-aj) = 9e466b4c244d64c7840ab890d75d56ad61980b62
+SHA1 (patch-ak) = 57e38ec30763c53d9a576865fe76772b033f8301
diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa
index 0eafb0c9125..d354db6be55 100644
--- a/sysutils/amanda-client/patches/patch-aa
+++ b/sysutils/amanda-client/patches/patch-aa
@@ -1,35 +1,28 @@
-$NetBSD: patch-aa,v 1.6 2004/11/12 12:13:44 mjl Exp $
+$NetBSD: patch-aa,v 1.7 2008/02/15 16:23:09 gdt Exp $
 
---- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
-+++ Makefile.in	2004-11-08 00:35:11.000000000 +0100
-@@ -277,19 +277,15 @@
- # order is significant, don't change it arbitrarily
+Remove SUBDIRS and DATA that we don't want in -client package.
+
+--- Makefile.in.orig	2007-06-06 19:22:51.000000000 -0400
++++ Makefile.in
+@@ -382,19 +382,12 @@ ACINCLUDE_M4_DEPS = $(GNULIB_M4I) $(ACIN
  SUBDIRS = \
+ 	gnulib \
  	config \
 -	common-src \
+ 	amandad-src \
+-	$(TAPE_SUBDIRS) \
  	$(CLIENT_SUBDIRS) \
- 	$(TAPE_SUBDIRS) \
- 	$(SERVER_SUBDIRS) \
- 	$(RESTORE_SUBDIRS) \
+-	$(SERVER_SUBDIRS) \
+-	$(RESTORE_SUBDIRS) \
  	$(RECOVER_SUBDIRS) \
- 	$(PLOT_SUBDIRS) \
+-	$(PLOT_SUBDIRS) \
 -	man docs example
 +	man
  
 -pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-	ReleaseNotes			\
+-	COPYRIGHT
 +pkgdata_DATA =
  
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
  	$(pkgdata_DATA)			\
-@@ -676,7 +672,7 @@
- uninstall: uninstall-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
index 27cec6a2659..3f101658a9c 100644
--- a/sysutils/amanda-client/patches/patch-ab
+++ b/sysutils/amanda-client/patches/patch-ab
@@ -1,15 +1,29 @@
-$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:44 mjl Exp $
+$NetBSD: patch-ab,v 1.8 2008/02/15 16:23:09 gdt Exp $
 
---- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
-+++ man/Makefile.in	2004-11-08 00:36:33.000000000 +0100
-@@ -280,9 +280,7 @@
+Don't install any manpages except client-specific ones, namely
+RECOVER_MAN8_PAGES.
+
+--- man/Makefile.in.orig	2007-06-06 19:22:52.000000000 -0400
++++ man/Makefile.in
+@@ -373,19 +373,10 @@ SERVER_MAN8_PAGES = amadmin.8 \
+ #endif
+ @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
+ @WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
+-man8_pages = $(COMMON_MAN8_PAGES) \
+-	    $(AMPLOT_MAN8_PAGES) \
+-	    $(SERVER_MAN8_PAGES) \
+-	    $(RECOVER_MAN8_PAGES) \
+-	    $(RESTORE_MAN8_PAGES)
++man8_pages = $(RECOVER_MAN8_PAGES)
+ 
+ man5_pages = $(COMMON_MAN5_PAGES)
+-ALL_MAN_PAGES = $(AMPLOT_MAN8_PAGES) \
+-	   $(COMMON_MAN5_PAGES) \
+-	   $(COMMON_MAN8_PAGES) \
+-	   $(SERVER_MAN8_PAGES) \
+-	   $(RECOVER_MAN8_PAGES) \
+-	   $(RESTORE_MAN8_PAGES)
++ALL_MAN_PAGES = $(RECOVER_MAN8_PAGES)
  
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
--man_MANS = $(AMPLOT_MAN_PAGES) \
--	   $(COMMON_MAN_PAGES) \
--	   $(SERVER_MAN_PAGES) \
-+man_MANS = $(SERVER_MAN_PAGES) \
- 	   $(RECOVER_MAN_PAGES) \
- 	   $(RESTORE_MAN_PAGES)
  
+ # These lines are needed to force automake to set the $man<n>dir variables.
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
index 5ee3c27a123..cf0e17bfbb4 100644
--- a/sysutils/amanda-client/patches/patch-ac
+++ b/sysutils/amanda-client/patches/patch-ac
@@ -1,97 +1,117 @@
-$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:44 mjl Exp $
+$NetBSD: patch-ac,v 1.8 2008/02/15 16:23:09 gdt Exp $
 
---- client-src/Makefile.in.orig	2004-10-22 15:12:39.000000000 +0200
-+++ client-src/Makefile.in	2004-11-08 00:42:06.000000000 +0100
-@@ -74,70 +74,48 @@
- amandad_SOURCES = amandad.c
- amandad_OBJECTS = amandad.$(OBJEXT)
- amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amqde_SOURCES = amqde.c
- amqde_OBJECTS = amqde.$(OBJEXT)
- amqde_LDADD = $(LDADD)
--amqde_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+amqde_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+Remove build-directory library dependencies and link against the ones
+installed by amanda-common instead.
+
+--- client-src/Makefile.in.orig	2007-06-06 19:22:51.000000000 -0400
++++ client-src/Makefile.in
+@@ -115,83 +115,53 @@ PROGRAMS = $(libexec_PROGRAMS)
  calcsize_SOURCES = calcsize.c
  calcsize_OBJECTS = calcsize.$(OBJEXT)
  calcsize_LDADD = $(LDADD)
 -calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  am_getfsent_OBJECTS = getfsent.test.$(OBJEXT)
  getfsent_OBJECTS = $(am_getfsent_OBJECTS)
  getfsent_LDADD = $(LDADD)
 -getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  killpgrp_SOURCES = killpgrp.c
  killpgrp_OBJECTS = killpgrp.$(OBJEXT)
  killpgrp_LDADD = $(LDADD)
 -killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
+ noop_SOURCES = noop.c
+ noop_OBJECTS = noop.$(OBJEXT)
+ noop_LDADD = $(LDADD)
+-noop_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	libamclient.$(LIB_EXTENSION) \
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++noop_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  rundump_SOURCES = rundump.c
  rundump_OBJECTS = rundump.$(OBJEXT)
  rundump_LDADD = $(LDADD)
 -rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  runtar_SOURCES = runtar.c
  runtar_OBJECTS = runtar.$(OBJEXT)
  runtar_LDADD = $(LDADD)
 -runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  selfcheck_SOURCES = selfcheck.c
  selfcheck_OBJECTS = selfcheck.$(OBJEXT)
  selfcheck_LDADD = $(LDADD)
 -selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
  	sendbackup-gnutar.$(OBJEXT)
  sendbackup_OBJECTS = $(am_sendbackup_OBJECTS)
  sendbackup_LDADD = $(LDADD)
 -sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  sendsize_SOURCES = sendsize.c
  sendsize_OBJECTS = sendsize.$(OBJEXT)
  sendsize_LDADD = $(LDADD)
 -sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
  versionsuffix_LDADD = $(LDADD)
 -versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
  libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-@@ -382,9 +360,7 @@
+@@ -489,11 +459,10 @@ libamclient_la_LDFLAGS = -release $(VERS
  # need to list libamanda twice here, first to override the system library
  # routines, and second to pick up any references in the other libraries.
  ###
 -LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamclient.$(LIB_EXTENSION) -lamanda
+-	../amandad-src/libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
+-	../gnulib/libgnu.$(LIB_EXTENSION)
++LDADD = libamclient.$(LIB_EXTENSION) \
++	../gnulib/libgnu.$(LIB_EXTENSION) \
++	-lamanda \
++	-lamandad
  
  SUFFIXES = .sh .pl
  
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
index 64ac61a6f94..4a63227bf8d 100644
--- a/sysutils/amanda-client/patches/patch-ad
+++ b/sysutils/amanda-client/patches/patch-ad
@@ -1,19 +1,22 @@
-$NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $
+$NetBSD: patch-ad,v 1.8 2008/02/15 16:23:09 gdt Exp $
 
---- recover-src/Makefile.in.orig	2004-10-22 15:12:41.000000000 +0200
-+++ recover-src/Makefile.in	2004-11-08 00:44:56.000000000 +0100
-@@ -61,9 +61,7 @@
+Remove build-directory library dependencies and link against the ones
+installed by amanda-common instead.
+
+--- recover-src/Makefile.in.orig	2007-06-06 19:22:53.000000000 -0400
++++ recover-src/Makefile.in
+@@ -97,9 +97,7 @@ am_amrecover_OBJECTS = $(am__objects_1) 
  amrecover_OBJECTS = $(am_amrecover_OBJECTS)
  amrecover_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
 -amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	../client-src/libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION) $(am__DEPENDENCIES_1)
-+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION)
+-	../common-src/libamanda.$(LIB_EXTENSION) \
++amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION) $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -291,10 +289,9 @@
+@@ -386,11 +384,10 @@ LIB_EXTENSION = la
  # need to list libamanda twice here, first to override the system library
  # routines, and second to pick up any references in the other libraries.
  ###
@@ -22,7 +25,8 @@ $NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $
 +LDADD = @LEXLIB@ \
  	../client-src/libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION) \
 +	-lamanda \
  	$(READLINE_LIBS)
  
- amrecover_SOURCES = amrecover.c					\
+ amrecover_CSRC = amrecover.c					\
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
index 0cf2887a833..e08f7b3dd1b 100644
--- a/sysutils/amanda-client/patches/patch-ae
+++ b/sysutils/amanda-client/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: patch-ae,v 1.9 2008/02/15 16:23:09 gdt Exp $
 
---- configure.in.orig	2004-10-22 15:12:14.000000000 +0200
-+++ configure.in	2006-02-17 17:22:12.000000000 +0100
-@@ -1488,6 +1488,44 @@
+--- configure.in.orig	2007-06-06 19:22:24.000000000 -0400
++++ configure.in
+@@ -1838,6 +1838,44 @@ if test "$DUMP" -a "$RESTORE"; then
  	AC_DEFINE(HAVE_HONOR_NODUMP,1,[Define this if dump accepts -h for honoring nodump. ])
        fi
      ])
diff --git a/sysutils/amanda-client/patches/patch-af b/sysutils/amanda-client/patches/patch-af
index 69755716cb6..41d7758aad1 100644
--- a/sysutils/amanda-client/patches/patch-af
+++ b/sysutils/amanda-client/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: patch-af,v 1.5 2008/02/15 16:23:09 gdt Exp $
 
---- config/config.h.in.orig	2006-02-17 18:06:04.000000000 +0100
-+++ config/config.h.in	2006-02-17 18:06:46.000000000 +0100
-@@ -373,6 +373,9 @@
+--- config/config.h.in.orig	2007-06-06 19:23:42.000000000 -0400
++++ config/config.h.in
+@@ -440,6 +440,9 @@
  /* Define this if dump accepts -h for honoring nodump. */
  #undef HAVE_HONOR_NODUMP
  
diff --git a/sysutils/amanda-client/patches/patch-ag b/sysutils/amanda-client/patches/patch-ag
index b082ff36355..395bfbbf1a7 100644
--- a/sysutils/amanda-client/patches/patch-ag
+++ b/sysutils/amanda-client/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.4 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: patch-ag,v 1.5 2008/02/15 16:23:09 gdt Exp $
 
---- client-src/sendbackup-dump.c.orig	2006-02-17 18:07:17.000000000 +0100
-+++ client-src/sendbackup-dump.c	2006-02-17 18:08:53.000000000 +0100
-@@ -310,6 +310,9 @@
- #ifdef HAVE_HONOR_NODUMP
- 			     "h",
- #endif
+--- client-src/sendbackup-dump.c.orig	2007-05-04 07:39:05.000000000 -0400
++++ client-src/sendbackup-dump.c
+@@ -388,6 +388,9 @@ start_backup(
+ 			     options->no_record ? "" : "u",
+ 			     "s",
+ 			     PARAM_HONOR_NODUMP,
 +#ifdef HAVE_DUMP_SNAPSHOT
 +			     "X",
 +#endif
diff --git a/sysutils/amanda-client/patches/patch-ah b/sysutils/amanda-client/patches/patch-ah
index 9e44a739bbc..6cf4ae7d739 100644
--- a/sysutils/amanda-client/patches/patch-ah
+++ b/sysutils/amanda-client/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.1 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: patch-ah,v 1.2 2008/02/15 16:23:09 gdt Exp $
 
---- client-src/sendsize.c.orig	2006-02-17 18:09:16.000000000 +0100
-+++ client-src/sendsize.c	2006-02-17 18:09:54.000000000 +0100
-@@ -873,6 +873,9 @@
- #  ifdef HAVE_HONOR_NODUMP				/* { */
- 			     "h",
- #  endif						/* } */
+--- client-src/sendsize.c.orig	2007-05-15 14:14:58.000000000 -0400
++++ client-src/sendsize.c
+@@ -1272,6 +1272,9 @@ getsize_dump(
+ 	dumpkeys = vstralloc(level_str,
+ 			     PARAM_DUMP_ESTIMATE,
+ 			     PARAM_HONOR_NODUMP,
 +#  ifdef HAVE_DUMP_SNAPSHOT				/* { */
 +			     "X",
 +#  endif						/* } */
diff --git a/sysutils/amanda-client/patches/patch-ai b/sysutils/amanda-client/patches/patch-ai
index 5dc4630da1d..e59331536a9 100644
--- a/sysutils/amanda-client/patches/patch-ai
+++ b/sysutils/amanda-client/patches/patch-ai
@@ -1,16 +1,28 @@
-$NetBSD: patch-ai,v 1.1 2006/03/16 19:13:57 bouyer Exp $
+$NetBSD: patch-ai,v 1.2 2008/02/15 16:23:09 gdt Exp $
 
---- configure.orig	2004-10-22 15:12:36.000000000 +0200
-+++ configure	2006-02-17 18:15:31.000000000 +0100
-@@ -1094,6 +1094,7 @@
-   --with-debug-days=NN    number of days to keep debugging files default=4
-   --with-testing=suffix use alternate service names
+--- configure.orig	2007-06-06 19:22:45.000000000 -0400
++++ configure
+@@ -1119,6 +1119,7 @@ Optional Packages:
+   --with-testing[=suffix] use alternate service names
+   --with-gnuplot=PATH     use gnuplot executable at PATH in amplot
    --with-dump-honor-nodump  if dump supports -h, use it for level0s too
 +  --with-dump-use-snapshot  if dump supports -X, use it
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
-@@ -9701,6 +9702,72 @@
+@@ -13538,7 +13539,10 @@ echo $ECHO_N "checking SSH options... $E
+     # now convert that to a comma-separated list of C strings
+     eval "set dummy ${SSH_OPTIONS}"; shift
+     SSH_OPTIONS=''
+-    for i in "${@}"; do SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }\"${i/\"/\\\"}\""; done
++    for i in "${@}"; do
++	quoted="\"`echo "$i" | sed -e 's/\"/\\\"/'`\""
++	SSH_OPTIONS="${SSH_OPTIONS}${SSH_OPTIONS:+, }$quoted";
++     done
+     echo "$as_me:$LINENO: result: $SSH_OPTIONS" >&5
+ echo "${ECHO_T}$SSH_OPTIONS" >&6
+ 
+@@ -18808,6 +18812,72 @@ _ACEOF
        fi
  
  fi;
@@ -83,3 +95,12 @@ $NetBSD: patch-ai,v 1.1 2006/03/16 19:13:57 bouyer Exp $
  fi
  
  for ac_prog in xfsdump
+@@ -62491,7 +62561,7 @@ fi;
+ # Check whether --with-xsltproc-flags or --without-xsltproc-flags was given.
+ if test "${with_xsltproc_flags+set}" = set; then
+   withval="$with_xsltproc_flags"
+-   if test "x$withval" == "xno"; then
++   if test "x$withval" = "xno"; then
+ 	XSLTPROC_FLAGS=''
+     else
+ 	if test "x$withval" != "xyes"; then
diff --git a/sysutils/amanda-client/patches/patch-aj b/sysutils/amanda-client/patches/patch-aj
new file mode 100644
index 00000000000..96937835ad4
--- /dev/null
+++ b/sysutils/amanda-client/patches/patch-aj
@@ -0,0 +1,43 @@
+$NetBSD: patch-aj,v 1.1 2008/02/15 16:23:09 gdt Exp $
+
+Remove build-directory library dependencies and link against the ones
+installed by amanda-common instead.
+
+Also, install amandad executable only, since libamandad is installed by
+amanda-common.
+
+--- amandad-src/Makefile.in.orig	2007-06-06 19:22:51.000000000 -0400
++++ amandad-src/Makefile.in
+@@ -105,10 +105,7 @@ PROGRAMS = $(libexec_PROGRAMS)
+ amandad_SOURCES = amandad.c
+ amandad_OBJECTS = amandad.$(OBJEXT)
+ amandad_LDADD = $(LDADD)
+-amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
+-	../gnulib/libgnu.$(LIB_EXTENSION)
++amandad_DEPENDENCIES = ../gnulib/libgnu.$(LIB_EXTENSION)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -379,7 +376,7 @@ INCLUDES = -I$(top_builddir)/common-src 
+ 
+ LINT = @AMLINT@
+ LINTFLAGS = @AMLINTFLAGS@
+-lib_LTLIBRARIES = libamandad.la
++# lib_LTLIBRARIES = libamandad.la
+ LIB_EXTENSION = la
+ @WANT_RUNTIME_PSEUDO_RELOC_TRUE@AM_LDFLAGS = -Wl,-enable-runtime-pseudo-reloc
+ libamandad_la_SOURCES = amandad_util.c
+@@ -392,10 +389,7 @@ noinst_HEADERS = amandad.h
+ # need to list libamanda twice here, first to override the system library
+ # routines, and second to pick up any references in the other libraries.
+ ###
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	libamandad.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
+-	../gnulib/libgnu.$(LIB_EXTENSION)
++LDADD = ../gnulib/libgnu.$(LIB_EXTENSION) -lamanda -lamandad
+ 
+ all: all-am
+ 
diff --git a/sysutils/amanda-client/patches/patch-ak b/sysutils/amanda-client/patches/patch-ak
new file mode 100644
index 00000000000..45d28b9bd36
--- /dev/null
+++ b/sysutils/amanda-client/patches/patch-ak
@@ -0,0 +1,35 @@
+$NetBSD: patch-ak,v 1.1 2008/02/15 16:23:09 gdt Exp $
+
+Remove build-directory library dependencies and link against the ones
+installed by amanda-common instead.
+
+--- oldrecover-src/Makefile.in.orig	2007-06-06 19:22:52.000000000 -0400
++++ oldrecover-src/Makefile.in
+@@ -97,9 +97,8 @@ am_amoldrecover_OBJECTS = $(am__objects_
+ amoldrecover_OBJECTS = $(am_amoldrecover_OBJECTS)
+ amoldrecover_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-amoldrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	../client-src/libamclient.$(LIB_EXTENSION) \
+-	$(am__DEPENDENCIES_1) ../common-src/libamanda.$(LIB_EXTENSION) \
++amoldrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION) \
++	$(am__DEPENDENCIES_1) \
+ 	../gnulib/libgnu.$(LIB_EXTENSION)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+@@ -386,12 +385,11 @@ LIB_EXTENSION = la
+ # need to list libamanda twice here, first to override the system library
+ # routines, and second to pick up any references in the other libraries.
+ ###
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	@LEXLIB@ \
++LDADD = @LEXLIB@ \
+ 	../client-src/libamclient.$(LIB_EXTENSION) \
+ 	$(READLINE_LIBS) \
+-	../common-src/libamanda.$(LIB_EXTENSION) \
+-	../gnulib/libgnu.$(LIB_EXTENSION)
++	../gnulib/libgnu.$(LIB_EXTENSION) \
++	-lamanda
+ 
+ amoldrecover_CSRC = amrecover.c					\
+ 			display_commands.c		extract_list.c	\