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

with some additionnal fixes by me.

4 files changed, 38 insertions, 29 deletions

diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 8f1cb1bfaf5..89f894cd34b 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/05/04 03:40:50 snj Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/12 18:45:25 bouyer Exp $
 #
 
-DISTNAME=		amanda-2.4.2p2
-PKGNAME=		amanda-plot-2.4.2p2
+DISTNAME=		amanda-2.4.4p2
+PKGNAME=		amanda-plot-2.4.4p2
 SVR4_PKGNAME=		amapl
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.cs.umd.edu/pub/amanda/
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=		amanda-server-2.4.2p2:../../sysutils/amanda-server
+DEPENDS+=		amanda-server-2.4.4p2:../../sysutils/amanda-server
 
 USE_BUILDLINK3=		yes
 
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
index 9462569f444..7d70fd73f65 100644
--- a/sysutils/amanda-plot/distinfo
+++ b/sysutils/amanda-plot/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 03:15:17 christos Exp $
+$NetBSD: distinfo,v 1.4 2004/05/12 18:45:25 bouyer Exp $
 
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = 12ff93eea6d9f443ce2f236492d9e0362fd2d9ff
-SHA1 (patch-ab) = ff753e70a41d53ce296001a346fd7093312f31b4
-SHA1 (patch-ac) = 74dadd333fefc4d244d50b52b4a16c6b0df1fbba
+SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
+Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
+SHA1 (patch-ab) = c6b1ab0f273a2832abe57b97cb63b96fd76e633d
+SHA1 (patch-ac) = 9b4fda0170f16a50220d751f69045c91b1eba4c4
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 43e71f2943e..0166496a270 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,17 +1,25 @@
-$NetBSD: patch-ab,v 1.3 2001/06/26 03:14:12 christos Exp $
-
---- 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
+--- Makefile.in.orig	2004-01-08 10:21:29.000000000 -0800
++++ Makefile.in	2004-02-24 08:26:13.000000000 -0800
+@@ -168,20 +168,14 @@
  # 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 	$(CLIENT_SUBDIRS) 	$(RESTORE_SUBDIRS) 	$(RECOVER_SUBDIRS) 	$(PLOT_SUBDIRS) 	man
+ 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 = \
+-	COPYRIGHT			\
+-	COPYRIGHT-APACHE		\
+-	COPYRIGHT-REGEX
 +pkgdata_DATA =
  
  
- 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
+ EXTRA_DIST = $(SNAPSHOT_STAMP) \
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 540b209692e..fc2b6f214b2 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2001/06/26 03:14:12 christos Exp $
-
---- 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 @@
+--- man/Makefile.in.orig	2004-01-08 10:23:42.000000000 -0800
++++ man/Makefile.in	2004-02-24 08:15:51.000000000 -0800
+@@ -188,11 +188,7 @@
  # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
+ EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.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