Prepare for 2.4.2p2

This is a bug fix release.
Improve debugging support, fix some fd leaks and add barcode reader support.
For more details, refer to the Changelog.

14 files changed, 291 insertions, 347 deletions

diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
index feb3b2e837c..af550f9f6a0 100644
--- a/sysutils/amanda-client/patches/patch-ab
+++ b/sysutils/amanda-client/patches/patch-ab
@@ -1,88 +1,86 @@
-$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- 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 @@
+--- client-src/Makefile.in.orig	Tue Apr  3 15:55:44 2001
++++ client-src/Makefile.in	Mon Jun 25 22:05:53 2001
+@@ -174,7 +174,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- libamclient_a_SOURCES = $(libamclient_la_SOURCES)
- 
--LDADD = libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	libamclient.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = libamclient.$(LIB_EXTENSION) -lamanda
  
  
  SUFFIXES = .sh .pl
-@@ -230,63 +229,53 @@
+@@ -228,62 +228,52 @@
+ 
+ getfsent_OBJECTS =  getfsent.test.$(OBJEXT)
+ getfsent_LDADD = $(LDADD)
+-getfsent_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
+ getfsent_LDFLAGS = 
  amandad_SOURCES = amandad.c
  amandad_OBJECTS =  amandad.$(OBJEXT)
  amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-amandad_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
 +amandad_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
  amandad_LDFLAGS = 
  calcsize_SOURCES = calcsize.c
  calcsize_OBJECTS =  calcsize.$(OBJEXT)
  calcsize_LDADD = $(LDADD)
--calcsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-calcsize_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(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.$(OBJEXT)
  killpgrp_LDADD = $(LDADD)
--killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-killpgrp_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  killpgrp_LDFLAGS = 
  rundump_SOURCES = rundump.c
  rundump_OBJECTS =  rundump.$(OBJEXT)
  rundump_LDADD = $(LDADD)
--rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-rundump_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  rundump_LDFLAGS = 
  runtar_SOURCES = runtar.c
  runtar_OBJECTS =  runtar.$(OBJEXT)
  runtar_LDADD = $(LDADD)
--runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-runtar_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  runtar_LDFLAGS = 
  selfcheck_SOURCES = selfcheck.c
  selfcheck_OBJECTS =  selfcheck.$(OBJEXT)
  selfcheck_LDADD = $(LDADD)
--selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-selfcheck_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  selfcheck_LDFLAGS = 
- am_sendbackup_OBJECTS =  sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
+ 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 =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  sendbackup_LDFLAGS = 
  sendsize_SOURCES = sendsize.c
  sendsize_OBJECTS =  sendsize.$(OBJEXT)
  sendsize_LDADD = $(LDADD)
--sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-sendsize_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  sendsize_LDFLAGS = 
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
  versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION)
+-versionsuffix_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
++versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  versionsuffix_LDFLAGS = 
  SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
  
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
index 715427aaf76..c5740498e6d 100644
--- a/sysutils/amanda-client/patches/patch-ac
+++ b/sysutils/amanda-client/patches/patch-ac
@@ -1,27 +1,17 @@
-$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Mon Jan 15 16:52:37 2001
-@@ -162,20 +162,15 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 22:16:50 2001
+@@ -157,10 +157,10 @@
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+ @WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
  # 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
