Upgrade of the amanda packages from 2.4.1p1 to 2.4.2.

7 files changed, 102 insertions, 451 deletions

diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa
index 54f21475c6b..6df75402b21 100644
--- a/sysutils/amanda-client/patches/patch-aa
+++ b/sysutils/amanda-client/patches/patch-aa
@@ -1,97 +1,14 @@
-$NetBSD: patch-aa,v 1.3 1999/09/06 18:03:43 bad Exp $
+$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:30 cjones Exp $
 
---- configure.orig	Sat Nov 21 18:12:59 1998
-+++ configure	Fri Sep  3 19:47:23 1999
-@@ -3635,7 +3635,7 @@
-     if test -x $DUMP; then
-         echo $ac_n "checking whether $DUMP supports -E for estimates""... $ac_c" 1>&6
- echo "configure:3638: checking whether $DUMP supports -E for estimates" >&5
--if eval "test \"`echo '$''{'amanda_cv_dump_estimate'+set}'`\" = set"; then
-+if eval "test \"`echo '$''{'amanda_cv_dump_estimate_e'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
-@@ -3648,26 +3648,61 @@
- 		        | $EGREP -v "Dumping\|Date of" >conftest.d'; { (eval echo configure:3649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
- 		    cat conftest.d >&5
- 		    if { ac_try='diff conftest.d-E conftest.d 1>&2'; { (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
--		        amanda_cv_dump_estimate=yes
-+		        amanda_cv_dump_estimate_e=yes
- 		    else
--		        amanda_cv_dump_estimate=no
-+		        amanda_cv_dump_estimate_e=no
- 		    fi
- 		    rm -f conftest.d conftest.d-E conftest.d-noE
- 	          ;;
--	        *) amanda_cv_dump_estimate=no
-+	        *) amanda_cv_dump_estimate_e=no
- 	          ;;
- 	        esac
- 	    
- fi
+--- configure~	Sat Nov 25 06:59:40 2000
++++ configure	Mon Jan 15 16:39:41 2001
+@@ -4924,8 +4924,10 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
  
--echo "$ac_t""$amanda_cv_dump_estimate" 1>&6
-+echo "$ac_t""$amanda_cv_dump_estimate_e" 1>&6
-+        echo $ac_n "checking whether $DUMP supports -S for estimates""... $ac_c" 1>&6
-+echo "configure:3638: checking whether $DUMP supports -S for estimates" >&5
-+if eval "test \"`echo '$''{'amanda_cv_dump_estimate_s'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+	        case "$DUMP" in
-+	        *dump)
-+		    { ac_try='$DUMP 9Sf /dev/null /dev/null/invalid/fs
-+		        >conftest.d-S 2>&1'; { (eval echo configure:3646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+		    cat conftest.d-S >&5
-+		    { ac_try='$DUMP 9f /dev/null /dev/null/invalid/fs 2>&1
-+		        | $EGREP -v "Dumping\|Date of" >conftest.d'; { (eval echo configure:3649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+		    cat conftest.d >&5
-+		    if { ac_try='diff conftest.d-S conftest.d 1>&2'; { (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-+		        amanda_cv_dump_estimate_s=yes
-+		    else
-+		        amanda_cv_dump_estimate_s=no
-+		    fi
-+		    rm -f conftest.d conftest.d-S conftest.d-noS
-+	          ;;
-+	        *) amanda_cv_dump_estimate_s=no
-+	          ;;
-+	        esac
-+	    
-+fi
-+
-+echo "$ac_t""$amanda_cv_dump_estimate_s" 1>&6
-     else
- 	echo "configure: warning: *** $DUMP is not executable, cannot run -E test" 1>&2
--	amanda_cv_dump_estimate=no
-+	amanda_cv_dump_estimate_e=no
-+	amanda_cv_dump_estimate_s=no
-     fi
--    if test "$amanda_cv_dump_estimate" = yes; then
-+    if test "$amanda_cv_dump_estimate_e" = yes; then
- 	cat >> confdefs.h <<\EOF
--#define HAVE_DUMP_ESTIMATE 1
-+#define HAVE_DUMP_ESTIMATE "E"
-+EOF
-+
-+    fi
-+    if test "$amanda_cv_dump_estimate_s" = yes; then
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_DUMP_ESTIMATE "S"
- EOF
- 
-     fi
-@@ -4457,6 +4492,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
++if false ; then
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -4502,6 +4538,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 +fi
  
  # Redirect the config.log output again, so that the ltconfig log is not
diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
index 7ccbb70cbda..feb3b2e837c 100644
--- a/sysutils/amanda-client/patches/patch-ab
+++ b/sysutils/amanda-client/patches/patch-ab
@@ -1,146 +1,88 @@
-$NetBSD: patch-ab,v 1.3 1999/09/04 01:07:29 bad Exp $
+$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:30 cjones Exp $
 
---- client-src/Makefile.in.old	Tue Feb 23 11:09:57 1999
-+++ client-src/Makefile.in	Tue Feb 23 11:11:28 1999
-@@ -83,7 +83,7 @@
- BUILD_CLIENT_SCRIPTS_LIBEXEC = @BUILD_CLIENT_SCRIPTS_LIBEXEC@
- BUILD_CLIENT_SCRIPTS_SBIN = @BUILD_CLIENT_SCRIPTS_SBIN@
- BUILD_COMMON_LIB = @BUILD_COMMON_LIB@
--BUILD_COMMON_LTLIB = @BUILD_COMMON_LTLIB@
-+BUILD_COMMON_LTLIB =
- BUILD_RECOVER_PROGS_SBIN = @BUILD_RECOVER_PROGS_SBIN@
- BUILD_RESTORE_PROGS_LIBEXEC = @BUILD_RESTORE_PROGS_LIBEXEC@
- BUILD_RESTORE_PROGS_SBIN = @BUILD_RESTORE_PROGS_SBIN@
-@@ -162,12 +162,11 @@
+--- client-src/Makefile.in~	Sat Nov 25 07:01:56 2000
++++ client-src/Makefile.in	Mon Jan 15 16:42:12 2001
+@@ -171,8 +171,7 @@
  
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
+ libamclient_a_SOURCES = $(libamclient_la_SOURCES)
  
--LDADD =	libamclient.$(LIB_EXTENSION) \
+-LDADD = libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD =	libamclient.$(LIB_EXTENSION) 
++LDADD = libamclient.$(LIB_EXTENSION) -lamanda
  
- SUFFIXES =		.sh .pl
  
--libexec_PROGRAMS =	versionsuffix		@BUILD_CLIENT_PROGS_LIBEXEC@
-+libexec_PROGRAMS =	@BUILD_CLIENT_PROGS_LIBEXEC@
- 
- # these are used for testing only:
- TEST_PROGS = getfsent
-@@ -224,7 +223,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamanda
- libamclient_a_OBJECTS =  amandates.o getfsent.o unctime.o
- LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
-@@ -234,60 +233,50 @@
+ SUFFIXES = .sh .pl
+@@ -230,63 +229,53 @@
  amandad_SOURCES = amandad.c
- amandad_OBJECTS =  amandad.o
+ amandad_OBJECTS =  amandad.$(OBJEXT)
  amandad_LDADD = $(LDADD)
 -amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  amandad_LDFLAGS = 
  calcsize_SOURCES = calcsize.c
- calcsize_OBJECTS =  calcsize.o
+ calcsize_OBJECTS =  calcsize.$(OBJEXT)
  calcsize_LDADD = $(LDADD)
 -calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  calcsize_LDFLAGS = 
+ am_getfsent_OBJECTS =  getfsent.test.$(OBJEXT)
+ getfsent_OBJECTS =  $(am_getfsent_OBJECTS)
+ getfsent_LDADD = $(LDADD)
+-getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+ getfsent_LDFLAGS = 
  killpgrp_SOURCES = killpgrp.c
- killpgrp_OBJECTS =  killpgrp.o
+ killpgrp_OBJECTS =  killpgrp.$(OBJEXT)
  killpgrp_LDADD = $(LDADD)
 -killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  killpgrp_LDFLAGS = 
  rundump_SOURCES = rundump.c
- rundump_OBJECTS =  rundump.o
+ rundump_OBJECTS =  rundump.$(OBJEXT)
  rundump_LDADD = $(LDADD)
 -rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  rundump_LDFLAGS = 
  runtar_SOURCES = runtar.c
- runtar_OBJECTS =  runtar.o
+ runtar_OBJECTS =  runtar.$(OBJEXT)
  runtar_LDADD = $(LDADD)
 -runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  runtar_LDFLAGS = 
  selfcheck_SOURCES = selfcheck.c
- selfcheck_OBJECTS =  selfcheck.o
+ selfcheck_OBJECTS =  selfcheck.$(OBJEXT)
  selfcheck_LDADD = $(LDADD)
 -selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  selfcheck_LDFLAGS = 
- sendbackup_OBJECTS =  sendbackup.o sendbackup-dump.o sendbackup-gnutar.o
+ am_sendbackup_OBJECTS =  sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
+ sendbackup-gnutar.$(OBJEXT)
+ sendbackup_OBJECTS =  $(am_sendbackup_OBJECTS)
  sendbackup_LDADD = $(LDADD)
 -sendbackup_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++sendbackup_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  sendbackup_LDFLAGS = 
  sendsize_SOURCES = sendsize.c
- sendsize_OBJECTS =  sendsize.o
+ sendsize_OBJECTS =  sendsize.$(OBJEXT)
  sendsize_LDADD = $(LDADD)
 -sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  sendsize_LDFLAGS = 
- getfsent_OBJECTS =  getfsent.test.o
- getfsent_LDADD = $(LDADD)
--getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
- getfsent_LDFLAGS = 
  versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS =  versionsuffix.o
+ versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
  versionsuffix_LDADD = $(LDADD)
 -versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) 
++versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  versionsuffix_LDFLAGS = 
  SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
  
---- recover-src/Makefile.in.old	Tue Feb 23 11:34:04 1999
-+++ recover-src/Makefile.in	Tue Feb 23 11:36:07 1999
-@@ -83,7 +83,7 @@
- BUILD_CLIENT_SCRIPTS_LIBEXEC = @BUILD_CLIENT_SCRIPTS_LIBEXEC@
- BUILD_CLIENT_SCRIPTS_SBIN = @BUILD_CLIENT_SCRIPTS_SBIN@
- BUILD_COMMON_LIB = @BUILD_COMMON_LIB@
--BUILD_COMMON_LTLIB = @BUILD_COMMON_LTLIB@
-+BUILD_COMMON_LTLIB =
- BUILD_RECOVER_PROGS_SBIN = @BUILD_RECOVER_PROGS_SBIN@
- BUILD_RESTORE_PROGS_LIBEXEC = @BUILD_RESTORE_PROGS_LIBEXEC@
- BUILD_RESTORE_PROGS_SBIN = @BUILD_RESTORE_PROGS_SBIN@
-@@ -164,9 +164,7 @@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(AMANDA_CFLAGS)
- 
- LDADD = @LEXLIB@ \
--	../client-src/libamclient.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+	../client-src/libamclient.$(LIB_EXTENSION) 
- 
- EXTRA_PROGRAMS = 	amrecover
- 
-@@ -189,13 +187,11 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamanda -lamtape
- amrecover_OBJECTS =  amrecover.o display_commands.o extract_list.o \
- help.o set_commands.o uparse.o uscan.o
- amrecover_LDADD = $(LDADD)
--amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) 
- amrecover_LDFLAGS = 
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LEXLIB = @LEXLIB@
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
index 52bc867c0fd..715427aaf76 100644
--- a/sysutils/amanda-client/patches/patch-ac
+++ b/sysutils/amanda-client/patches/patch-ac
@@ -1,13 +1,27 @@
-$NetBSD: patch-ac,v 1.3 1999/09/04 01:07:29 bad Exp $
+$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:30 cjones Exp $
 
---- Makefile.in.old	Tue Feb 23 10:37:10 1999
-+++ Makefile.in	Tue Feb 23 10:38:36 1999
-@@ -157,7 +157,7 @@
- AUTOCONF = @AUTOCONF@ --localdir=config
- 
- SUBDIRS=config		\
--	common-src	client-src	tape-src	\
-+	client-src	tape-src	\
- 	server-src	restore-src	recover-src	\
- 	changer-src	amplot		man		\
- 	example
+--- Makefile.in.orig	Sat Nov 25 07:01:53 2000
++++ Makefile.in	Mon Jan 15 16:52:37 2001
+@@ -162,20 +162,15 @@
+ # order is significant, don't change it arbitrarily
+ SUBDIRS = \
+ 	config \
+-	common-src \
+ 	$(CLIENT_SUBDIRS) \
+ 	$(TAPE_SUBDIRS) \
+ 	$(SERVER_SUBDIRS) \
+ 	$(RESTORE_SUBDIRS) \
+ 	$(RECOVER_SUBDIRS) \
+-	$(PLOT_SUBDIRS) \
+-	man docs example
++	man
+ 
+ 
+-pkgdata_DATA = \
+-	COPYRIGHT			\
+-	COPYRIGHT-APACHE		\
+-	COPYRIGHT-REGEX
++pkgdata_DATA =
+ 
+ 
+ EXTRA_DIST = $(SNAPSHOT_STAMP) \
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
index 4d93f5f07e8..b47a4196eb3 100644
--- a/sysutils/amanda-client/patches/patch-ad
+++ b/sysutils/amanda-client/patches/patch-ad
@@ -1,18 +1,15 @@
-$NetBSD: patch-ad,v 1.3 1999/09/04 01:07:29 bad Exp $
+$NetBSD: patch-ad,v 1.4 2001/01/16 21:59:30 cjones Exp $
 
---- man/Makefile.in.old	Tue Feb 23 11:12:23 1999
-+++ man/Makefile.in	Tue Feb 23 11:12:46 1999
-@@ -158,12 +158,7 @@
- 
- transform =	s,x,x,;
+--- man/Makefile.in.orig	Sat Nov 25 07:02:01 2000
++++ man/Makefile.in	Mon Jan 15 16:59:05 2001
+@@ -176,9 +176,7 @@
+ # not autoconf-generated:
+ EXTRA_DIST = amplot.8 amrestore.8 amtape.8
  
--man_MANS =	amadmin.8	amanda.8	amcheck.8	\
--		amcheckdb.8	amcleanup.8	amdump.8	\
--		amflush.8	amlabel.8	amoverview.8	\
--		amplot.8	amrecover.8	amrestore.8	\
--		amrmtape.8	amtape.8	amtoc.8		\
--		amverify.8	amstatus.8	amreport.8
-+man_MANS =	amrecover.8
+-man_MANS = $(AMPLOT_MAN_PAGES) \
+-	   $(COMMON_MAN_PAGES) \
+-	   $(SERVER_MAN_PAGES) \
++man_MANS = $(SERVER_MAN_PAGES) \
+ 	   $(RECOVER_MAN_PAGES) \
+ 	   $(RESTORE_MAN_PAGES)
  
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
index 37c6878fc80..2549de26d58 100644
--- a/sysutils/amanda-client/patches/patch-ae
+++ b/sysutils/amanda-client/patches/patch-ae
@@ -1,19 +1,23 @@
-$NetBSD: patch-ae,v 1.3 1999/09/04 01:07:29 bad Exp $
+$NetBSD: patch-ae,v 1.4 2001/01/16 21:59:30 cjones Exp $
 
---- client-src/sendbackup-gnutar.c.old	Fri Feb 26 12:02:58 1999
-+++ client-src/sendbackup-gnutar.c	Fri Feb 26 12:06:59 1999
-@@ -300,11 +300,11 @@
- 	}
- 	if (level==0) {
- 	    if (no_record)
--		taropt = "-Tc";
-+		taropt = "-Tqc";
- 	    else
--		taropt = "-Tca";
-+		taropt = "-Tqca";
- 	} else
--	    taropt = "-Tcg";
-+	    taropt = "-Tqcg";
- 	dbprintf(("backup from %s, user %s, pass %s\n", 
- 		  sharename, SAMBA_USER, "XXXXX"));
+--- recover-src/Makefile.in~	Sat Nov 25 07:02:00 2000
++++ recover-src/Makefile.in	Mon Jan 15 16:50:54 2001
+@@ -158,7 +158,7 @@
  
+ LDADD = @LEXLIB@ \
+ 	../client-src/libamclient.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++	-lamanda
+ 
+ 
+ amrecover_SOURCES = amrecover.c					\
+@@ -187,8 +187,7 @@
+ uparse.$(OBJEXT) uscan.$(OBJEXT)
+ amrecover_OBJECTS =  $(am_amrecover_OBJECTS)
+ amrecover_LDADD = $(LDADD)
+-amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION)
+ amrecover_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-client/patches/patch-af b/sysutils/amanda-client/patches/patch-af
deleted file mode 100644
index 274df3963d2..00000000000
--- a/sysutils/amanda-client/patches/patch-af
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/11/16 08:17:50 kleink Exp $
-
---- client-src/sendsize.c.orig	Wed Nov 18 02:07:20 1998
-+++ client-src/sendsize.c	Thu Nov 16 09:12:57 2000
-@@ -574,7 +574,7 @@
-     {"Total bytes listed: [0-9][0-9]*", 1},		     /* Samba client */
- #endif
- 
--#ifdef HAVE_DUMP_ESTIMATE
-+#if defined(HAVE_DUMP_ESTIMATE) && !defined(__NetBSD__)
- # ifdef SAMBA_CLIENT
-     /* On DU 4.0, dump -E prints a line that matches an output line of
-        smbclient.  So, even if both are enabled by configure, dump
-@@ -593,7 +593,7 @@
- char *disk;
- int level;
- {
--    int pipefd[2], nullfd, killctl[2];
-+    int pipefd[2], nullfd, stdoutfd, killctl[2];
-     pid_t dumppid;
-     long size;
-     FILE *dumpout;
-@@ -614,7 +614,7 @@
-     cmd = vstralloc(libexecdir, "/rundump", versionsuffix(), NULL);
-     rundump_cmd = stralloc(cmd);
- 
--    nullfd = open("/dev/null", O_RDWR);
-+    stdoutfd = nullfd = open("/dev/null", O_RDWR);
-     pipefd[0] = pipefd[1] = killctl[0] = killctl[1] = -1;
-     pipe(pipefd);
- 
-@@ -689,13 +689,17 @@
- # else							/* } { */
- 	dumpkeys = vstralloc(level_str,
- #  ifdef HAVE_DUMP_ESTIMATE				/* { */
--			     "E",
-+			     HAVE_DUMP_ESTIMATE
- #  endif						/* } */
- #  ifdef HAVE_HONOR_NODUMP				/* { */
- 			     "h",
- #  endif						/* } */
- 			     "s", "f", NULL);
- 
-+#  ifdef HAVE_DUMP_ESTIMATE
-+	stdoutfd = pipefd[1];
-+#  endif
-+
- #  ifdef HAVE_HONOR_NODUMP				/* { */
- 	dbprintf(("%s: running \"%s%s %s 0 1048576 - %s\"\n",
- 		  get_pname(), cmd, name, dumpkeys, device));
-@@ -758,7 +762,7 @@
- 	}
- 
- 	dup2(nullfd, 0);
--	dup2(nullfd, 1);
-+	dup2(stdoutfd, 1);
- 	dup2(pipefd[1], 2);
- 	aclose(pipefd[0]);
- 	if (killctl[0] != -1)
diff --git a/sysutils/amanda-client/patches/patch-ag b/sysutils/amanda-client/patches/patch-ag
deleted file mode 100644
index e6ba331a015..00000000000
--- a/sysutils/amanda-client/patches/patch-ag
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2000/03/16 13:58:46 wiz Exp $
---- changer-src/scsi-chio.c.orig	Wed Jul  8 00:04:04 1998
-+++ changer-src/scsi-chio.c	Mon Mar  6 15:26:26 2000
-@@ -119,25 +119,41 @@
-  */
- int isempty(int fd, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status  ces;
-+#endif
-+
- int                            i,rc;
- int type=CHET_ST;
- 
-     get_changer_info(fd);
- 
-+#if defined(OCHIOGSTATUS)
-+    cesr.cesr_type = type;
-+    cesr.cesr_data = malloc(changer_info.cp_nslots);
-+    rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
-     ces.ces_type = type;
-     ces.ces_data = malloc(changer_info.cp_nslots);
--
-     rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
-     if (rc) {
- 	fprintf(stderr,"%s: changer status query failed: 0x%x %s\n",
- 			get_pname(), rc,strerror(errno));
- 	return -1;
-     }
- 
-+#if defined(OCHIOGSTATUS)
-+    i = cesr.cesr_data[slot] & CESTATUS_FULL;
-+    free(cesr.cesr_data);
-+#else
-     i = ces.ces_data[slot] & CESTATUS_FULL;
--
-     free(ces.ces_data);
-+#endif
-+
-     return !i;
- }
- 
-@@ -146,16 +162,27 @@
-  */
- int find_empty(int fd)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status  ces;
-+#endif
-+
- int                            i,rc;
- int type=CHET_ST;
- 
-     get_changer_info(fd);
- 
-+#if defined(OCHIOGSTATUS)
-+    cesr.cesr_type = type;
-+    cesr.cesr_data = malloc(changer_info.cp_nslots);
-+    rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
-     ces.ces_type = type;
-     ces.ces_data = malloc(changer_info.cp_nslots);
-+    rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
- 
--    rc = ioctl(fd,CHIOGSTATUS,&ces);
-     if (rc) {
- 	fprintf(stderr,"%s: changer status query failed: 0x%x %s\n",
- 			get_pname(), rc, strerror(errno));
-@@ -163,9 +190,17 @@
-     }
- 
-     i = 0; 
-+
-+#if defined(OCHIOGSTATUS)
-+    while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL))
-+        i++;
-+    free(cesr.cesr_data);
-+#else
-     while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL))
- 	i++;
-     free(ces.ces_data);
-+#endif
-+
-     return i;
- }
- 
-@@ -174,25 +209,41 @@
-  */
- int drive_loaded(int fd, int drivenum)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status  ces;
-+#endif
-+
- int                            i,rc;
- int type=CHET_DT;
- 
-     get_changer_info(fd);
- 
-+#if defined(OCHIOGSTATUS)
-+    cesr.cesr_type = type;
-+    cesr.cesr_data = malloc(changer_info.cp_ndrives);
-+    rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
-     ces.ces_type = type;
-     ces.ces_data = malloc(changer_info.cp_ndrives);
--
-     rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
-     if (rc) {
- 	fprintf(stderr,"%s: drive status query failed: 0x%x %s\n",
- 			get_pname(), rc, strerror(errno));
- 	return -1;
-     }
- 
-+#if defined(OCHIOGSTATUS)
-+    i = (cesr.cesr_data[drivenum] & CESTATUS_FULL);
-+    free(cesr.cesr_data);
-+#else
-     i = (ces.ces_data[drivenum] & CESTATUS_FULL);
--
-     free(ces.ces_data);
-+#endif
-+
-     return i;
- }
- 
-@@ -202,7 +253,12 @@
-  */
- int unload(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move  move;
-+#endif
-+
- int rc;
- 
-     move.cm_fromtype = CHET_DT;
-@@ -226,7 +282,12 @@
-  */
- int load(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move  move;
-+#endif
-+
- int rc;
- 
-     move.cm_fromtype = CHET_ST;