6 files changed, 34 insertions, 20 deletions

diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index f209ed2af0ce..602a6e9fd186 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	3.2.3
+PORTVERSION=	3.3.1
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -92,7 +92,7 @@ pre-fetch:
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
-CONFLICTS=	amanda-server-2.5.* amanda-server-2.6.*
+CONFLICTS=	amanda-server-2.5.* amanda-server-2.6.* amanda-server-3.2.*
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
 RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
@@ -104,15 +104,18 @@ MAN5=		disklist.5 \
 MAN7=		amanda-changers.7 \
 		amanda-compatibility.7 \
 		amanda-devices.7 \
+		amanda-interactivity.7 \
 		amanda-taperscan.7
 MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
-		amcheckdb.8 amcheckdump.8 amcleanup.8 \
+		amcheckdb.8 amcheckdump.8 \
+		amcleanup.8 \
+		amcleanupdisk.8 \
 		amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
 		amdevcheck.8 \
 		amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
 		amlabel.8 \
 		amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
-		amserverconfig.8 amservice.8 amstatus.8 \
+		amserverconfig.8 amstatus.8 \
 		amtape.8 amtoc.8 amtapetype.8 \
 		amvault.8
 
@@ -171,7 +174,7 @@ pre-fetch:
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
-CONFLICTS=	amanda-client-2.5.* amanda-client-2.6.*
+CONFLICTS=	amanda-client-2.5.* amanda-client-2.6.* amanda-client-3.2.*
 CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 .if defined(AMANDA_NO_SNAPSHOT_DUMP)
 CFLAGS=		-DFreeBSD_NO_SNAPSHOT_DUMP=t
@@ -186,11 +189,13 @@ MAN7=		amanda-applications.7 \
 		amanda-scripts.7
 MAN8=		amanda.8 \
 		amarchiver.8 \
+		amdump_client.8 \
 		amgtar.8 \
 		ampgsql.8 \
 		amraw.8 \
 		amrecover.8 \
 		amsamba.8 \
+		amservice.8 \
 		amstar.8 \
 		amsuntar.8 \
 		amzfs-sendrecv.8 \
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index d098fe5653d9..08e9c21301c0 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amanda-3.2.3.tar.gz) = 8ac37cc82add71ffd009fa4ea8763c633037277e15d51d28aefb8cb4c0b6a7fd
-SIZE (amanda-3.2.3.tar.gz) = 4125405
+SHA256 (amanda-3.3.1.tar.gz) = 190fcf84b7154494772d7ff6f8225fc165e89b4563437c6358549456f73e7612
+SIZE (amanda-3.3.1.tar.gz) = 4328574
diff --git a/misc/amanda-server/files/patch-common-src::Makefile.in b/misc/amanda-server/files/patch-common-src::Makefile.in
index 16be032af49a..0cb609a3a730 100644
--- a/misc/amanda-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda-server/files/patch-common-src::Makefile.in
@@ -1,9 +1,9 @@
---- common-src/Makefile.in.orig	2010-10-16 18:21:52.890010063 +0900
-+++ common-src/Makefile.in	2010-10-16 18:22:26.842453745 +0900
-@@ -1346,7 +1346,7 @@
+--- common-src/Makefile.in.orig	2012-02-21 20:37:54.000000000 +0900
++++ common-src/Makefile.in	2012-05-08 11:49:17.145335897 +0900
+@@ -1363,7 +1363,7 @@
  INCLUDES = -I$(top_srcdir)/gnulib   
  AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 -amlib_LTLIBRARIES = libamanda.la
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la
  LINT = $(AMLINT)
diff --git a/misc/amanda-server/files/patch-xfer-src::Makefile.in b/misc/amanda-server/files/patch-xfer-src::Makefile.in
index e9c3e7838a30..cb48325de180 100644
--- a/misc/amanda-server/files/patch-xfer-src::Makefile.in
+++ b/misc/amanda-server/files/patch-xfer-src::Makefile.in
@@ -1,9 +1,9 @@
---- xfer-src/Makefile.in.orig	2010-10-16 14:38:56.304820189 +0900
-+++ xfer-src/Makefile.in	2010-10-16 14:40:42.063983713 +0900
-@@ -1176,7 +1176,7 @@
+--- xfer-src/Makefile.in.orig	2012-02-21 20:37:55.000000000 +0900
++++ xfer-src/Makefile.in	2012-05-08 11:54:46.833498833 +0900
+@@ -1187,7 +1187,7 @@
  
  AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS) $(AS_NEEDED_FLAGS)
 -amlib_LTLIBRARIES = libamxfer.la
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la
  LINT = $(AMLINT)
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index 447d05ac893a..9bbefbf90f5e 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -7,6 +7,7 @@ lib/amanda/libamserver.a
 lib/amanda/libamserver.la
 lib/amanda/libamserver.so
 %%SITE_PERL%%/Amanda/Changer.pm
