5 files changed, 47 insertions, 24 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 40080591d7c0..a911cf968fd4 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.4.5p1
+PORTVERSION=	2.5.0p2
 PORTREVISION?=	0
 PKGNAMESUFFIX?=	-server
 PORTEPOCH=	1
@@ -100,8 +100,9 @@ RUN_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda-client
 
 CONFIGURE_ARGS+=--without-client
 
-MAN8=		amadmin.8 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 \
-		amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
+MAN8=		amadmin.8 amaespipe.8 amcheck.8 \
+		amcheckdb.8 amcleanup.8 amcrypt.8 amdd.8 \
+		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 \
 		amoverview.8 amreport.8 amrmtape.8 amstatus.8 \
 		amtape.8 amtoc.8 amverify.8 amverifyrun.8 amtapetype.8
 
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 15c9c45146af..69e586bba7d7 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.4.5p1.tar.gz) = 8fd967a6f63c4a91f0a38f56e2339ec8
-SHA256 (amanda-2.4.5p1.tar.gz) = 71e2716f1098f5ac6633e02e252e048ce0e76f880e2ddb531d9d261ad263fe64
-SIZE (amanda-2.4.5p1.tar.gz) = 1557400
+MD5 (amanda-2.5.0p2.tar.gz) = 073828b8b5a5c377a08f8f19b5eccf85
+SHA256 (amanda-2.5.0p2.tar.gz) = ba691f9b7607431d642eca57ff25b328df83eba7149479587bfabcd0adc3ea2c
+SIZE (amanda-2.5.0p2.tar.gz) = 1744317
diff --git a/misc/amanda-server/files/patch-aa b/misc/amanda-server/files/patch-aa
index 3e14a6ca4b07..b52dbe5b5f3f 100644
--- a/misc/amanda-server/files/patch-aa
+++ b/misc/amanda-server/files/patch-aa
@@ -1,20 +1,31 @@
---- man/Makefile.in.orig	Tue Oct 25 06:23:41 2005
-+++ man/Makefile.in	Wed Mar 22 12:08:22 2006
-@@ -247,7 +247,7 @@
+--- man/Makefile.in.orig	Mon May  8 20:51:44 2006
++++ man/Makefile.in	Fri Jun  9 07:18:19 2006
+@@ -40,7 +40,7 @@
+ @WANT_AMPLOT_TRUE@am__append_1 = $(AMPLOT_MAN8_PAGES)
+ @WANT_SERVER_TRUE@am__append_2 = $(SERVER_MAN8_PAGES)
+ @WANT_RECOVER_TRUE@am__append_3 = $(RECOVER_MAN8_PAGES)
+-@WANT_RESTORE_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES)
++@WANT_CLIENT_TRUE@am__append_4 = $(RESTORE_MAN8_PAGES)
+ subdir = man
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -260,8 +260,8 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
- @WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
--COMMON_MAN_PAGES = amanda.8 amanda.conf.5
-+@WANT_CLIENT_TRUE@COMMON_MAN_PAGES = amanda.8 amanda.conf.5
- @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
- @WANT_SERVER_TRUE@		   amcheck.8 \
- @WANT_SERVER_TRUE@		   amcheckdb.8 \
-@@ -269,7 +269,7 @@
- @WANT_SERVER_TRUE@		   amverifyrun.8
+ AMPLOT_MAN8_PAGES = amplot.8
+-COMMON_MAN8_PAGES = amanda.8
+-COMMON_MAN5_PAGES = amanda.conf.5
++@WANT_CLIENT_TRUE@COMMON_MAN8_PAGES = amanda.8
++@WANT_CLIENT_TRUE@COMMON_MAN5_PAGES = amanda.conf.5
+ SERVER_MAN8_PAGES = amadmin.8 \
+ 		    amcheck.8 \
+ 		    amcheckdb.8 \
+@@ -286,7 +286,7 @@
+ 		    amaespipe.8
  
- @WANT_RECOVER_TRUE@RECOVER_MAN_PAGES = amrecover.8
--@WANT_RESTORE_TRUE@RESTORE_MAN_PAGES = amrestore.8
-+@WANT_CLIENT_TRUE@RESTORE_MAN_PAGES = amrestore.8
- 
- # not autoconf-generated:
- EXTRA_DIST = amadmin.8 amanda.8 amanda.conf.5 amcheck.8 amcheckdb.8 amcleanup.8 amdd.8 amdump.8 amflush.8 amgetconf.8 amlabel.8 ammt.8 amoverview.8 amplot.8 amreport.8 amrecover.8 amrestore.8 amrmtape.8 amstatus.8 amtape.8 amtapetype.8 amtoc.8 amverify.8 amverifyrun.8
+ @WANT_RECOVER_TRUE@RECOVER_MAN8_PAGES = amrecover.8
+-@WANT_RESTORE_TRUE@RESTORE_MAN8_PAGES = amrestore.8
++@WANT_CLIENT_TRUE@RESTORE_MAN8_PAGES = amrestore.8
+ man8_MANS = $(COMMON_MAN8_PAGES) $(am__append_1) $(am__append_2) \
+ 	$(am__append_3) $(am__append_4)
+ man5_MANS = $(COMMON_MAN5_PAGES)
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 59b5ceca2be9..4e168478a019 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -6,6 +6,10 @@ lib/libamtape-%%SHLIBVER%%.so
 lib/libamtape.so
 lib/libamtape.la
 lib/libamtape.a
+lib/librestore-%%SHLIBVER%%.so
+lib/librestore.a
+lib/librestore.la
+lib/librestore.so
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
@@ -29,17 +33,21 @@ libexec/amanda/chg-rait
 libexec/amanda/chg-rth
 %%SCSICHG%%libexec/amanda/chg-scsi
 libexec/amanda/chg-zd-mtx
+libexec/amanda/chunker
 libexec/amanda/amidxtaped
 libexec/amanda/driver
 libexec/amanda/dumper
 libexec/amanda/planner
 libexec/amanda/taper
 sbin/amadmin
+sbin/amaespipe
 sbin/amcheck
 sbin/amcheckdb
 sbin/amcleanup
+sbin/amcrypt
 sbin/amdd
 sbin/amdump
+sbin/amfetchdump
 sbin/amflush
 sbin/amgetconf
 sbin/amlabel
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index 274d146525c4..aa9754105df0 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -1,4 +1,6 @@
 @unexec if cmp -s /etc/amandates /dev/null; then rm -f /etc/amandates; fi
+dumper/generic-dumper
+dumper/gnutar
 lib/libamanda-%%SHLIBVER%%.so
 lib/libamanda.so
 lib/libamanda.la
@@ -8,9 +10,9 @@ lib/libamclient.so
 lib/libamclient.la
 lib/libamclient.a
 libexec/amanda/amandad
-libexec/amanda/amqde
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
+libexec/amanda/noop
 libexec/amanda/patch-system
 libexec/amanda/rundump
 libexec/amanda/runtar
@@ -106,3 +108,4 @@ share/examples/amanda/disklist
 @dirrm share/examples/amanda
 @dirrm share/amanda
 @dirrm libexec/amanda
+@dirrm dumper