Update amanda to 2.4.4p4

Bug fix release and minor improvements: new chg-iomega changer script. amanda will not use a tape if it's label is not in the tapelist file. amflush.c: Don't start a driver if nothing to flush. amadmin.c: Call check_dumpuser() as soon as posible. amadmin.c: Don't core dump if DUMPCYLE is too big. dumper.c: Parse warning message.
author: mjl <mjl@pkgsrc.org> 2004-11-12 12:13:44 +0000
committer: mjl <mjl@pkgsrc.org> 2004-11-12 12:13:44 +0000
commit: 834bb01177eadc51b02f3f931f83c01d8b4cbbfd (patch)
tree: d1f225724e77f6dc963c4d3de1ea6f57cc98e737 /sysutils
parent: 579916c06bf3b14d589bf41405c321f846658790 (diff)
download: pkgsrc-834bb01177eadc51b02f3f931f83c01d8b4cbbfd.tar.gz
36 files changed, 318 insertions, 929 deletions
diff --git a/sysutils/amanda-client/DESCR b/sysutils/amanda-client/DESCR
index ae3624e07a0..5ead5bbac60 100644
--- a/sysutils/amanda-client/DESCR
+++ b/sysutils/amanda-client/DESCR
@@ -1,180 +1,4 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it.  This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you.  Amanda development is
-unfunded - the development team maintains the code in their spare time.  As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists.  See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
 This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive. 
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, GNU Tar
-    and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours.
-  * does simple tape management: will not overwrite the wrong tape.
-  * supports tape changers via a generic interface.  Easily customizable to
-    any type of tape carousel, robot, or stacker that can be controlled via
-    the unix command line.
-  * supports Kerberos 4 security, including encrypted dumps.  The Kerberos
-    support is available as a separate add-on package, see the file
-    KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
-    package, for more details.
-  * for a restore, tells you what tapes you need, and finds the proper
-    backup image on the tape for you.
-  * recovers gracefully from errors, including down or hung machines.
-  * reports results, including all errors in detail, in email.
-  * will dynamically adjust backup schedule to keep within constraints: no
-    more juggling by hand when adding disks and computers to network.
-  * includes a pre-run checker program, that conducts sanity checks on both
-    the tape server host and all the client hosts (in parallel), and will
-    send an e-mail report of any problems that could cause the backups to
-    fail.
-  * can compress dumps before sending or after sending over the net, with
-    either compress or gzip.
-  * can optionally synchronize with external backups, for those large
-    timesharing computers where you want to do full dumps when the system
-    is down in single-user mode (since BSD dump is not reliable on active
-    filesystems): Amanda will still do your daily dumps.
-  * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host".  All the computers you are going to dump
-are the "backup client hosts".  The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished.  Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive.  Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions.  For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk.  On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk.  Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time.  If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.0 has been compiled, and the client side tested
-on the following systems:
-	AIX 3.2 and 4.1
-	BSDI BSD/OS 2.1 and 3.1
-	DEC OSF/1 3.2 and 4.0
-	FreeBSD 2.2.5
-	IRIX 5.2 and 6.3
-	Linux/GNU on x86, alpha and sparc
-	NetBSD 1.0
-	Nextstep 3 (*)
-	SunOS 4.1.x (x >= 1) and 5.[56]
-	Ultrix 4.2
-	HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.0 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda.  The latest version at the time
-of this writing is available at:
-
-	ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL.  There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
-    docs/INSTALL	contains general installation instructions.
-    docs/SYSTEM.NOTES	contains system-specific information.
-    docs/FAQ            contains answers to frequently asked questions.
-    docs/KERBEROS	explains installation under Kerberos 4.
-    docs/TAPE.CHANGERS	explains how to customize the changer interface.
-    docs/WHATS.NEW	details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is.  However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list.  Send
-    mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
-    with the following line in the body of the message:
-	subscribe <listname> <your-email-address>
-
-
-    amanda-announce
-        The amanda-announce mailing list is for important announcements
-        related to the Amanda Network Backup Manager package, including new
-        versions, contributions, and fixes.  NOTE: the amanda-users list is
-        itself on the amanda-announce distribution, so you only need to
-        subscribe to one of the two lists, not both.
-	To subscribe, send a message to amanda-announce-request@amanda.org.
-
-    amanda-users
-        The amanda-users mailing list is for questions and general discussion
-        about the Amanda Network Backup Manager.  This package and related
-        files are available via anonymous FTP from ftp.amanda.org in the
-        pub/amanda directory.  NOTE: the amanda-users list is itself on the
-        amanda-announce distribution, so you only need to subscribe to one of
-        the two lists, not both.
-	To subscribe, send a message to amanda-users-request@amanda.org.
-
-    amanda-hackers
-        The amanda-hackers mailing list is for discussion of the
-        technical details of the Amanda package, including extensions,
-        ports, bugs, fixes, and alpha testing of new versions.
-	To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index ad644acb336..f3bb5d6f431 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2004/10/05 15:51:00 seb Exp $
+# $NetBSD: Makefile,v 1.37 2004/11/12 12:13:44 mjl Exp $
 #
 
 PKGNAME=		amanda-client-${VERS}
-PKGREVISION=		1
+# PKGREVISION=		1
 SVR4_PKGNAME=		amacl
 
 COMMENT=		Client part of Amanda, a network backup system
diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo
index 539e585294e..19a35ee5860 100644
--- a/sysutils/amanda-client/distinfo
+++ b/sysutils/amanda-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2004/11/12 12:13:44 mjl Exp $
 
-SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
-Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
-SHA1 (patch-aa) = afe34fae1d76f6adc7a48104a9a30fe12a4de925
-SHA1 (patch-ab) = 87c985ce2195c5305baa8b62f6fee26a07b99bd9
-SHA1 (patch-ac) = 90f21b449315f77f3933e0bf9b6fdd0f21320676
-SHA1 (patch-ad) = fa41e5ec65414bc0c68f51c0b892a374a16351e5
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+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
diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa
index ccdc82ce35e..0eafb0c9125 100644
--- a/sysutils/amanda-client/patches/patch-aa
+++ b/sysutils/amanda-client/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-aa,v 1.6 2004/11/12 12:13:44 mjl Exp $
 
---- Makefile.in.orig	2004-01-08 19:21:29.000000000 +0100
-+++ Makefile.in	2004-05-12 15:21:00.000000000 +0200
-@@ -168,20 +168,16 @@
+--- 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
  SUBDIRS = \
  	config \
@@ -16,16 +16,15 @@ $NetBSD: patch-aa,v 1.5 2004/05/12 18:45:25 bouyer Exp $
 -	man docs example
 +	man
  
