Update the amanda packages to 2.4.4p2. From Paul Shupak in pkg/24550,

with some additionnal fixes by me.

5 files changed, 43 insertions, 70 deletions

diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index f4f596fe002..c9090ae94ef 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,19 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2001/06/26 03:14:12 christos Exp $
+$NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $
 
---- 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 = 
+--- client-src/Makefile.in.orig	2004-01-08 10:22:34.000000000 -0800
++++ client-src/Makefile.in	2004-02-23 16:26:20.000000000 -0800
+@@ -307,10 +307,8 @@
+ sendsize_LDFLAGS =
  versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS =  versionsuffix.$(OBJEXT)
+ versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES =  ../common-src/libamanda.$(LIB_EXTENSION) \
--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_S:RIPTS) $(sbin_SCRIPTS)
+ versionsuffix_LDFLAGS =
+ SCRIPTS = $(libexec_SCRIPTS) $(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 922dee6dd84..c91b5def0b3 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,32 +1,36 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
+$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 
---- Makefile.in.orig	Tue Apr  3 15:55:47 2001
-+++ Makefile.in	Mon Jun 25 21:50:51 2001
-@@ -151,11 +151,11 @@
+--- Makefile.in.orig	2004-01-08 10:21:29.000000000 -0800
++++ Makefile.in	2004-02-23 16:30:27.000000000 -0800
+@@ -33,7 +33,7 @@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
+@@ -160,11 +160,11 @@
  ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
  
  @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
-+# PLOT_SUBDIRS =  amplot
+ @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 	common-src 	$(CLIENT_SUBDIRS) 	$(TAPE_SUBDIRS) 	$(SERVER_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man docs example
+ SUBDIRS = \
+ 	config \
+@@ -175,7 +175,7 @@
+ 	$(RESTORE_SUBDIRS) \
+ 	$(RECOVER_SUBDIRS) \
+ 	$(PLOT_SUBDIRS) \
+-	man docs example
++	man
  
-@@ -381,11 +381,11 @@
- install-exec-am:
- install-exec: install-exec-recursive
  
--install-data-am: install-pkgdataDATA
-+#install-data-am: install-pkgdataDATA
- install-data: install-data-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install: install-recursive
- uninstall-am: uninstall-pkgdataDATA
- uninstall: uninstall-recursive
+ pkgdata_DATA = \
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index 5d3a9d89c08..6bb89a5211f 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,13 +1,10 @@
-$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:12 christos Exp $
+$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 
---- 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,;
+--- man/Makefile.in.orig	2004-01-08 10:23:42.000000000 -0800
++++ man/Makefile.in	2004-02-23 16:32:57.000000000 -0800
+@@ -156,5 +156,5 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
  
 -@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
 +#AMPLOT_MAN_PAGES = amplot.8
- 
- COMMON_MAN_PAGES = amanda.8
- 
diff --git a/sysutils/amanda-common/patches/patch-ba b/sysutils/amanda-common/patches/patch-ba
deleted file mode 100644
index 9cd5764a8de..00000000000
--- a/sysutils/amanda-common/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2001/03/15 20:08:46 mjl Exp $
-
---- common-src/token.h.orig	Thu Mar 15 20:30:31 2001
-+++ common-src/token.h	Thu Mar 15 20:30:43 2001
-@@ -42,7 +42,7 @@
- extern char *quotef P((char *sep, char *format, ...));
- extern char *quote P((char *sep, char *str));
- extern char *rxquote P((char *str));
--extern char *shquote P((char *str));
-+extern char *am_shquote P((char *str));
- extern int table_lookup P((table_t *table, char *str));
- extern char *table_lookup_r P((table_t *table, int val));
- 
diff --git a/sysutils/amanda-common/patches/patch-bb b/sysutils/amanda-common/patches/patch-bb
deleted file mode 100644
index 51635532dd7..00000000000
--- a/sysutils/amanda-common/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/03/15 20:08:46 mjl Exp $
-
---- common-src/token.c.orig	Thu Mar 15 20:30:23 2001
-+++ common-src/token.c	Thu Mar 15 20:30:56 2001
-@@ -295,7 +295,7 @@
- }
- 
- /* Quote a string so that it can be safely passed to a shell */
--char *shquote(str)
-+char *am_shquote(str)
- char *str;	/* the string to quote */
- {
-     char *pi, *po;