+-SUBDIRS =  	config 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
++SUBDIRS =  	config 		$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) man
  
  
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-pkgdata_DATA =  	COPYRIGHT				COPYRIGHT-APACHE			COPYRIGHT-REGEX
 +pkgdata_DATA =
  
  
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
+ EXTRA_DIST = $(SNAPSHOT_STAMP) 	$(pkgdata_DATA)				contrib/README				contrib/dbbackup.README			contrib/dbbackup.ksh			contrib/dbbackup.sql			contrib/dbbackup.tcl			contrib/set_prod_link.pl		contrib/sst/Makefile			contrib/sst/README			contrib/sst/README.Amanda		contrib/sst/sst.c			contrib/sst/sst.conf			contrib/sst/sst_def.h			contrib/sst/sstest.c			patches/regex-3.6alpha.patch		patches/samba-largefs.patch		patches/tar-1.12.patch			regex-src/COPYRIGHT			regex-src/Makefile 			regex-src/README			regex-src/WHATSNEW 			regex-src/cclass.h			regex-src/cname.h			regex-src/debug.c			regex-src/engine.c			regex-src/main.c			regex-src/mkh				regex-src/regcomp.c			regex-src/regerror.c			regex-src/regex.3			regex-src/regex.7			regex-src/regex2.h			regex-src/regexec.c			regex-src/regfree.c			regex-src/split.c			regex-src/tests				regex-src/utils.h			regex-src/fake/limits.h			regex-src/fake/memmove.c		regex-src/fake/stdlib.h
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
index b47a4196eb3..74d45935cef 100644
--- a/sysutils/amanda-client/patches/patch-ad
+++ b/sysutils/amanda-client/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2001/01/16 21:59:30 cjones Exp $
+$NetBSD: patch-ad,v 1.5 2001/06/26 03:14:11 christos Exp $
 
---- 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 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 22:09:13 2001
+@@ -159,7 +159,7 @@
  # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8
  
--man_MANS = $(AMPLOT_MAN_PAGES) \
--	   $(COMMON_MAN_PAGES) \
--	   $(SERVER_MAN_PAGES) \
-+man_MANS = $(SERVER_MAN_PAGES) \
- 	   $(RECOVER_MAN_PAGES) \
- 	   $(RESTORE_MAN_PAGES)
+-man_MANS = $(AMPLOT_MAN_PAGES) 	   $(COMMON_MAN_PAGES) 	   $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
++man_MANS = $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
  
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
index 8265f067b76..72660900711 100644
--- a/sysutils/amanda-client/patches/patch-ae
+++ b/sysutils/amanda-client/patches/patch-ae
@@ -1,32 +1,24 @@
-$NetBSD: patch-ae,v 1.5 2001/05/29 18:04:30 jlam Exp $
+$NetBSD: patch-ae,v 1.6 2001/06/26 03:14:11 christos Exp $
 
---- recover-src/Makefile.in.orig	Sat Nov 25 09:02:00 2000
-+++ recover-src/Makefile.in	Tue May 29 12:32:35 2001
-@@ -158,7 +158,7 @@
+--- recover-src/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ recover-src/Makefile.in	Mon Jun 25 22:23:26 2001
+@@ -159,7 +159,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- LDADD = @LEXLIB@ \
- 	../client-src/libamclient.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+	-lamanda -lreadline -ltermcap
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	@LEXLIB@ 	../client-src/libamclient.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD =  	@LEXLIB@ 	../client-src/libamclient.$(LIB_EXTENSION) 	-lamanda
  
  
- amrecover_SOURCES = amrecover.c					\
-@@ -179,7 +179,7 @@
- 
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ -DHAVE_LIBREADLINE
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- am_amrecover_OBJECTS =  amrecover.$(OBJEXT) display_commands.$(OBJEXT) \
-@@ -187,8 +187,7 @@
+ amrecover_SOURCES = amrecover.c								display_commands.c		extract_list.c				help.c				set_commands.c				uparse.y			uscan.l
+@@ -183,9 +183,7 @@
+ extract_list.$(OBJEXT) help.$(OBJEXT) set_commands.$(OBJEXT) \
  uparse.$(OBJEXT) uscan.$(OBJEXT)
- amrecover_OBJECTS =  $(am_amrecover_OBJECTS)
  amrecover_LDADD = $(LDADD)
--amrecover_DEPENDENCIES =  ../client-src/libamclient.$(LIB_EXTENSION) \
+-amrecover_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-../client-src/libamclient.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amrecover_DEPENDENCIES =  ../client-src/libamclient.$(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)
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LEXLIB = @LEXLIB@
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index 6421986add1..f4f596fe002 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,16 +1,19 @@
-$NetBSD: patch-aa,v 1.5 2001/01/16 21:59:31 cjones Exp $
+$NetBSD: patch-aa,v 1.6 2001/06/26 03:14:12 christos Exp $
 