- 
 -pkgdata_DATA = \
 -	COPYRIGHT			\
 -	COPYRIGHT-APACHE		\
 -	COPYRIGHT-REGEX
 +pkgdata_DATA =
  
- 
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -506,7 +502,7 @@
+ 	$(pkgdata_DATA)			\
+@@ -676,7 +672,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
index 0b4b7d5ba4b..27cec6a2659 100644
--- a/sysutils/amanda-client/patches/patch-ab
+++ b/sysutils/amanda-client/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:44 mjl Exp $
 
---- man/Makefile.in.orig	2004-01-08 10:23:42.000000000 -0800
-+++ man/Makefile.in	2004-02-23 10:00:21.000000000 -0800
-@@ -188,9 +188,7 @@
+--- 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 @@
+ 
  # 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) \
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
index cdf70b81f88..5ee3c27a123 100644
--- a/sysutils/amanda-client/patches/patch-ac
+++ b/sysutils/amanda-client/patches/patch-ac
@@ -1,19 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:44 mjl Exp $
 
---- client-src/Makefile.in.orig	2004-01-08 10:22:34.000000000 -0800
-+++ client-src/Makefile.in	2004-02-23 12:42:44.000000000 -0800
-@@ -184,9 +184,7 @@
- # 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
- 
- 
- SUFFIXES = .sh .pl
-@@ -237,80 +235,58 @@
+--- 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)
@@ -21,7 +10,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amandad_LDFLAGS =
  amqde_SOURCES = amqde.c
  amqde_OBJECTS = amqde.$(OBJEXT)
  amqde_LDADD = $(LDADD)
@@ -29,7 +17,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amqde_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amqde_LDFLAGS =
  calcsize_SOURCES = calcsize.c
  calcsize_OBJECTS = calcsize.$(OBJEXT)
  calcsize_LDADD = $(LDADD)
@@ -37,7 +24,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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)
@@ -45,7 +31,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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)
@@ -53,15 +38,13 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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 = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION) 
- rundump_LDFLAGS =
++rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
  runtar_SOURCES = runtar.c
  runtar_OBJECTS = runtar.$(OBJEXT)
  runtar_LDADD = $(LDADD)
@@ -69,7 +52,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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)
@@ -77,7 +59,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- selfcheck_LDFLAGS =
  am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
  	sendbackup-gnutar.$(OBJEXT)
  sendbackup_OBJECTS = $(am_sendbackup_OBJECTS)
@@ -86,7 +67,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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)
@@ -94,7 +74,6 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	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)
@@ -102,6 +81,17 @@ $NetBSD: patch-ac,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 -	libamclient.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
+ libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
+@@ -382,9 +360,7 @@
+ # 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
+ 
+ SUFFIXES = .sh .pl
  
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
index 8cb19cd4512..64ac61a6f94 100644
--- a/sysutils/amanda-client/patches/patch-ad
+++ b/sysutils/amanda-client/patches/patch-ad
@@ -1,8 +1,19 @@
-$NetBSD: patch-ad,v 1.6 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-ad,v 1.7 2004/11/12 12:13:44 mjl Exp $
 
---- recover-src/Makefile.in.orig	2004-01-08 10:23:34.000000000 -0800
-+++ recover-src/Makefile.in	2004-02-23 12:49:20.000000000 -0800
-@@ -172,10 +172,9 @@
+--- 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 @@
+ 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)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -291,10 +289,9 @@
  # need to list libamanda twice here, first to override the system library
  # routines, and second to pick up any references in the other libraries.
  ###
@@ -14,15 +25,4 @@ $NetBSD: patch-ad,v 1.6 2004/05/12 18:45:25 bouyer Exp $
 +	-lamanda \
  	$(READLINE_LIBS)
  
- 
-@@ -200,9 +199,7 @@
- 	uparse.$(OBJEXT) uscan.$(OBJEXT)
- amrecover_OBJECTS = $(am_amrecover_OBJECTS)
- amrecover_LDADD = $(LDADD)
--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_LDFLAGS =
- 
- DEFS = @DEFS@
+ amrecover_SOURCES = amrecover.c					\
diff --git a/sysutils/amanda-common/DESCR b/sysutils/amanda-common/DESCR
index 3b05399fba2..5ead5bbac60 100644
--- a/sysutils/amanda-common/DESCR
+++ b/sysutils/amanda-common/DESCR
@@ -1,38 +1,4 @@
-This is Amanda, the Advanced Maryland Automatic Network Disk
-Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, GNU Tar
-    and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours.
-  * does simple tape management: will not overwrite the wrong tape.
-  * supports tape changers via a generic interface.  Easily customizable to
-    any type of tape carousel, robot, or stacker that can be controlled via
-    the unix command line.
-  * supports Kerberos 4 security, including encrypted dumps.  The Kerberos
-    support is available as a separate add-on package, see the file
-    KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
-    package, for more details.
-  * for a restore, tells you what tapes you need, and finds the proper
-    backup image on the tape for you.
-  * recovers gracefully from errors, including down or hung machines.
-  * reports results, including all errors in detail, in email.
-  * will dynamically adjust backup schedule to keep within constraints: no
-    more juggling by hand when adding disks and computers to network.
-  * includes a pre-run checker program, that conducts sanity checks on both
-    the tape server host and all the client hosts (in parallel), and will
-    send an e-mail report of any problems that could cause the backups to
-    fail.
-  * can compress dumps before sending or after sending over the net, with
-    either compress or gzip.
-  * can optionally synchronize with external backups, for those large
-    timesharing computers where you want to do full dumps when the system
-    is down in single-user mode (since BSD dump is not reliable on active
-    filesystems): Amanda will still do your daily dumps.
-  * lots of other options; Amanda is very configurable.
+This is a release of Amanda, the Advanced Maryland Automatic
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index e4c85c6db7a..25f3fc15304 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.31 2004/11/12 12:13:44 mjl Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
 PKGNAME=		amanda-common-${VERS}
-PKGREVISION=		1
+# PKGREVISION=		1
 SVR4_PKGNAME=		amaco
 
 COMMENT=		Common libraries and binaries for Amanda
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 52111c31b51..93b045ad5db 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2004/05/12 18:45:25 bouyer Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/11/12 12:13:44 mjl Exp $
 #
 # common make file fragment shared by all amanda-* pkgs.
 #
 
-VERS=                   2.4.4p2
+VERS=                   2.4.4p4
 DISTNAME?=              amanda-${VERS}
 CATEGORIES=             sysutils
 MASTER_SITES?=          http://download.sourceforge.net/amanda/
diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
index 67d64a46518..9f61dab898e 100644
--- a/sysutils/amanda-common/buildlink3.mk
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/11/12 12:13:45 mjl Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
 BUILDLINK_PACKAGES+=	amanda-common
 
 .if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p2
-BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p2nb1
+BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.4p4
+BUILDLINK_RECOMMENDED.amanda-common+=	amanda-common>=2.4.4p4
 BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
 .endif	# AMANDA_COMMON_BUILDLINK3_MK
 
diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
index e69858a51c3..6dd521ff913 100644
--- a/sysutils/amanda-common/distinfo
+++ b/sysutils/amanda-common/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2004/07/09 12:21:26 salo Exp $
+$NetBSD: distinfo,v 1.6 2004/11/12 12:13:45 mjl Exp $
 
-SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
-Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
-SHA1 (patch-aa) = 6338b1e138ea34e2f9de27da3edf850c4923df5d
-SHA1 (patch-ab) = dae2eedc8672d7137cf528ca5e52462288a7241b
-SHA1 (patch-ac) = 2bd89830f652d74dc82d095affc7079060f7ce55
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
+SHA1 (patch-aa) = c03117e065da4fa3b7dce91c091d6cf044f884ea
+SHA1 (patch-ab) = 8a6233a38207d514e2671eac50e38996ee578530
+SHA1 (patch-ac) = 1c42e18ac4055fe7370acd5a00c126ab9d93f890
 SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd
-SHA1 (patch-ae) = 0aaaf8752727ace218668ab0cb14abad6f2e17ca
+SHA1 (patch-ae) = bcf887d6e1722cf27538cf9d1d190b5c749f587f
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
index c9090ae94ef..7161a5c9ac0 100644
--- a/sysutils/amanda-common/patches/patch-aa
+++ b/sysutils/amanda-common/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-aa,v 1.8 2004/11/12 12:13:45 mjl Exp $
 
---- 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 =
+--- client-src/Makefile.in.orig	2004-10-22 15:12:39.000000000 +0200
++++ client-src/Makefile.in	2004-11-07 13:17:17.000000000 +0100
+@@ -134,10 +134,8 @@
+ 	../common-src/libamanda.$(LIB_EXTENSION)
  versionsuffix_SOURCES = versionsuffix.c
  versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
 -versionsuffix_LDADD = $(LDADD)
@@ -12,6 +12,6 @@ $NetBSD: patch-aa,v 1.7 2004/05/12 18:45:25 bouyer Exp $
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
 +versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
+ libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
- 
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
index c91b5def0b3..c59e9e85dda 100644
--- a/sysutils/amanda-common/patches/patch-ab
+++ b/sysutils/amanda-common/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- 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
+--- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ Makefile.in	2004-11-07 13:23:31.000000000 +0100
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
-@@ -160,11 +160,11 @@
+@@ -269,11 +269,11 @@
+ LIBTOOL_M4I = $(srcdir)/config/libtool.m4i
  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
@@ -21,16 +21,16 @@ $NetBSD: patch-ab,v 1.6 2004/05/12 18:45:25 bouyer Exp $
  @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
  @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
 -@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
-+#PLOT_SUBDIRS = amplot
++# PLOT_SUBDIRS = amplot
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
  	config \
-@@ -175,7 +175,7 @@
+@@ -284,7 +284,7 @@
  	$(RESTORE_SUBDIRS) \
  	$(RECOVER_SUBDIRS) \
  	$(PLOT_SUBDIRS) \
 -	man docs example
 +	man
  
- 
  pkgdata_DATA = \
+ 	COPYRIGHT			\
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
index a11dad566f7..4375e1485b0 100644
--- a/sysutils/amanda-common/patches/patch-ac
+++ b/sysutils/amanda-common/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.7 2004/07/09 12:21:26 salo Exp $
+$NetBSD: patch-ac,v 1.8 2004/11/12 12:13:45 mjl Exp $
 
---- man/Makefile.in.orig	Thu Jan  8 19:23:42 2004
-+++ man/Makefile.in	Fri Jul  9 14:17:32 2004
-@@ -156,7 +156,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
+--- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ man/Makefile.in	2004-11-07 13:25:11.000000000 +0100
+@@ -253,7 +253,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
-+#AMPLOT_MAN_PAGES = amplot.8
- 
++# AMPLOT_MAN_PAGES = amplot.8
  COMMON_MAN_PAGES = amanda.8
- 
+ @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
+ @WANT_SERVER_TRUE@		   amcheck.8 \
diff --git a/sysutils/amanda-common/patches/patch-ae b/sysutils/amanda-common/patches/patch-ae
index 2eca1b57ca2..36953c18515 100644
--- a/sysutils/amanda-common/patches/patch-ae
+++ b/sysutils/amanda-common/patches/patch-ae
@@ -1,26 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2004/05/28 09:20:37 bouyer Exp $
+$NetBSD: patch-ae,v 1.5 2004/11/12 12:13:45 mjl Exp $
 
---- tape-src/Makefile.in.orig	2004-01-08 19:22:46.000000000 +0100
-+++ tape-src/Makefile.in	2004-05-12 14:35:59.000000000 +0200
-@@ -160,7 +160,7 @@
- lib_LTLIBRARIES = libamtape.la
- LIB_EXTENSION = la
- 
--sbin_PROGRAMS = ammt amdd amtapetype
-+sbin_PROGRAMS = 
- 
- libamtape_la_SOURCES = output-file.c \
- 			output-null.c \
-@@ -217,7 +217,7 @@
- 	output-tape.lo tapeio.lo
- libamtape_la_OBJECTS = $(am_libamtape_la_OBJECTS)
- EXTRA_PROGRAMS = amtapeio$(EXEEXT)
+--- tape-src/Makefile.in.orig	2004-10-22 15:12:42.000000000 +0200
++++ tape-src/Makefile.in	2004-11-07 13:26:54.000000000 +0100
+@@ -41,7 +41,7 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
 -sbin_PROGRAMS = ammt$(EXEEXT) amdd$(EXEEXT) amtapetype$(EXEEXT)
-+sbin_PROGRAMS = 
- PROGRAMS = $(sbin_PROGRAMS)
- 
- amdd_SOURCES = amdd.c
-@@ -519,7 +519,7 @@
++sbin_PROGRAMS =
+ EXTRA_PROGRAMS = $(am__EXEEXT_1)
+ subdir = tape-src
+ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+@@ -622,7 +622,7 @@
  
  install-data-am:
  
