12 files changed, 80 insertions, 284 deletions

diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 30286958d052..3aeab5783c18 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -6,45 +6,42 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.3.0
+PORTVERSION=	2.3.0.4
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/old-versions/
 
 MAINTAINER=	ports@FreeBSD.org
 
+GNU_CONFIGURE=yes
+CONFIGURE_ARGS+=--with-dbdir=/var/log/amanda --with-logdir=/var/log/amanda \
+		--libexecdir=${PREFIX}/libexec/amanda --with-mmap \
+		--with-user=operator --with-group=operator
+
 MAN8=		amadmin.8 amanda.8 amcheck.8 amcleanup.8 amdump.8 amflush.8 \
-		amlabel.8 amrestore.8 amtape.8
-
-LIBEXEC_BIN=	amandad calcsize driver dumper getconf planner reporter \
-		runtar selfcheck sendbackup-dump sendbackup-gnutar sendsize \
-		taper
-SBIN_BIN=	amadmin amcheck amflush amlabel amrestore amtape
-
-post-patch:
-	@${LN} -sf config.h-freebsd2 ${WRKSRC}/config/config.h
-	@${SED} -e 's:%%CC%%:${CC}:g' \
-		-e 's:%%CFLAGS%%:${CFLAGS}:g' \
-	        -e 's:%%INSTALL%%:${INSTALL}:g' \
-	        -e 's:%%PREFIX%%:${PREFIX}:g' \
-		${WRKSRC}/config/options.h-vanilla > ${WRKSRC}/config/options.h
-.for file in amanda.8 amcleanup.8 amflush.8 amlabel.8
-	@cd ${WRKSRC}/man/; ${MV} ${file} ${file}.in; \
-		${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${file}.in > ${file}
-.endfor
+		amlabel.8 amplot.8 amrecover.8 amrestore.8 amrmtape.8 amtape.8 \
+		amtoc.8
+
+LIBEXEC_BIN=	amandad amcat.awk amgetidx amidxtaped amindexd amplot.awk \
+		amplot.g amplot.gp amtrmidx calcsize chg-generic \
+		createindex-dump createindex-gnutar driver dumper getconf \
+		hp-changer no-changer patch-system planner reporter \
+		rth-changer rundump runtar selfcheck sendbackup-dump \
+		sendbackup-gnutar sendindex sendsize taper versionsuffix
+
+BIN_BIN=	amadmin amcheck amcheckdb amcleanup amdump amflush amlabel \
+		amoverview amplot amrecover amrestore amrmtape amtape amtoc \
+		amverify
+
+INSTALL_DATA=	amanda.conf chg-generic.conf disklist
 
 post-install:
-.for file in ${LIBEXEC_BIN}
-	@if [ -f ${PREFIX}/libexec/amanda/${file} ]; then \
-		strip ${PREFIX}/libexec/amanda/${file}; \
-	fi
-.endfor
-.for file in ${SBIN_BIN}
-	@if [ -f ${PREFIX}/sbin/${file} ]; then \
-		strip ${PREFIX}/sbin/${file}; \
-	fi
-.endfor
 	@${MKDIR} ${PREFIX}/share/examples/amanda
-	${INSTALL_DATA} ${WRKSRC}/example/* ${PREFIX}/share/examples/amanda
+	${INSTALL_DATA} ${WRKSRC}/example/amanda.conf ${PREFIX}/share/examples/amanda
+	${INSTALL_DATA} ${WRKSRC}/example/chg-generic.conf ${PREFIX}/share/examples/amanda
+	${INSTALL_DATA} ${WRKSRC}/example/disklist ${PREFIX}/share/examples/amanda
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${MKDIR} ${PREFIX}/etc/amanda
+	@${MKDIR} /var/log/amanda
+	@${TOUCH} /var/log/amanda/curinfo
 
 .include <bsd.port.mk>
diff --git a/misc/amanda/distinfo b/misc/amanda/distinfo
index 5f4ae2326bf3..92b030ae6d58 100644
--- a/misc/amanda/distinfo
+++ b/misc/amanda/distinfo
@@ -1 +1 @@
-MD5 (amanda-2.3.0.tar.gz) = fabe173c0b507633d8b7eb081acd8174
+MD5 (amanda-2.3.0.4.tar.gz) = ec8fdad27b3f0ea2a09ac0b1639c7fab
diff --git a/misc/amanda/files/patch-aa b/misc/amanda/files/patch-aa
deleted file mode 100644
index 5de256cd7526..000000000000
--- a/misc/amanda/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** tools/munge.orig	Tue Feb 28 23:43:46 1995
---- tools/munge	Tue Feb 28 23:44:12 1995
-***************
-*** 35,41 ****
-  # Customize CPP to point to your system's C preprocessor.
-  
-  # if cpp is on your path:
-! CPP=cpp
-  
-  # if cpp is not on your path, try one of these:
-  # CPP=/lib/cpp			# traditional
---- 35,41 ----
-  # Customize CPP to point to your system's C preprocessor.
-  
-  # if cpp is on your path:
-! CPP=/usr/bin/cpp
-  
-  # if cpp is not on your path, try one of these:
-  # CPP=/lib/cpp			# traditional
diff --git a/misc/amanda/files/patch-ac b/misc/amanda/files/patch-ac
deleted file mode 100644
index 8da6374c4de1..000000000000
--- a/misc/amanda/files/patch-ac
+++ /dev/null
@@ -1,112 +0,0 @@
-*** config/options.h-vanilla.orig	Mon May 20 11:11:25 1996
---- config/options.h-vanilla	Fri Dec  3 00:29:56 1999
-***************
-*** 42,51 ****
-   *	LIBEXEC_DIR	- Internal support programs
-   *	MAN_DIR		- Man pages
-   */
-! #define CONFIG_DIR "/etc/amanda"
-! #define LIBEXEC_DIR "/usr/local/libexec/amanda"
-! #define BIN_DIR	"/usr/local/sbin"
-! #define MAN_DIR	"/usr/share/local/man/man8"
-  
-  
-  /*
---- 42,51 ----
-   *	LIBEXEC_DIR	- Internal support programs
-   *	MAN_DIR		- Man pages
-   */
-! #define CONFIG_DIR	"%%PREFIX%%/etc/amanda"
-! #define LIBEXEC_DIR	"%%PREFIX%%/libexec/amanda"
-! #define BIN_DIR	"%%PREFIX%%/sbin"
-! #define MAN_DIR	"%%PREFIX%%/man/man8"
-  
-  
-  /*
-***************
-*** 53,66 ****
-   * I compile with -g to compile in a full symbol table, but you might choose
-   * to use -O or something else.
-   */
-! #define MK_CCOPTS -g
-  /*
-   * You can also redefine MK_CC here if you wish to override the system
-   * dependent C compiler.  If you have a stable version of GCC, you may
-   * well want to use that instead of the system compiler.
-   */
-! /* #undef  MK_CC		*/
-! /* #define MK_CC gcc -Wall	*/
-  
-  
-  /*
---- 53,68 ----
-   * I compile with -g to compile in a full symbol table, but you might choose
-   * to use -O or something else.
-   */
-! #define MK_CCOPTS	%%CFLAGS%%
-  /*
-   * You can also redefine MK_CC here if you wish to override the system
-   * dependent C compiler.  If you have a stable version of GCC, you may
-   * well want to use that instead of the system compiler.
-   */
-! #undef  MK_INSTALL
-! #define MK_INSTALL	%%INSTALL%%
-! #undef  MK_CC
-! #define MK_CC	%%CC%%
-  
-  
-  /*
-***************
-*** 77,83 ****
-   * Since 2.2.1 is a major change, I recommend defining this for existing
-   * Amanda sites.
-   */
-! #define USE_VERSION_SUFFIXES
-  
-  
-  /*
---- 79,85 ----
-   * Since 2.2.1 is a major change, I recommend defining this for existing
-   * Amanda sites.
-   */
-! /*#define USE_VERSION_SUFFIXES*/
-  
-  
-  /*
-***************
-*** 182,198 ****
-  #define HAVE_GZIP
-  
-  #ifdef HAVE_GZIP
-! #  define COMPRESS_PATH  	"/usr/imports/bin/gzip"
-  #  define COMPRESS_SUFFIX 	".gz"
-  #  define COMPRESS_FAST_OPT	"--fast"
-  #  define COMPRESS_BEST_OPT	"--best"
-! #  define UNCOMPRESS_CMD	"gzcat"
-  #else
-  #  define COMPRESS_PATH		COMPRESS	/* defined in config.h */
-  #  define COMPRESS_SUFFIX	".Z"
-  #  define COMPRESS_FAST_OPT	"-f"		/* -f doesn't do anything */
-  #  define COMPRESS_BEST_OPT	"-f"		/* it's just a placeholder */
-! #  define UNCOMPRESS_CMD	"zcat"
-  #endif
-  
-  /*
---- 184,200 ----
-  #define HAVE_GZIP
-  
-  #ifdef HAVE_GZIP
-! #  define COMPRESS_PATH  	"/usr/bin/gzip"
-  #  define COMPRESS_SUFFIX 	".gz"
-  #  define COMPRESS_FAST_OPT	"--fast"
-  #  define COMPRESS_BEST_OPT	"--best"
-! #  define UNCOMPRESS_CMD	"/usr/bin/gzcat"
-  #else
-  #  define COMPRESS_PATH		COMPRESS	/* defined in config.h */
-  #  define COMPRESS_SUFFIX	".Z"
-  #  define COMPRESS_FAST_OPT	"-f"		/* -f doesn't do anything */
-  #  define COMPRESS_BEST_OPT	"-f"		/* it's just a placeholder */
-! #  define UNCOMPRESS_CMD	"/usr/bin/zcat"
-  #endif
-  
-  /*
diff --git a/misc/amanda/files/patch-ad b/misc/amanda/files/patch-ad
deleted file mode 100644
index cb9fc29789c9..000000000000
--- a/misc/amanda/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
---- man/amanda.8.orig	Mon May 20 11:11:25 1996
-+++ man/amanda.8	Wed Dec  1 03:59:02 1999
-@@ -135,19 +135,19 @@
- 
- All the files are stored in a
- .I config
--directory under /etc/amanda.  Often a single site will have more than
-+directory under %%PREFIX%%/etc/amanda.  Often a single site will have more than
- one configuration; these configurations are named by the directories
- that their config files are in.  For example, a site might have a
- .I normal
- configuration for every-day backups, and a
- .I archive
- configuration for 6-month full archival backups.  The config files for
--these two would be stored under /etc/amanda/normal and
--/etc/amanda/archive, respectively.
-+these two would be stored under %%PREFIX%%/etc/amanda/normal and
-+%%PREFIX%%/etc/amanda/archive, respectively.
- 
- All log and database files generated by Amanda go in corresponding
--directories under /usr/adm/amanda.  In our example, the logs would go
--in /usr/adm/amanda/normal and /usr/adm/amanda/archive.
-+directories under /var/log/amanda.  In our example, the logs would go
-+in /var/log/amanda/normal and /var/log/amanda/archive.
- 
- .SH CONFIG FILE PARAMETERS
- 
diff --git a/misc/amanda/files/patch-ae b/misc/amanda/files/patch-ae
deleted file mode 100644
index dbe730b1baeb..000000000000
--- a/misc/amanda/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- man/amcleanup.8.orig	Mon May 20 11:11:25 1996
-+++ man/amcleanup.8	Wed Dec  1 04:22:03 1999
-@@ -31,13 +31,13 @@
- 
- .PP
- .nf
--if [ -s /usr/adm/amanda/csd/amanda.log ]
-+if [ -s /var/log/amanda/csd/amanda.log ]
- then
--	/usr/local/sbin/amcleanup csd
-+	%%PREFIX%%/sbin/amcleanup csd
- fi
- .fi
- .RS .5i
--Putting the above in /etc/rc.local runs the Amanda
-+Putting the above in %%PREFIX%%/rc.local runs the Amanda
- cleanup process when needed as part of the reboot, eliminating the need
- to run it by hand.
- .RE
diff --git a/misc/amanda/files/patch-af b/misc/amanda/files/patch-af
deleted file mode 100644
index 83e97aefdec8..000000000000
--- a/misc/amanda/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/amflush.8.orig	Mon May 20 11:11:25 1996
-+++ man/amflush.8	Wed Dec  1 03:59:02 1999
-@@ -22,7 +22,7 @@
- .B Amflush
- will look in the holding disk specified by the
- .I amanda.conf
--file in /etc/amanda/\fIconfig\fR
-+file in %%PREFIX%%/etc/amanda/\fIconfig\fR
- for any non-empty Amanda work directories.  It then prompts the
- operator to select the correct directory.  The work directories on the
- holding disk are named by the date at the time
diff --git a/misc/amanda/files/patch-ag b/misc/amanda/files/patch-ag
deleted file mode 100644
index 7ab785088492..000000000000
--- a/misc/amanda/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- man/amlabel.8.orig	Mon May 20 11:11:25 1996
-+++ man/amlabel.8	Wed Dec  1 03:59:02 1999
-@@ -11,7 +11,7 @@
- .B Amlabel
- writes an Amanda label on the tape in the tape drive specified by the
- .I amanda.conf
--file in /etc/amanda/\fIconfig\fR.  The
-+file in %%PREFIX%%/etc/amanda/\fIconfig\fR.  The
- .I label
- can be any string that does not contain whitespace, and that matches the
- .I amanda.conf 
-@@ -26,7 +26,7 @@
- .TP
- % amlabel csd VOL1
- If the line "tapedev /dev/tape/1n" is in
--/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
-+%%PREFIX%%/etc/amanda/csd/amanda.conf, an Amanda label with the name "VOL1" is
- written on the /dev/tape/1n device.
- 
- .SH AUTHOR
diff --git a/misc/amanda/files/patch-ah b/misc/amanda/files/patch-ah
new file mode 100644
index 000000000000..a4df6778fcf8
--- /dev/null
+++ b/misc/amanda/files/patch-ah
@@ -0,0 +1,11 @@
+--- common-src/amanda.h.orig	Fri Nov 24 11:33:22 2000
++++ common-src/amanda.h	Fri Nov 24 11:33:33 2000
+@@ -421,7 +421,7 @@
+ #endif
+ 
+ #ifndef HAVE_INITGROUPS_DECL
+-extern int initgroups P((const char *name, gid_t basegid));
++/* extern int initgroups P((const char *name, gid_t basegid)); */
+ #endif
+ 
+ #ifndef HAVE_LISTEN_DECL
diff --git a/misc/amanda/pkg-descr b/misc/amanda/pkg-descr
index a4e85566669a..30b9969b374b 100644
--- a/misc/amanda/pkg-descr
+++ b/misc/amanda/pkg-descr
@@ -2,4 +2,4 @@ This is 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.
 
-WWW: http://www.cs.umd.edu/projects/amanda/
+WWW: http://www.amanda.org/
diff --git a/misc/amanda/pkg-install b/misc/amanda/pkg-install
index df3d010922ee..569b7ddcdea8 100644
--- a/misc/amanda/pkg-install
+++ b/misc/amanda/pkg-install
@@ -1,38 +1,15 @@
 #! /bin/sh
 
-if [ "X$2" != "XPOST-INSTALL" ]; then
-    exit 0
-fi
-
-echo -n "Adding necessary groups and modifying permissions on "
-echo "${PKG_PREFIX}/libexec/amanda dir" 
-
-group=amanda
-
-if pw groupshow "${group}" 2>/dev/null; then
-    echo "You already have a group \"${group}\", so I will use it."
-else
-    echo "You need a group \"${group}\"."
-    if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
-        read -p "Would you like me to create it? [Y] " ans
-    fi
-    if [ x$ans = x ]; then
-        ans=y
-    fi
-    case "$ans" in
-    [Yy]*)
-        pw groupadd ${group} -h - || exit
-        echo "Done."
+# $FreeBSD: /tmp/pcvs/ports/misc/amanda/Attic/pkg-install,v 1.3 2000-11-28 03:26:20 foxfair Exp $
+USER=operator
+GROUP=${USER}
+
+case $2 in
+POST-INSTALL)
+	echo "Modifying permissions on ${PKG_PREFIX}/libexec/amanda"
+	/usr/sbin/chown ${USER}:${GROUP} ${PKG_PREFIX}/libexec/amanda
+	/bin/chmod 510 ${PKG_PREFIX}/libexec/amanda
+	/usr/sbin/chown ${USER}:${GROUP} ${PKG_PREFIX}/libexec/amanda/*
+	/bin/chmod 4550 ${PKG_PREFIX}/libexec/amanda/*
 	;;
-    *)
-        echo "Please create it, and try again."
-	exit 1
-	;;
-    esac
-fi
-
-echo "Modifying permissions on ${PKG_PREFIX}/libexec/amanda"
-/usr/sbin/chown root:amanda ${PKG_PREFIX}/libexec/amanda
-/bin/chmod 510 ${PKG_PREFIX}/libexec/amanda
-/usr/sbin/chown root:amanda ${PKG_PREFIX}/libexec/amanda/*
-/bin/chmod 4550 ${PKG_PREFIX}/libexec/amanda/*
+esac
diff --git a/misc/amanda/pkg-plist b/misc/amanda/pkg-plist
index c100ef0b1fc3..2c3c43345a96 100644
--- a/misc/amanda/pkg-plist
+++ b/misc/amanda/pkg-plist
@@ -1,25 +1,44 @@
 libexec/amanda/amandad
+libexec/amanda/amgetidx
+libexec/amanda/amidxtaped
+libexec/amanda/amindexd
+libexec/amanda/amtrmidx
 libexec/amanda/calcsize
 libexec/amanda/chg-generic
+libexec/amanda/createindex-dump
+libexec/amanda/createindex-gnutar
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/getconf
+libexec/amanda/hp-changer
+libexec/amanda/no-changer
+libexec/amanda/patch-system
 libexec/amanda/planner
 libexec/amanda/reporter
+libexec/amanda/rth-changer 
+libexec/amanda/rundump
 libexec/amanda/runtar
 libexec/amanda/selfcheck
 libexec/amanda/sendbackup-dump
-libexec/amanda/sendbackup-gnutar
+libexec/amanda/sendbackup-gnutar 
+libexec/amanda/sendindex
 libexec/amanda/sendsize
 libexec/amanda/taper
-sbin/amadmin
-sbin/amcheck
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amlabel
-sbin/amrestore
-sbin/amtape
+libexec/amanda/versionsuffix
+bin/amadmin
+bin/amcheck
+bin/amcheckdb
+bin/amcleanup
+bin/amdump
+bin/amflush
+bin/amlabel
+bin/amoverview
+bin/amrecover
+bin/amrestore
+bin/amrmtape
+bin/amtape
+bin/amtoc
+bin/amverify
 share/examples/amanda/amanda.conf
 share/examples/amanda/chg-generic.conf
 share/examples/amanda/disklist