---- client-src/Makefile.in.orig	Sat Nov 25 07:01:56 2000
-+++ client-src/Makefile.in	Thu Jan 11 12:40:19 2001
-@@ -284,9 +284,8 @@
+--- client-src/Makefile.in.orig	Mon Jun 25 21:44:46 2001
++++ client-src/Makefile.in	Mon Jun 25 22:29:03 2001
+@@ -281,11 +281,10 @@
  sendsize_LDFLAGS = 
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES =  libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
+-versionsuffix_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
  versionsuffix_LDFLAGS = 
- SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
+-SCRIPTS =  $(libexec_SCRIPTS) $(sbin_SCRIPTS)
++SCRIPTS =  $(libexec_S:RIPTS) $(sbin_SCRIPTS)
  
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
index 9e5fd5be425..922dee6dd84 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,38 +1,22 @@
-$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:31 cjones Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Fri Jan 12 11:20:53 2001
-@@ -154,11 +154,11 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 21:50:51 2001
+@@ -151,11 +151,11 @@
  ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
  
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = @WANT_CLIENT_TRUE@client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = @WANT_TAPE_TRUE@tape-src
+ @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
+-@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
 +TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = @WANT_SERVER_TRUE@server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = @WANT_RESTORE_TRUE@ restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = @WANT_RECOVER_TRUE@ recover-src
--@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = @WANT_AMPLOT_TRUE@ amplot
-+#PLOT_SUBDIRS = amplot
+ @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
+ @WANT_RESTORE_TRUE@RESTORE_SUBDIRS =  restore-src
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+-@WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
++# PLOT_SUBDIRS =  amplot
  # order is significant, don't change it arbitrarily
- SUBDIRS = \
- 	config \
-@@ -169,13 +169,10 @@
- 	$(RESTORE_SUBDIRS) \
- 	$(RECOVER_SUBDIRS) \
- 	$(PLOT_SUBDIRS) \
--	man docs example
-+	man
+ SUBDIRS =  	config 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
  
- 
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
-+pkgdata_DATA =
- 
- 
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -443,11 +440,11 @@
+@@ -381,11 +381,11 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index 15d50cbaf8e..5d3a9d89c08 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2001/01/16 21:59:32 cjones Exp $
+$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- man/Makefile.in.orig	Thu Jan 11 14:35:21 2001
-+++ man/Makefile.in	Thu Jan 11 14:35:42 2001
-@@ -149,7 +149,7 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 21:52:30 2001
+@@ -146,7 +146,7 @@
  
  transform = s,x,x,;
  
--@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = @WANT_AMPLOT_TRUE@amplot.8
+-@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
 +#AMPLOT_MAN_PAGES = amplot.8
  
  COMMON_MAN_PAGES = amanda.8
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 14d42e4a129..43e71f2943e 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,27 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2001/01/16 21:59:33 cjones Exp $
+$NetBSD: patch-ab,v 1.3 2001/06/26 03:14:12 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Mon Jan 15 16:32:14 2001
-@@ -162,20 +162,14 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 23:00:36 2001
+@@ -157,10 +157,10 @@
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+ @WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
  # 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