diff --git a/sysutils/amanda-plot/DESCR b/sysutils/amanda-plot/DESCR
index 97d0d402e6b..5ead5bbac60 100644
--- a/sysutils/amanda-plot/DESCR
+++ b/sysutils/amanda-plot/DESCR
@@ -1,181 +1,4 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it.  This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you.  Amanda development is
-unfunded - the development team maintains the code in their spare time.  As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists.  See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
 This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive. 
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, GNU Tar
-    and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours.
-  * does simple tape management: will not overwrite the wrong tape.
-  * supports tape changers via a generic interface.  Easily customizable to
-    any type of tape carousel, robot, or stacker that can be controlled via
-    the unix command line.
-  * supports Kerberos 4 security, including encrypted dumps.  The Kerberos
-    support is available as a separate add-on package, see the file
-    KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
-    package, for more details.
-  * for a restore, tells you what tapes you need, and finds the proper
-    backup image on the tape for you.
-  * recovers gracefully from errors, including down or hung machines.
-  * reports results, including all errors in detail, in email.
-  * will dynamically adjust backup schedule to keep within constraints: no
-    more juggling by hand when adding disks and computers to network.
-  * includes a pre-run checker program, that conducts sanity checks on both
-    the tape server host and all the client hosts (in parallel), and will
-    send an e-mail report of any problems that could cause the backups to
-    fail.
-  * can compress dumps before sending or after sending over the net, with
-    either compress or gzip.
-  * can optionally synchronize with external backups, for those large
-    timesharing computers where you want to do full dumps when the system
-    is down in single-user mode (since BSD dump is not reliable on active
-    filesystems): Amanda will still do your daily dumps.
-  * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host".  All the computers you are going to dump
-are the "backup client hosts".  The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished.  Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive.  Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions.  For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk.  On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk.  Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time.  If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
-	AIX 3.2 and 4.1
-	BSDI BSD/OS 2.1 and 3.1
-	DEC OSF/1 3.2 and 4.0
-	FreeBSD 2.2.5
-	IRIX 5.2 and 6.3
-	GNU/Linux on x86, alpha, sparc, arm and powerpc
-	NetBSD 1.0
-	Nextstep 3 (*)
-	OpenBSD 2.5 x86, sparc, etc (ports available)
-	SunOS 4.1.x (x >= 1) and 5.[567]
-	Ultrix 4.2
-	HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda.  The latest version at the time
-of this writing is available at:
-
-	ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL.  There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
-    docs/INSTALL	contains general installation instructions.
-    docs/SYSTEM.NOTES	contains system-specific information.
-    docs/FAQ            contains answers to frequently asked questions.
-    docs/KERBEROS	explains installation under Kerberos 4.
-    docs/TAPE.CHANGERS	explains how to customize the changer interface.
-    docs/WHATS.NEW	details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is.  However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list.  Send
-    mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
-    with the following line in the body of the message:
-	subscribe <listname> <your-email-address>
-
-
-    amanda-announce
-        The amanda-announce mailing list is for important announcements
-        related to the Amanda Network Backup Manager package, including new
-        versions, contributions, and fixes.  NOTE: the amanda-users list is
-        itself on the amanda-announce distribution, so you only need to
-        subscribe to one of the two lists, not both.
-	To subscribe, send a message to amanda-announce-request@amanda.org.
-
-    amanda-users
-        The amanda-users mailing list is for questions and general discussion
-        about the Amanda Network Backup Manager.  This package and related
-        files are available via anonymous FTP from ftp.amanda.org in the
-        pub/amanda directory.  NOTE: the amanda-users list is itself on the
-        amanda-announce distribution, so you only need to subscribe to one of
-        the two lists, not both.
-	To subscribe, send a message to amanda-users-request@amanda.org.
-
-    amanda-hackers
-        The amanda-hackers mailing list is for discussion of the
-        technical details of the Amanda package, including extensions,
-        ports, bugs, fixes, and alpha testing of new versions.
-	To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 14df1abd9b7..7fe1bf179c1 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/05 17:51:05 seb Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/12 12:13:45 mjl Exp $
 #
 
 PKGNAME=		amanda-plot-${VERS}
@@ -7,7 +7,7 @@ SVR4_PKGNAME=		amapl
 COMMENT=		Visualizes the behavior of Amanda, a network backup system
 
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+=		amanda-server-2.4.4p2{,nb[0-9]*}:../../sysutils/amanda-server
+DEPENDS+=		amanda-server-2.4.4p4{,nb[0-9]*}:../../sysutils/amanda-server
 
 USE_BUILDLINK3=		yes
 
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
index 0c2157f2e94..a554c65a4be 100644
--- a/sysutils/amanda-plot/distinfo
+++ b/sysutils/amanda-plot/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
-SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
-Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
 SHA1 (patch-aa) = 207efbc13033b10309d4194db7e180f50a53a76d
-SHA1 (patch-ab) = daa1d60888ec3e78eb4a88a4979f0a563e1a49f3
-SHA1 (patch-ac) = 44663863416fc81be5311c027482c494903a90b9
+SHA1 (patch-ab) = 9380ccd35cf3126e581ac72f34ad87d554395188
+SHA1 (patch-ac) = 04e2d7a595ee87b4c066f4fbef06f26799df71ce
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
index 450fdc14e2e..5e2411bca16 100644
--- a/sysutils/amanda-plot/patches/patch-ab
+++ b/sysutils/amanda-plot/patches/patch-ab
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- Makefile.in.orig	2004-01-08 19:21:29.000000000 +0100
-+++ Makefile.in	2004-05-15 14:05:39.000000000 +0200
-@@ -168,20 +168,14 @@
+--- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ Makefile.in	2004-11-08 01:36:50.000000000 +0100
+@@ -62,8 +62,7 @@
+ DATA = $(pkgdata_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = config common-src client-src tape-src server-src \
+-	changer-src restore-src recover-src amplot man docs example
++DIST_SUBDIRS = config amplot man
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -277,19 +276,13 @@
  # order is significant, don't change it arbitrarily
  SUBDIRS = \
  	config \
@@ -16,26 +26,15 @@ $NetBSD: patch-ab,v 1.6 2004/05/15 12:15:22 bouyer Exp $
 -	man docs example
 +	man
  
- 
 -pkgdata_DATA = \
 -	COPYRIGHT			\
 -	COPYRIGHT-APACHE		\
 -	COPYRIGHT-REGEX
 +pkgdata_DATA =
  
- 
  EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -243,8 +237,7 @@
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = README AUTHORS ChangeLog INSTALL Makefile.am Makefile.in \
- 	NEWS acinclude.m4 aclocal.m4 configure configure.in
--DIST_SUBDIRS = config common-src client-src tape-src server-src \
--	changer-src restore-src recover-src amplot man docs example
-+DIST_SUBDIRS = config amplot man
- all: all-recursive
- 
- .SUFFIXES:
-@@ -506,7 +499,7 @@
+ 	$(pkgdata_DATA)			\
+@@ -676,7 +669,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
index 9a202fc1088..48301b00d68 100644
--- a/sysutils/amanda-plot/patches/patch-ac
+++ b/sysutils/amanda-plot/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2004/05/15 12:15:22 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- man/Makefile.in.orig	2004-05-15 14:07:19.000000000 +0200
-+++ man/Makefile.in	2004-05-15 14:07:34.000000000 +0200
-@@ -188,11 +188,7 @@
+--- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ man/Makefile.in	2004-11-08 01:38:11.000000000 +0100
+@@ -280,11 +280,7 @@
+ 
  # 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) \
 -	   $(RECOVER_MAN_PAGES) \
 -	   $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES) 