+%%SITE_PERL%%/Amanda/Changer/aggregate.pm
 %%SITE_PERL%%/Amanda/Changer/compat.pm
 %%SITE_PERL%%/Amanda/Changer/disk.pm
 %%SITE_PERL%%/Amanda/Changer/multi.pm
@@ -22,8 +23,11 @@ lib/amanda/libamserver.so
 %%SITE_PERL%%/Amanda/Device.pm
 %%SITE_PERL%%/Amanda/Disklist.pm
 %%SITE_PERL%%/Amanda/Holding.pm
-%%SITE_PERL%%/Amanda/Interactive.pm
-%%SITE_PERL%%/Amanda/Interactive/stdin.pm
+%%SITE_PERL%%/Amanda/Interactivity.pm
+%%SITE_PERL%%/Amanda/Interactivity/email.pm
+%%SITE_PERL%%/Amanda/Interactivity/stdin.pm
+%%SITE_PERL%%/Amanda/Interactivity/tty.pm
+%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
 %%SITE_PERL%%/Amanda/Logfile.pm
 %%SITE_PERL%%/Amanda/Recovery/Clerk.pm
 %%SITE_PERL%%/Amanda/Recovery/Planner.pm
@@ -32,10 +36,13 @@ lib/amanda/libamserver.so
 %%SITE_PERL%%/Amanda/Report/human.pm
 %%SITE_PERL%%/Amanda/Report/postscript.pm
 %%SITE_PERL%%/Amanda/Report/xml.pm
+%%SITE_PERL%%/Amanda/ScanInventory.pm
 %%SITE_PERL%%/Amanda/Tapelist.pm
 %%SITE_PERL%%/Amanda/Taper/Controller.pm
 %%SITE_PERL%%/Amanda/Taper/Protocol.pm
 %%SITE_PERL%%/Amanda/Taper/Scan.pm
+%%SITE_PERL%%/Amanda/Taper/Scan/lexical.pm
+%%SITE_PERL%%/Amanda/Taper/Scan/oldest.pm
 %%SITE_PERL%%/Amanda/Taper/Scan/traditional.pm
 %%SITE_PERL%%/Amanda/Taper/Scribe.pm
 %%SITE_PERL%%/Amanda/Taper/Worker.pm
@@ -54,7 +61,7 @@ lib/amanda/libamserver.so
 %%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.so
 %%PLOT%%libexec/amanda/amcat.awk
 libexec/amanda/amcheck-device
-libexec/amanda/amcleanupdisk
+libexec/amanda/amdumpd
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.awk
@@ -80,6 +87,7 @@ sbin/amcheck
 sbin/amcheckdb
 sbin/amcheckdump
 sbin/amcleanup
+sbin/amcleanupdisk
 sbin/amdevcheck
 sbin/amdump
 sbin/amfetchdump
@@ -91,7 +99,6 @@ sbin/amreport
 sbin/amrestore
 sbin/amrmtape
 sbin/amserverconfig
-sbin/amservice
 sbin/amstatus
 sbin/amtape
 sbin/amtapetype
@@ -107,7 +114,7 @@ sbin/amvault
 @dirrm %%SITE_PERL%%/Amanda/Taper
 @dirrm %%SITE_PERL%%/Amanda/Report
 @dirrm %%SITE_PERL%%/Amanda/Recovery
-@dirrm %%SITE_PERL%%/Amanda/Interactive
+@dirrm %%SITE_PERL%%/Amanda/Interactivity
 @dirrm %%SITE_PERL%%/Amanda/DB
 @dirrm %%SITE_PERL%%/Amanda/Curinfo
 @dirrm %%SITE_PERL%%/Amanda/Changer
diff --git a/misc/amanda-server/pkg-plist.client b/misc/amanda-server/pkg-plist.client
index 4eb7901b5d01..118adbba10bf 100644
--- a/misc/amanda-server/pkg-plist.client
+++ b/misc/amanda-server/pkg-plist.client
@@ -106,10 +106,12 @@ sbin/amcrypt
 sbin/amcrypt-ossl
 sbin/amcrypt-ossl-asym
 sbin/amcryptsimple
+sbin/amdump_client
 sbin/amgetconf
 sbin/amgpgcrypt
 sbin/amoldrecover
 sbin/amrecover
+sbin/amservice
 %%DATADIR%%/COPYRIGHT
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/NEWS