+-SUBDIRS =  	config 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
++SUBDIRS =  	config 	$(CLIENT_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man
  
  
--pkgdata_DATA = \
--	COPYRIGHT			\
--	COPYRIGHT-APACHE		\
--	COPYRIGHT-REGEX
+-pkgdata_DATA =  	COPYRIGHT				COPYRIGHT-APACHE			COPYRIGHT-REGEX
 +pkgdata_DATA =
  
  
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
+ EXTRA_DIST = $(SNAPSHOT_STAMP) 	$(pkgdata_DATA)				contrib/README				contrib/dbbackup.README			contrib/dbbackup.ksh			contrib/dbbackup.sql			contrib/dbbackup.tcl			contrib/set_prod_link.pl		contrib/sst/Makefile			contrib/sst/README			contrib/sst/README.Amanda		contrib/sst/sst.c			contrib/sst/sst.conf			contrib/sst/sst_def.h			contrib/sst/sstest.c			patches/regex-3.6alpha.patch		patches/samba-largefs.patch		patches/tar-1.12.patch			regex-src/COPYRIGHT			regex-src/Makefile 			regex-src/README			regex-src/WHATSNEW 			regex-src/cclass.h			regex-src/cname.h			regex-src/debug.c			regex-src/engine.c			regex-src/main.c			regex-src/mkh				regex-src/regcomp.c			regex-src/regerror.c			regex-src/regex.3			regex-src/regex.7			regex-src/regex2.h			regex-src/regexec.c			regex-src/regfree.c			regex-src/split.c			regex-src/tests				regex-src/utils.h			regex-src/fake/limits.h			regex-src/fake/memmove.c		regex-src/fake/stdlib.h
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 8bd4ac39014..540b209692e 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,17 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2001/01/16 21:59:33 cjones Exp $
+$NetBSD: patch-ac,v 1.3 2001/06/26 03:14:12 christos Exp $
 
---- man/Makefile.in~	Sat Nov 25 07:02:01 2000
-+++ man/Makefile.in	Mon Jan 15 16:31:20 2001
-@@ -176,11 +176,7 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 23:02:22 2001
+@@ -159,7 +159,7 @@
  # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8
  
--man_MANS = $(AMPLOT_MAN_PAGES) \
--	   $(COMMON_MAN_PAGES) \
--	   $(SERVER_MAN_PAGES) \
--	   $(RECOVER_MAN_PAGES) \
--	   $(RESTORE_MAN_PAGES)
+-man_MANS = $(AMPLOT_MAN_PAGES) 	   $(COMMON_MAN_PAGES) 	   $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
 +man_MANS = $(AMPLOT_MAN_PAGES)
  
- subdir = man
  mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab
index 42fdd045345..9cb9037d670 100644
--- a/sysutils/amanda-server/patches/patch-ab
+++ b/sysutils/amanda-server/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/01/16 21:59:39 cjones Exp $
+$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- Makefile.in.orig	Sat Nov 25 07:01:53 2000
-+++ Makefile.in	Mon Jan 15 15:44:03 2001
-@@ -33,7 +33,7 @@
+--- Makefile.in.orig	Tue Apr  3 15:55:47 2001
++++ Makefile.in	Mon Jun 25 22:42:55 2001
+@@ -34,7 +34,7 @@
  
  DESTDIR =
  
@@ -11,20 +11,19 @@ $NetBSD: patch-ab,v 1.4 2001/01/16 21:59:39 cjones Exp $
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -154,7 +154,7 @@
+@@ -151,13 +151,13 @@
  ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
  
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = @WANT_CLIENT_TRUE@client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = @WANT_TAPE_TRUE@tape-src
-+#TAPE_SUBDIRS = #tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = @WANT_SERVER_TRUE@server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = @WANT_RESTORE_TRUE@ restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = @WANT_RECOVER_TRUE@ recover-src
-@@ -162,7 +162,6 @@
+ @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
+-@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
++#TAPE_SUBDIRS = tape-src
+ @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
+ @WANT_RESTORE_TRUE@RESTORE_SUBDIRS =  restore-src
+ @WANT_RECOVER_TRUE@RECOVER_SUBDIRS =  recover-src
+ @WANT_AMPLOT_TRUE@PLOT_SUBDIRS =  amplot
  # order is significant, don't change it arbitrarily
- SUBDIRS = \
- 	config \
--	common-src \
- 	$(CLIENT_SUBDIRS) \
- 	$(TAPE_SUBDIRS) \
- 	$(SERVER_SUBDIRS) \
+-SUBDIRS =  	config 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
++SUBDIRS =  	config 		$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
+ 
+ 
+ pkgdata_DATA =  	COPYRIGHT				COPYRIGHT-APACHE			COPYRIGHT-REGEX
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
index 5cdd157be31..e69b02de5d6 100644
--- a/sysutils/amanda-server/patches/patch-ad
+++ b/sysutils/amanda-server/patches/patch-ad
@@ -1,180 +1,173 @@
-$NetBSD: patch-ad,v 1.5 2001/01/16 21:59:39 cjones Exp $
+$NetBSD: patch-ad,v 1.6 2001/06/26 03:14:12 christos Exp $
 
---- server-src/Makefile.in.orig	Sat Nov 25 07:01:58 2000
-+++ server-src/Makefile.in	Mon Jan 15 14:18:34 2001
-@@ -180,9 +180,7 @@
+--- server-src/Makefile.in.orig	Tue Apr  3 15:55:46 2001
++++ server-src/Makefile.in	Mon Jun 25 22:49:20 2001
+@@ -175,7 +175,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- libamserver_a_SOURCES = $(libamserver_la_SOURCES)
- 
--LDADD = libamserver.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	libamserver.$(LIB_EXTENSION) 	../tape-src/libamtape.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = libamserver.$(LIB_EXTENSION)
  
  
  SUFFIXES = .sh .pl
-@@ -221,7 +219,7 @@
+@@ -210,7 +210,7 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I../config
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ -lamtape -lamanda
- libamserver_a_AR = $(AR) cru
  libamserver_a_LIBADD = 
- am_libamserver_a_OBJECTS =  amindex.$(OBJEXT) changer.$(OBJEXT) \
-@@ -247,136 +245,98 @@
- amadmin_SOURCES = amadmin.c
- amadmin_OBJECTS =  amadmin.$(OBJEXT)
- amadmin_LDADD = $(LDADD)
--amadmin_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amadmin_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amadmin_LDFLAGS = 
- amcheck_SOURCES = amcheck.c
- amcheck_OBJECTS =  amcheck.$(OBJEXT)
- amcheck_LDADD = $(LDADD)
--amcheck_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amcheck_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amcheck_LDFLAGS = 
- amcleanupdisk_SOURCES = amcleanupdisk.c
- amcleanupdisk_OBJECTS =  amcleanupdisk.$(OBJEXT)
- amcleanupdisk_LDADD = $(LDADD)
--amcleanupdisk_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+ libamserver_a_OBJECTS =  amindex.$(OBJEXT) changer.$(OBJEXT) \
+ clock.$(OBJEXT) conffile.$(OBJEXT) diskfile.$(OBJEXT) \
+@@ -232,131 +232,93 @@
+ 
+ diskfile_OBJECTS =  diskfile.test.$(OBJEXT)
+ diskfile_LDADD = $(LDADD)
+-diskfile_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amcleanupdisk_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amcleanupdisk_LDFLAGS = 
- amflush_SOURCES = amflush.c
- amflush_OBJECTS =  amflush.$(OBJEXT)
- amflush_LDADD = $(LDADD)
--amflush_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
++diskfile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
+ diskfile_LDFLAGS = 
+ conffile_OBJECTS =  conffile.test.$(OBJEXT)
+ conffile_LDADD = $(LDADD)
+-conffile_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amflush_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amflush_LDFLAGS = 
- am_amgetconf_OBJECTS =  getconf.$(OBJEXT)
- amgetconf_OBJECTS =  $(am_amgetconf_OBJECTS)
- amgetconf_LDADD = $(LDADD)
--amgetconf_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
++conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ conffile_LDFLAGS = 
+ infofile_OBJECTS =  infofile.test.$(OBJEXT)
+ infofile_LDADD = $(LDADD)
+-infofile_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amgetconf_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amgetconf_LDFLAGS = 
- am_amindexd_OBJECTS =  amindexd.$(OBJEXT) disk_history.$(OBJEXT) \
++infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ infofile_LDFLAGS = 
+ amindexd_OBJECTS =  amindexd.$(OBJEXT) disk_history.$(OBJEXT) \
  list_dir.$(OBJEXT)
- amindexd_OBJECTS =  $(am_amindexd_OBJECTS)
  amindexd_LDADD = $(LDADD)
--amindexd_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-amindexd_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amindexd_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  amindexd_LDFLAGS = 
- amlabel_SOURCES = amlabel.c
- amlabel_OBJECTS =  amlabel.$(OBJEXT)
- amlabel_LDADD = $(LDADD)
--amlabel_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amlabel_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amlabel_LDFLAGS = 
  amlogroll_SOURCES = amlogroll.c
  amlogroll_OBJECTS =  amlogroll.$(OBJEXT)
  amlogroll_LDADD = $(LDADD)
--amlogroll_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-amlogroll_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amlogroll_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  amlogroll_LDFLAGS = 
- am_amreport_OBJECTS =  reporter.$(OBJEXT)
- amreport_OBJECTS =  $(am_amreport_OBJECTS)
- amreport_LDADD = $(LDADD)
--amreport_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amreport_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amreport_LDFLAGS = 
- amtape_SOURCES = amtape.c
- amtape_OBJECTS =  amtape.$(OBJEXT)
- amtape_LDADD = $(LDADD)
--amtape_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtape_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- amtape_LDFLAGS = 
  amtrmidx_SOURCES = amtrmidx.c
  amtrmidx_OBJECTS =  amtrmidx.$(OBJEXT)
  amtrmidx_LDADD = $(LDADD)
--amtrmidx_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-amtrmidx_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmidx_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  amtrmidx_LDFLAGS = 
  amtrmlog_SOURCES = amtrmlog.c
  amtrmlog_OBJECTS =  amtrmlog.$(OBJEXT)
  amtrmlog_LDADD = $(LDADD)
--amtrmlog_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-amtrmlog_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmlog_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  amtrmlog_LDFLAGS = 
- am_conffile_OBJECTS =  conffile.test.$(OBJEXT)
- conffile_OBJECTS =  $(am_conffile_OBJECTS)
- conffile_LDADD = $(LDADD)
--conffile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+conffile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- conffile_LDFLAGS = 
- am_diskfile_OBJECTS =  diskfile.test.$(OBJEXT)
- diskfile_OBJECTS =  $(am_diskfile_OBJECTS)
- diskfile_LDADD = $(LDADD)
--diskfile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+diskfile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- diskfile_LDFLAGS = 
  driver_SOURCES = driver.c
  driver_OBJECTS =  driver.$(OBJEXT)
  driver_LDADD = $(LDADD)
--driver_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-driver_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+driver_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  driver_LDFLAGS = 
  dumper_SOURCES = dumper.c
  dumper_OBJECTS =  dumper.$(OBJEXT)
  dumper_LDADD = $(LDADD)
--dumper_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-dumper_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+dumper_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  dumper_LDFLAGS = 
- am_infofile_OBJECTS =  infofile.test.$(OBJEXT)
- infofile_OBJECTS =  $(am_infofile_OBJECTS)
- infofile_LDADD = $(LDADD)
--infofile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+infofile_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
- infofile_LDFLAGS = 
  planner_SOURCES = planner.c
  planner_OBJECTS =  planner.$(OBJEXT)
  planner_LDADD = $(LDADD)
--planner_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-planner_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
 +planner_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
  planner_LDFLAGS = 
  taper_SOURCES = taper.c
  taper_OBJECTS =  taper.$(OBJEXT)
  taper_LDADD = $(LDADD)
--taper_DEPENDENCIES =  libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
+-taper_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
-+taper_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
++taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
  taper_LDFLAGS = 
+ amcleanupdisk_SOURCES = amcleanupdisk.c
+ amcleanupdisk_OBJECTS =  amcleanupdisk.$(OBJEXT)
+ amcleanupdisk_LDADD = $(LDADD)
+-amcleanupdisk_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amcleanupdisk_LDFLAGS = 
+ amadmin_SOURCES = amadmin.c
+ amadmin_OBJECTS =  amadmin.$(OBJEXT)
+ amadmin_LDADD = $(LDADD)
+-amadmin_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amadmin_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
+ amadmin_LDFLAGS = 
+ amcheck_SOURCES = amcheck.c
+ amcheck_OBJECTS =  amcheck.$(OBJEXT)
+ amcheck_LDADD = $(LDADD)
+-amcheck_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amcheck_DEPENDENCIES =  libamserver.$(LIB_EXTENSION)
+ amcheck_LDFLAGS = 
+ amflush_SOURCES = amflush.c
+ amflush_OBJECTS =  amflush.$(OBJEXT)
+ amflush_LDADD = $(LDADD)
+-amflush_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amflush_LDFLAGS = 
+ amgetconf_OBJECTS =  getconf.$(OBJEXT)
+ amgetconf_LDADD = $(LDADD)
+-amgetconf_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amgetconf_LDFLAGS = 
+ amlabel_SOURCES = amlabel.c
+ amlabel_OBJECTS =  amlabel.$(OBJEXT)
+ amlabel_LDADD = $(LDADD)
+-amlabel_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amlabel_LDFLAGS = 
+ amtape_SOURCES = amtape.c
+ amtape_OBJECTS =  amtape.$(OBJEXT)
+ amtape_LDADD = $(LDADD)
+-amtape_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amtape_LDFLAGS = 
+ amreport_OBJECTS =  reporter.$(OBJEXT)
+ amreport_LDADD = $(LDADD)
+-amreport_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
+-../common-src/libamanda.$(LIB_EXTENSION)
++amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
+ amreport_LDFLAGS = 
  SCRIPTS =  $(sbin_SCRIPTS)
  
diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae
index b93b23a662f..b4953f66099 100644
--- a/sysutils/amanda-server/patches/patch-ae
+++ b/sysutils/amanda-server/patches/patch-ae
@@ -1,28 +1,27 @@
-$NetBSD: patch-ae,v 1.4 2001/01/16 21:59:40 cjones Exp $
+$NetBSD: patch-ae,v 1.5 2001/06/26 03:14:12 christos Exp $
 
---- changer-src/Makefile.in.orig	Sat Nov 25 07:01:58 2000
-+++ changer-src/Makefile.in	Mon Jan 15 14:14:51 2001
-@@ -161,9 +161,7 @@
- 			chg-zd-mtx
+--- changer-src/Makefile.in.orig	Tue Apr  3 15:55:43 2001
++++ changer-src/Makefile.in	Mon Jun 25 22:51:37 2001
+@@ -163,7 +163,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- 
--LDADD = ../server-src/libamserver.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	../server-src/libamserver.$(LIB_EXTENSION) 	../tape-src/libamtape.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
  
  
  SUFFIXES = .pl .sh
-@@ -195,10 +193,8 @@
+@@ -191,11 +191,8 @@
+ scsi-irix.$(OBJEXT) scsi-linux.$(OBJEXT) scsi-solaris.$(OBJEXT) \
  scsi-bsd.$(OBJEXT)
- chg_scsi_OBJECTS =  $(am_chg_scsi_OBJECTS)
  chg_scsi_LDADD = $(LDADD)
--chg_scsi_DEPENDENCIES =  ../server-src/libamserver.$(LIB_EXTENSION) \
+-chg_scsi_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-../server-src/libamserver.$(LIB_EXTENSION) \
 -../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
 -chg_scsi_LDFLAGS = 
-+chg_scsi_DEPENDENCIES =  ../server-src/libamserver.$(LIB_EXTENSION)
++chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION) 
 +chg_scsi_LDFLAGS = -lamanda -lamtape