++man_MANS = $(AMPLOT_MAN_PAGES)
+ 
+ all: all-am
  
- subdir = man
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/sysutils/amanda-server/DESCR b/sysutils/amanda-server/DESCR
index 97d0d402e6b..5ead5bbac60 100644
--- a/sysutils/amanda-server/DESCR
+++ b/sysutils/amanda-server/DESCR
@@ -1,181 +1,4 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it.  This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you.  Amanda development is
-unfunded - the development team maintains the code in their spare time.  As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists.  See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
 This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver.  Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive. 
-
-Here are some features of Amanda:
-
-  * written in C, freely distributable.
-  * built on top of standard backup software: Unix dump/restore, GNU Tar
-    and others.
-  * will back up multiple machines in parallel to a holding disk, blasting
-    finished dumps one by one to tape as fast as we can write files to
-    tape.  For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
-    with a large holding disk can be filled by Amanda in under 4 hours.
-  * does simple tape management: will not overwrite the wrong tape.
-  * supports tape changers via a generic interface.  Easily customizable to
-    any type of tape carousel, robot, or stacker that can be controlled via
-    the unix command line.
-  * supports Kerberos 4 security, including encrypted dumps.  The Kerberos
-    support is available as a separate add-on package, see the file
-    KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
-    package, for more details.
-  * for a restore, tells you what tapes you need, and finds the proper
-    backup image on the tape for you.
-  * recovers gracefully from errors, including down or hung machines.
-  * reports results, including all errors in detail, in email.
-  * will dynamically adjust backup schedule to keep within constraints: no
-    more juggling by hand when adding disks and computers to network.
-  * includes a pre-run checker program, that conducts sanity checks on both
-    the tape server host and all the client hosts (in parallel), and will
-    send an e-mail report of any problems that could cause the backups to
-    fail.
-  * can compress dumps before sending or after sending over the net, with
-    either compress or gzip.
-  * can optionally synchronize with external backups, for those large
-    timesharing computers where you want to do full dumps when the system
-    is down in single-user mode (since BSD dump is not reliable on active
-    filesystems): Amanda will still do your daily dumps.
-  * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host".  All the computers you are going to dump
-are the "backup client hosts".  The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished.  Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive.  Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions.  For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk.  On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk.  Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time.  If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
-	AIX 3.2 and 4.1
-	BSDI BSD/OS 2.1 and 3.1
-	DEC OSF/1 3.2 and 4.0
-	FreeBSD 2.2.5
-	IRIX 5.2 and 6.3
-	GNU/Linux on x86, alpha, sparc, arm and powerpc
-	NetBSD 1.0
-	Nextstep 3 (*)
-	OpenBSD 2.5 x86, sparc, etc (ports available)
-	SunOS 4.1.x (x >= 1) and 5.[567]
-	Ultrix 4.2
-	HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda.  The latest version at the time
-of this writing is available at:
-
-	ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL.  There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
-    docs/INSTALL	contains general installation instructions.
-    docs/SYSTEM.NOTES	contains system-specific information.
-    docs/FAQ            contains answers to frequently asked questions.
-    docs/KERBEROS	explains installation under Kerberos 4.
-    docs/TAPE.CHANGERS	explains how to customize the changer interface.
-    docs/WHATS.NEW	details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is.  However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list.  Send
-    mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
-    with the following line in the body of the message:
-	subscribe <listname> <your-email-address>
-
-
-    amanda-announce
-        The amanda-announce mailing list is for important announcements
-        related to the Amanda Network Backup Manager package, including new
-        versions, contributions, and fixes.  NOTE: the amanda-users list is
-        itself on the amanda-announce distribution, so you only need to
-        subscribe to one of the two lists, not both.
-	To subscribe, send a message to amanda-announce-request@amanda.org.
-
-    amanda-users
-        The amanda-users mailing list is for questions and general discussion
-        about the Amanda Network Backup Manager.  This package and related
-        files are available via anonymous FTP from ftp.amanda.org in the
-        pub/amanda directory.  NOTE: the amanda-users list is itself on the
-        amanda-announce distribution, so you only need to subscribe to one of
-        the two lists, not both.
-	To subscribe, send a message to amanda-users-request@amanda.org.
-
-    amanda-hackers
-        The amanda-hackers mailing list is for discussion of the
-        technical details of the Amanda package, including extensions,
-        ports, bugs, fixes, and alpha testing of new versions.
-	To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 21306640822..1dc2055c368 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/12 12:13:45 mjl Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
 PKGNAME=		amanda-server-${VERS}
-PKGREVISION=		1
+# PKGREVISION=		1
 SVR4_PKGNAME=		amase
 
 COMMENT=		Server part of Amanda, a network backup system
diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST
index 3cb7285fccd..dbd1742d958 100644
--- a/sysutils/amanda-server/PLIST
+++ b/sysutils/amanda-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:53 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/11/12 12:13:45 mjl Exp $
 lib/libamserver.la
 libexec/amcleanupdisk
 libexec/amidxtaped
@@ -9,6 +9,7 @@ libexec/amtrmlog
 libexec/chg-chio
 libexec/chg-chs
 libexec/chg-disk
+libexec/chg-iomega
 libexec/chg-juke
 libexec/chg-manual
 libexec/chg-mcutil
diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo
index 35fa0693f70..a4b56ab97c8 100644
--- a/sysutils/amanda-server/distinfo
+++ b/sysutils/amanda-server/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.6 2004/10/03 09:19:16 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
-SHA1 (amanda-2.4.4p2.tar.gz) = c14510260941a3915f4068e6b7e3f91698ab099e
-Size (amanda-2.4.4p2.tar.gz) = 1263075 bytes
+SHA1 (amanda-2.4.4p4.tar.gz) = e44b40ea0f8e51336716ab455b27c69f4616d7f6
+Size (amanda-2.4.4p4.tar.gz) = 1422735 bytes
 SHA1 (patch-aa) = af41269882c8dfdb45bc177a45aa86122443d8df
-SHA1 (patch-ab) = 19121fbc6ccc05b6e07c87cdecf0c5e1423b05a5
-SHA1 (patch-ac) = 33283f04b90d8eb7943753a67c9fa62874bedca8
-SHA1 (patch-ad) = dfd33fa33eeb174d63d8f16d5203032c61a0c6d1
+SHA1 (patch-ab) = 87e628b0fbcd4174cb63f87ed8eb10a6cc87af46
+SHA1 (patch-ac) = 047647205258910f5b0ff7c04854816508e2d904
+SHA1 (patch-ad) = 374df6ccf94d6533166db6eb2468d555f4f52f39
 SHA1 (patch-ae) = a646c7fd01f04c0a569564ba14e0cae3ea76792d
