4 files changed, 104 insertions, 88 deletions

diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index d91598b25a69..7b6d326947b8 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -3,24 +3,29 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.8 1996/11/19 01:18:00 asami Exp $
+# $Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp $
 #
 
-DISTNAME=	amanda-2.3.0
+DISTNAME=	amanda-2.4.0b6
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/
+MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/
 
-MAINTAINER=	gpalmer@FreeBSD.ORG
+MAINTAINER=	cwt@FreeBSD.ORG
 
-PATCH_STRIP=	
-MAN8=		amanda.8 amadmin.8 amcheck.8 amcleanup.8 amdump.8 \
-		amflush.8 amlabel.8 amrestore.8  amtape.8
-
-pre-configure:
-	echo "${CFLAGS}" > /tmp/build-ports-misc-amanda-cflags
+GNU_CONFIGURE=  yes
+CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
+		--with-user=operator --with-group=operator
+PATCH_STRIP=
+MAN8=		amadmin.8 amanda.8 amcheck.8 amcheckdb.8 amcleanup.8 \
+		amdump.8 amflush.8 amlabel.8 amoverview.8 amplot.8 \
+		amrecover.8 amrestore.8 amrmtape.8 amtape.8 amtoc.8 \
+		amverify.8
 
 post-install:
-	mkdir -p ${PREFIX}/share/examples/amanda
-	cp -R ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
+	${MKDIR} ${PREFIX}/lib/amanda/${DISTNAME}/examples
+	${CP} -R ${WRKSRC}/example/amanda.conf \
+		${WRKSRC}/example/chg-multi.conf \
+		${WRKSRC}/example/disklist \
+		${PREFIX}/lib/amanda/${DISTNAME}/examples
 
 .include <bsd.port.mk>
diff --git a/misc/amanda26-client/distinfo b/misc/amanda26-client/distinfo
index 5f4ae2326bf3..ea2def488061 100644
--- a/misc/amanda26-client/distinfo
+++ b/misc/amanda26-client/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.3.0.tar.gz) = fabe173c0b507633d8b7eb081acd8174
+MD5 (amanda-2.4.0b6.tar.gz) = ccc830dbe5fff4f7bfb10477f9066fe0
diff --git a/misc/amanda26-client/pkg-descr b/misc/amanda26-client/pkg-descr
index d22b3394fd2e..5b33b9939e25 100644
--- a/misc/amanda26-client/pkg-descr
+++ b/misc/amanda26-client/pkg-descr
@@ -1,68 +1,23 @@
+
+** CAUTION **
+ 
+THIS BETA RELEASE OF AMANDA 2.4 BREAKS BACKWARDS COMPATIBILITY WITH
+EARLIER AMANDA CLIENTS (PER CHANGES FILE IN THE DISTRIBUTION.) 
+
 WHAT IS AMANDA?
 ---------------
 
-This is an alpha-test release of Amanda, the Advanced Maryland Automatic
+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.  This release
-is currently in daily use at the University of Maryland at College Park
-Computer Science Department, backing up all the disks on all the
-workstations in the department: currently over 70 gigabytes of data across
-more than 400 filesystems on more than 146 workstations and servers, using
-a single 5 Gigabyte Exabyte EXB-8500.  Here are some features of Amanda:
+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: BSD Unix dump/restore, and
+  * built on top of standard backup software: Unix dump/restore, and
     later 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.
+    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 to operators.
-  * 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 over net, with either compress or gzip.
-  * can optionally syncronize with external backups, for those large
-    timesharing computers where you want to do fu--------------------------------------------
-
-Amanda requires a host that is mostly idle at night, with a large capacity
-tape drive (e.g. an EXABYTE or DAT 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" partition 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.  We use 800 MB
-for our holding disk.
-
-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.
-
diff --git a/misc/amanda26-client/pkg-plist b/misc/amanda26-client/pkg-plist
index 8eb96afc1459..0ac5cfb339c9 100644
--- a/misc/amanda26-client/pkg-plist
+++ b/misc/amanda26-client/pkg-plist
@@ -1,31 +1,87 @@
+lib/amanda/amanda-2.4.0b6/examples/amanda.conf
+lib/amanda/amanda-2.4.0b6/examples/chg-multi.conf
+lib/amanda/amanda-2.4.0b6/examples/disklist
+lib/libamanda.a
+lib/libamanda.la
+lib/libamanda.so
+lib/libamanda.so.3.0
+lib/libamclient.a
+lib/libamclient.la
+lib/libamclient.so
+lib/libamclient.so.0.2
+lib/libamnolog.a
+lib/libamnolog.la
+lib/libamnolog.so
+lib/libamnolog.so.0.0
+lib/libamserver.a
+lib/libamserver.la
+lib/libamserver.so
+lib/libamserver.so.2.0
+lib/libamtape.a
+lib/libamtape.la
+lib/libamtape.so
+lib/libamtape.so.1.0
+@exec /sbin/ldconfig -m %B
 libexec/amanda/amandad
-libexec/amanda/sendsize
+libexec/amanda/amcat.awk
+libexec/amanda/amidxtaped
+libexec/amanda/amindexd
+libexec/amanda/amplot.awk
+libexec/amanda/amplot.g
+libexec/amanda/amplot.gp
+libexec/amanda/amtrmidx
 libexec/amanda/calcsize
-libexec/amanda/sendbackup-dump
-libexec/amanda/sendbackup-gnutar
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/taper
-libexec/amanda/dumper
+libexec/amanda/chg-chio
+libexec/amanda/chg-chs
+libexec/amanda/chg-manual
+libexec/amanda/chg-mtx
+libexec/amanda/chg-multi
+libexec/amanda/chg-rth
 libexec/amanda/driver
+libexec/amanda/dumper
+libexec/amanda/getconf
+libexec/amanda/patch-system
 libexec/amanda/planner
 libexec/amanda/reporter
-libexec/amanda/getconf
-sbin/amrestore
-sbin/amadmin
-sbin/amflush
-sbin/amlabel
-sbin/amcheck
-sbin/amdump
-sbin/amcleanup
-sbin/amtape
-libexec/amanda/chg-generic
-man/man8/amanda.8.gz
+libexec/amanda/rundump
+libexec/amanda/runtar
+libexec/amanda/selfcheck
+libexec/amanda/sendbackup
+libexec/amanda/sendsize
+libexec/amanda/taper
+libexec/amanda/versionsuffix
 man/man8/amadmin.8.gz
+man/man8/amanda.8.gz
 man/man8/amcheck.8.gz
+man/man8/amcheckdb.8.gz
 man/man8/amcleanup.8.gz
 man/man8/amdump.8.gz
 man/man8/amflush.8.gz
 man/man8/amlabel.8.gz
+man/man8/amoverview.8.gz
+man/man8/amplot.8.gz
+man/man8/amrecover.8.gz
 man/man8/amrestore.8.gz
+man/man8/amrmtape.8.gz
 man/man8/amtape.8.gz
+man/man8/amtoc.8.gz
+man/man8/amverify.8.gz
+sbin/amadmin
+sbin/amcheck
+sbin/amcheckdb
+sbin/amcleanup
+sbin/amdump
+sbin/amflush
+sbin/amlabel
+sbin/amoverview
+sbin/amplot
+sbin/amrecover
+sbin/amrestore
+sbin/amrmtape
+sbin/amtape
+sbin/amtoc
+sbin/amverify
+@dirrm lib/amanda/amanda-2.4.0b6/examples
+@dirrm lib/amanda/amanda-2.4.0b6
+@dirrm lib/amanda
+@dirrm libexec/amanda