- am_chg_scsi_chio_OBJECTS =  chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
+ chg_scsi_chio_OBJECTS =  chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
  scsi-chio.$(OBJEXT)
- chg_scsi_chio_OBJECTS =  $(am_chg_scsi_chio_OBJECTS)
+ chg_scsi_chio_LDADD = $(LDADD)
diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai
index b7f5959e863..c34afe8f6d5 100644
--- a/sysutils/amanda-server/patches/patch-ai
+++ b/sysutils/amanda-server/patches/patch-ai
@@ -1,31 +1,32 @@
-$NetBSD: patch-ai,v 1.3 2001/01/16 21:59:40 cjones Exp $
+$NetBSD: patch-ai,v 1.4 2001/06/26 03:14:12 christos Exp $
 
---- restore-src/Makefile.in.orig	Sat Nov 25 07:01:59 2000
-+++ restore-src/Makefile.in	Mon Jan 15 14:54:31 2001
-@@ -156,8 +156,7 @@
+--- restore-src/Makefile.in.orig	Tue Apr  3 15:55:46 2001
++++ restore-src/Makefile.in	Mon Jun 25 22:53:37 2001
+@@ -160,7 +160,7 @@
+ # routines, and second to pick up any references in the other libraries.
+ ###
  
- libexec_PROGRAMS = amidxtaped
- 
--LDADD = ../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
+-LDADD = ../common-src/libamanda.$(LIB_EXTENSION) 	../tape-src/libamtape.$(LIB_EXTENSION) 	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = -lamtape -lamanda
  
  
  amidxtaped_SOURCES = amidxtaped.c