-SHA1 (patch-af) = 31ed247437c974e1c46d1ee45c9e931ec751df76
-SHA1 (patch-ag) = 3b7458cea6c11ff122f32d9205296bf3b82eecd3
-SHA1 (patch-ah) = 7b9d5c44a0f56d6592743c5a1442cfbd5da647a9
-SHA1 (patch-ai) = 1491d8cec537f04f31440f0c8933deec0f6c21cd
-SHA1 (patch-aj) = a8b27da285097eb32a60895df2479a77b3dcab05
-SHA1 (patch-ak) = 203723bd242924a1fc10366eae3b1aac86d6886c
+SHA1 (patch-af) = 950d161f35ffe121821ce7f10f2692dba2519469
+SHA1 (patch-ag) = 2256353832fef411fb2e0dab56a8d3aaa699da81
+SHA1 (patch-ah) = a0f156ac45498a73af66af62113f8e19bbccad01
+SHA1 (patch-ai) = 3a21e49fa8b261413d4bc8fb97e3ee0664b00292
+SHA1 (patch-aj) = f7c33a543a015e282ba9836ffa2c5c501a2bddcb
+SHA1 (patch-ak) = 9555f098dc705a7af9004e6fd3d4d259705a9935
diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab
index 534621f3cda..e358190961f 100644
--- a/sysutils/amanda-server/patches/patch-ab
+++ b/sysutils/amanda-server/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- Makefile.in.orig	2004-01-08 10:21:29.000000000 -0800
-+++ Makefile.in	2004-02-23 16:03:55.000000000 -0800
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
+--- Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ Makefile.in	2004-11-08 00:53:24.000000000 +0100
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
-@@ -506,7 +506,7 @@
+@@ -676,7 +676,7 @@
  uninstall: uninstall-recursive
  
  install-am: all-am
diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac
index 079275711ce..0307a0a96d7 100644
--- a/sysutils/amanda-server/patches/patch-ac
+++ b/sysutils/amanda-server/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2004/11/12 12:13:45 mjl Exp $
 
---- example/Makefile.in.orig	2004-01-08 10:23:49.000000000 -0800
-+++ example/Makefile.in	2004-02-23 07:54:24.000000000 -0800
-@@ -35,7 +35,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
+--- example/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ example/Makefile.in	2004-11-08 00:55:34.000000000 +0100
+@@ -19,7 +19,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/examples/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = ..
-@@ -278,7 +278,16 @@
+@@ -384,7 +384,16 @@
  
  info-am:
  
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
index 01f5a076c26..e2f8541f2f7 100644
--- a/sysutils/amanda-server/patches/patch-ad
+++ b/sysutils/amanda-server/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.7 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ad,v 1.8 2004/11/12 12:13:45 mjl Exp $
 
---- docs/Makefile.in.orig	2004-01-08 10:23:48.000000000 -0800
-+++ docs/Makefile.in	2004-02-23 07:56:48.000000000 -0800
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
+--- docs/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ docs/Makefile.in	2004-11-08 00:57:02.000000000 +0100
+@@ -17,7 +17,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
diff --git a/sysutils/amanda-server/patches/patch-af b/sysutils/amanda-server/patches/patch-af
index bf08590ec21..ab34db004f9 100644
--- a/sysutils/amanda-server/patches/patch-af
+++ b/sysutils/amanda-server/patches/patch-af
@@ -1,30 +1,8 @@
-$NetBSD: patch-af,v 1.5 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-af,v 1.6 2004/11/12 12:13:45 mjl Exp $
 
---- tape-src/Makefile.in.orig	2004-01-08 19:22:46.000000000 +0100
-+++ tape-src/Makefile.in	2004-05-12 15:41:15.000000000 +0200
-@@ -178,9 +178,7 @@
- # 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) \
--	libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamtape.$(LIB_EXTENSION) -lamanda
- 
- 
- 
-@@ -202,9 +200,7 @@
- 
- 
- amtapeio_SOURCES = amtapeio.test.c
--amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
--			libamtape.$(LIB_EXTENSION) \
--			../common-src/libamanda.$(LIB_EXTENSION)
-+amtapeio_LDADD = libamtape.$(LIB_EXTENSION) -lamanda
- 
- subdir = tape-src
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-@@ -223,29 +219,21 @@
+--- tape-src/Makefile.in.orig	2004-10-22 15:12:42.000000000 +0200
++++ tape-src/Makefile.in	2004-11-08 01:01:43.000000000 +0100
+@@ -67,26 +67,18 @@
  amdd_SOURCES = amdd.c
  amdd_OBJECTS = amdd.$(OBJEXT)
  amdd_LDADD = $(LDADD)
@@ -32,42 +10,61 @@ $NetBSD: patch-af,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amdd_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda
- amdd_LDFLAGS =
  ammt_SOURCES = ammt.c
  ammt_OBJECTS = ammt.$(OBJEXT)
  ammt_LDADD = $(LDADD)
 -ammt_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION)
- ammt_LDFLAGS =
++ammt_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda
  am_amtapeio_OBJECTS = amtapeio.test.$(OBJEXT)
  amtapeio_OBJECTS = $(am_amtapeio_OBJECTS)
 -amtapeio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION)
- amtapeio_LDFLAGS =
++amtapeio_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda
  am_amtapetype_OBJECTS = tapetype.$(OBJEXT)
  amtapetype_OBJECTS = $(am_amtapetype_OBJECTS)
  amtapetype_LDADD = $(LDADD)
 -amtapetype_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
 -	libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
-+amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION)
- amtapetype_LDFLAGS =
++amtapetype_DEPENDENCIES = libamtape.$(LIB_EXTENSION) -lamanda
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -318,9 +310,7 @@
+ # 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) \
+-	libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = libamtape.$(LIB_EXTENSION) -lamanda
+ 
+ 
+ # used for testing only
+@@ -335,9 +325,7 @@
+ 			tapeio.h
  
- DEFS = @DEFS@
-@@ -469,7 +457,7 @@
+ amtapeio_SOURCES = amtapeio.test.c
+-amtapeio_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
+-			libamtape.$(LIB_EXTENSION) \
+-			../common-src/libamanda.$(LIB_EXTENSION)
++amtapeio_LDADD = libamtape.$(LIB_EXTENSION) -lamanda
+ 
+ all: all-am
+ 
+@@ -569,7 +557,7 @@
  	done
  check-am: all-am
  check: check-am
 -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
 +all-am: Makefile $(PROGRAMS) $(HEADERS)
- 
  installdirs:
- 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir)
-@@ -519,7 +507,7 @@
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+@@ -622,7 +610,7 @@
  
  install-data-am:
  
@@ -76,12 +73,12 @@ $NetBSD: patch-af,v 1.5 2004/05/12 18:45:26 bouyer Exp $
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  
-@@ -538,7 +526,7 @@
- mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- 	mostlyclean-libtool
+@@ -650,7 +638,7 @@
+ 
+ ps-am:
  
 -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 +uninstall-am: uninstall-info-am \
  	uninstall-sbinPROGRAMS
  
- .PHONY: GTAGS all all-am check check-am clean clean-generic \
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
diff --git a/sysutils/amanda-server/patches/patch-ag b/sysutils/amanda-server/patches/patch-ag
index 453f2f9b940..9141e5e46da 100644
--- a/sysutils/amanda-server/patches/patch-ag
+++ b/sysutils/amanda-server/patches/patch-ag
@@ -1,17 +1,18 @@
-$NetBSD: patch-ag,v 1.4 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ag,v 1.5 2004/11/12 12:13:45 mjl Exp $
 
---- common-src/Makefile.in.orig	2004-01-08 10:22:20.000000000 -0800
-+++ common-src/Makefile.in	2004-02-23 14:11:45.000000000 -0800
-@@ -536,25 +536,19 @@
+--- common-src/Makefile.in.orig	2004-10-22 15:12:39.000000000 +0200
++++ common-src/Makefile.in	2004-11-08 01:05:05.000000000 +0100
+@@ -624,25 +624,18 @@
  	done
  check-am: all-am
  check: check-am
 -all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +all-am: Makefile genversion.h
- 
  installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
@@ -24,13 +25,13 @@ $NetBSD: patch-ag,v 1.4 2004/05/12 18:45:26 bouyer Exp $
  installcheck: installcheck-am
  install-strip:
 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  INSTALL_STRIP_FLAG=-s \