-@@ -177,14 +176,12 @@
- am_amidxtaped_OBJECTS =  amidxtaped.$(OBJEXT)
- amidxtaped_OBJECTS =  $(am_amidxtaped_OBJECTS)
+@@ -178,16 +178,12 @@
+ LIBS = @LIBS@
+ amidxtaped_OBJECTS =  amidxtaped.$(OBJEXT)
  amidxtaped_LDADD = $(LDADD)
--amidxtaped_DEPENDENCIES =  ../tape-src/libamtape.$(LIB_EXTENSION) \
+-amidxtaped_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
 +amidxtaped_DEPENDENCIES = 
  amidxtaped_LDFLAGS = 
  amrestore_SOURCES = amrestore.c
  amrestore_OBJECTS =  amrestore.$(OBJEXT)
  amrestore_LDADD = $(LDADD)
--amrestore_DEPENDENCIES =  ../tape-src/libamtape.$(LIB_EXTENSION) \
+-amrestore_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
+-../tape-src/libamtape.$(LIB_EXTENSION) \
 -../common-src/libamanda.$(LIB_EXTENSION)
 +amrestore_DEPENDENCIES = 
  amrestore_LDFLAGS = 
+ CFLAGS = @CFLAGS@
  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-server/patches/patch-al b/sysutils/amanda-server/patches/patch-al