+-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 -	  `test -z '$(STRIP)' || \
 -	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
-@@ -587,7 +581,7 @@
+@@ -678,7 +671,7 @@
  
  install-data-am:
  
diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah
index 05720ab58b2..b9cea70e1c5 100644
--- a/sysutils/amanda-server/patches/patch-ah
+++ b/sysutils/amanda-server/patches/patch-ah
@@ -1,20 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ah,v 1.6 2004/11/12 12:13:45 mjl Exp $
 
---- server-src/Makefile.in.orig	2004-01-08 10:22:53.000000000 -0800
-+++ server-src/Makefile.in	2004-02-23 14:25:45.000000000 -0800
-@@ -198,10 +198,7 @@
- # 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) \
--	libamserver.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamserver.$(LIB_EXTENSION)
- 
- 
- SUFFIXES = .sh .pl
-@@ -259,155 +256,98 @@
+--- server-src/Makefile.in.orig	2004-10-22 15:12:41.000000000 +0200
++++ server-src/Makefile.in	2004-11-08 01:11:07.000000000 +0100
+@@ -88,137 +88,80 @@
  amadmin_SOURCES = amadmin.c
  amadmin_OBJECTS = amadmin.$(OBJEXT)
  amadmin_LDADD = $(LDADD)
@@ -23,7 +11,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -32,7 +19,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -41,7 +27,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -50,7 +35,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -59,7 +43,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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) \
  	list_dir.$(OBJEXT)
  amindexd_OBJECTS = $(am_amindexd_OBJECTS)
@@ -69,7 +52,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amindexd_LDFLAGS =
  amlabel_SOURCES = amlabel.c
  amlabel_OBJECTS = amlabel.$(OBJEXT)
  amlabel_LDADD = $(LDADD)
@@ -78,7 +60,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -87,7 +68,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlogroll_LDFLAGS =
  am_amreport_OBJECTS = reporter.$(OBJEXT)
  amreport_OBJECTS = $(am_amreport_OBJECTS)
  amreport_LDADD = $(LDADD)
@@ -96,7 +76,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -105,7 +84,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -114,7 +92,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmidx_LDFLAGS =
  amtrmlog_SOURCES = amtrmlog.c
  amtrmlog_OBJECTS = amtrmlog.$(OBJEXT)
  amtrmlog_LDADD = $(LDADD)
@@ -123,7 +100,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmlog_LDFLAGS =
  am_conffile_OBJECTS = conffile.test.$(OBJEXT)
  conffile_OBJECTS = $(am_conffile_OBJECTS)
  conffile_LDADD = $(LDADD)
@@ -132,7 +108,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -141,7 +116,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -150,7 +124,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- driver_LDFLAGS =
  dumper_SOURCES = dumper.c
  dumper_OBJECTS = dumper.$(OBJEXT)
  dumper_LDADD = $(LDADD)
@@ -159,7 +132,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- dumper_LDFLAGS =
  am_infofile_OBJECTS = infofile.test.$(OBJEXT)
  infofile_OBJECTS = $(am_infofile_OBJECTS)
  infofile_LDADD = $(LDADD)
@@ -168,7 +140,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -177,7 +148,6 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../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)
@@ -186,15 +156,27 @@ $NetBSD: patch-ah,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- taper_LDFLAGS =
+ sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(sbin_SCRIPTS)
- 
-@@ -416,7 +356,7 @@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+@@ -338,7 +281,7 @@
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ -lamtape -lamanda
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/amadmin.Po ./$(DEPDIR)/amcheck.Po \
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_DEPS = @LIBTOOL_DEPS@
+ LN_S = @LN_S@
+@@ -478,10 +421,7 @@
+ # 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) \
+-	libamserver.$(LIB_EXTENSION) \
+-	../tape-src/libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = libamserver.$(LIB_EXTENSION)
+ 
+ SUFFIXES = .sh .pl
+ 
diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai
index f1a1bccf4fd..a10c10486ca 100644
--- a/sysutils/amanda-server/patches/patch-ai
+++ b/sysutils/amanda-server/patches/patch-ai
@@ -1,21 +1,9 @@
-$NetBSD: patch-ai,v 1.5 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ai,v 1.6 2004/11/12 12:13:45 mjl Exp $
 
---- changer-src/Makefile.in.orig	2004-01-08 10:23:21.000000000 -0800
-+++ changer-src/Makefile.in	2004-02-23 15:25:39.000000000 -0800
-@@ -179,10 +179,7 @@
- # 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) \
--	../server-src/libamserver.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
- 
- 
- SUFFIXES = .pl .sh
-@@ -213,19 +210,13 @@
- 	scsi-bsd.$(OBJEXT) scsi-cam.$(OBJEXT) sense.$(OBJEXT)
+--- changer-src/Makefile.in.orig	2004-10-22 15:12:38.000000000 +0200
++++ changer-src/Makefile.in	2004-11-08 01:13:46.000000000 +0100
+@@ -73,18 +73,12 @@
+ 	sense.$(OBJEXT)
  chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS)
  chg_scsi_LDADD = $(LDADD)
 -chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
@@ -23,7 +11,6 @@ $NetBSD: patch-ai,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
- chg_scsi_LDFLAGS =
  am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
  	scsi-chio.$(OBJEXT)
  chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS)
@@ -33,6 +20,18 @@ $NetBSD: patch-ai,v 1.5 2004/05/12 18:45:26 bouyer Exp $
 -	../tape-src/libamtape.$(LIB_EXTENSION) \
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
- chg_scsi_chio_LDFLAGS =
+ libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(libexec_SCRIPTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+@@ -316,10 +310,7 @@
+ # 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) \
+-	../server-src/libamserver.$(LIB_EXTENSION) \
+-	../tape-src/libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
  
+ SUFFIXES = .pl .sh
+ chg_scsi_SOURCES = chg-scsi.c libscsi.h scsi-defs.h \
diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj
index 0b0fa2a25d3..8bdfbd9b175 100644
--- a/sysutils/amanda-server/patches/patch-aj
+++ b/sysutils/amanda-server/patches/patch-aj
@@ -1,8 +1,27 @@
-$NetBSD: patch-aj,v 1.2 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-aj,v 1.3 2004/11/12 12:13:45 mjl Exp $
 
---- restore-src/Makefile.in.orig	2004-01-08 10:23:31.000000000 -0800
-+++ restore-src/Makefile.in	2004-02-23 15:39:26.000000000 -0800
-@@ -170,16 +170,11 @@
+--- restore-src/Makefile.in.orig	2004-10-22 15:12:41.000000000 +0200
++++ restore-src/Makefile.in	2004-11-08 01:16:01.000000000 +0100
+@@ -57,16 +57,11 @@
+ PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS)
+ am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
+ amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS)
+-amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	../server-src/libamserver.$(LIB_EXTENSION) \
+-	../tape-src/libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++amidxtaped_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
+ amrestore_SOURCES = amrestore.c
+ amrestore_OBJECTS = amrestore.$(OBJEXT)
+ amrestore_LDADD = $(LDADD)
+-amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
+-	../tape-src/libamtape.$(LIB_EXTENSION) \
+-	../common-src/libamanda.$(LIB_EXTENSION)
++amrestore_DEPENDENCIES = 
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__depfiles_maybe = depfiles
+@@ -282,15 +277,10 @@
  # need to list libamanda twice here, first to override the system library
  # routines, and second to pick up any references in the other libraries.
  ###
@@ -11,7 +30,6 @@ $NetBSD: patch-aj,v 1.2 2004/05/12 18:45:26 bouyer Exp $
 -	../common-src/libamanda.$(LIB_EXTENSION)
 +LDADD = -lamtape -lamanda
  
- 
  amidxtaped_SOURCES = amidxtaped.c
 -amidxtaped_LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
 -                   ../server-src/libamserver.$(LIB_EXTENSION) \
@@ -19,25 +37,5 @@ $NetBSD: patch-aj,v 1.2 2004/05/12 18:45:26 bouyer Exp $
 -                   ../common-src/libamanda.$(LIB_EXTENSION)
 +amidxtaped_LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
  
- subdir = restore-src
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-@@ -191,17 +186,12 @@
- 
- am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
- amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS)
--amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--	../server-src/libamserver.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+amidxtaped_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
- amidxtaped_LDFLAGS =
- amrestore_SOURCES = amrestore.c
- amrestore_OBJECTS = amrestore.$(OBJEXT)
- amrestore_LDADD = $(LDADD)
--amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--	../tape-src/libamtape.$(LIB_EXTENSION) \
--	../common-src/libamanda.$(LIB_EXTENSION)
-+amrestore_DEPENDENCIES =
- amrestore_LDFLAGS =
+ all: all-am
  
- DEFS = @DEFS@
diff --git a/sysutils/amanda-server/patches/patch-ak b/sysutils/amanda-server/patches/patch-ak
index c364cf006ea..120482aaf94 100644
--- a/sysutils/amanda-server/patches/patch-ak
+++ b/sysutils/amanda-server/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.2 2004/05/12 18:45:26 bouyer Exp $
+$NetBSD: patch-ak,v 1.3 2004/11/12 12:13:45 mjl Exp $
 
---- man/Makefile.in.orig	2004-01-08 10:23:42.000000000 -0800
-+++ man/Makefile.in	2004-02-23 15:57:35.000000000 -0800
-@@ -189,7 +189,6 @@
+--- man/Makefile.in.orig	2004-10-22 15:12:40.000000000 +0200
++++ man/Makefile.in	2004-11-08 01:17:10.000000000 +0100
+@@ -281,7 +281,6 @@
+ # 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) \
diff --git a/sysutils/amanda/DESCR b/sysutils/amanda/DESCR
index fb4dae0fdae..5ead5bbac60 100644
--- a/sysutils/amanda/DESCR
+++ b/sysutils/amanda/DESCR
@@ -1,8 +1,4 @@
-Amanda is a backup system designed to archive many computers on a network to a
-single large-capacity tape drive. 
-
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on the amanda-client, amanda-server,
-and amanda-plot packages.  Its purpose is to require dependencies
-so users can install this package only and have the complete
-Amanda software pulled in by the port/package dependency mechanism.
+This is a release of Amanda, the Advanced Maryland Automatic
+Network Disk Archiver.  Amanda is a backup system designed to
+archive many computers on a network to a single large-capacity
+tape drive. 
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
index 8259a6cfb00..d44f0cd0db7 100644
--- a/sysutils/amanda/Makefile
+++ b/sysutils/amanda/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2004/10/05 17:51:05 seb Exp $
+# $NetBSD: Makefile,v 1.38 2004/11/12 12:13:44 mjl Exp $
 #
 
-DISTNAME=	amanda-2.4.4p2
+DISTNAME=	amanda-2.4.4p4
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
author	mjl <mjl@pkgsrc.org>	2004-11-12 12:13:44 +0000
committer	mjl <mjl@pkgsrc.org>	2004-11-12 12:13:44 +0000
commit	834bb01177eadc51b02f3f931f83c01d8b4cbbfd (patch)
tree	d1f225724e77f6dc963c4d3de1ea6f57cc98e737 /sysutils
parent	579916c06bf3b14d589bf41405c321f846658790 (diff)
download	pkgsrc-834bb01177eadc51b02f3f931f83c01d8b4cbbfd.tar.gz