index 7e6e67ce00c..e82d941fd6c 100644
--- a/sysutils/amanda-server/patches/patch-al
+++ b/sysutils/amanda-server/patches/patch-al
@@ -1,12 +1,13 @@
-$NetBSD: patch-al,v 1.1 2001/01/16 21:59:40 cjones Exp $
+$NetBSD: patch-al,v 1.2 2001/06/26 03:14:12 christos Exp $
 
---- man/Makefile.in~	Sat Nov 25 07:02:01 2000
-+++ man/Makefile.in	Mon Jan 15 17:07:08 2001
-@@ -177,7 +177,6 @@
+--- man/Makefile.in.orig	Tue Apr  3 15:55:45 2001
++++ man/Makefile.in	Mon Jun 25 22:54:40 2001
+@@ -159,7 +159,7 @@
+ # not autoconf-generated:
  EXTRA_DIST = amplot.8 amrestore.8 amtape.8
  
- man_MANS = $(AMPLOT_MAN_PAGES) \
--	   $(COMMON_MAN_PAGES) \
- 	   $(SERVER_MAN_PAGES) \
- 	   $(RECOVER_MAN_PAGES) \
- 	   $(RESTORE_MAN_PAGES)
+-man_MANS = $(AMPLOT_MAN_PAGES) 	   $(COMMON_MAN_PAGES) 	   $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
++man_MANS = $(AMPLOT_MAN_PAGES) 	   $(SERVER_MAN_PAGES) 	   $(RECOVER_MAN_PAGES) 	   $(RESTORE_MAN_PAGES)
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h