5 files changed, 25 insertions, 55 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 6559d1f79f21..d21929b30b34 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-client
-PORTREVISION=	3
 
-COMMENT=	The Advanced Maryland Automatic Network Disk Archiver (client)
+COMMENT=	Advanced Maryland Automatic Network Disk Archiver (client)
 
 MASTERDIR=	${.CURDIR}/../amanda-server
 
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 0235fe0db597..6d2697662470 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amanda
-PORTVERSION=	3.3.2
-PORTREVISION?=	3
+PORTVERSION=	3.3.6
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -106,7 +105,8 @@ pre-fetch:
 CONFLICTS=	amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-*
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
-RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
+RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client \
+		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
 
 CONFIGURE_ARGS+=--without-client
 
diff --git a/misc/amanda-server/distinfo b/misc/amanda-server/distinfo
index 3a5ac46f3239..0db7427d35a2 100644
--- a/misc/amanda-server/distinfo
+++ b/misc/amanda-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amanda-3.3.2.tar.gz) = cb40e8aa601e3d106e7d78338b745e5b9c0cd41daaab7937fc23d1b4cf585424
-SIZE (amanda-3.3.2.tar.gz) = 4348919
+SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c
+SIZE (amanda-3.3.6.tar.gz) = 4571518
diff --git a/misc/amanda-server/files/patch-perl__Makefile.in b/misc/amanda-server/files/patch-perl__Makefile.in
index a2bed44a04be..138fbf8a1269 100644
--- a/misc/amanda-server/files/patch-perl__Makefile.in
+++ b/misc/amanda-server/files/patch-perl__Makefile.in
@@ -1,7 +1,7 @@
---- perl/Makefile.in.orig	2010-10-07 03:58:28.000000000 +0900
-+++ perl/Makefile.in	2010-10-16 21:16:31.327136585 +0900
-@@ -1541,13 +1541,15 @@
- # PACKAGE: Amanda::Script_App
+--- perl/Makefile.in.orig	2014-07-09 16:23:26.000000000 +0200
++++ perl/Makefile.in	2014-09-12 16:42:55.653005667 +0200
+@@ -1812,13 +1812,15 @@
+ # PACKAGE: Amanda::Extract
  
  # PACKAGE: Amanda::Script
 +@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
@@ -13,12 +13,12 @@
  	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
  	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
  	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
--	Amanda/Constants.pm Amanda/Script_App.pm $(am__append_16) \
-+	$(am__append_const) Amanda/Script_App.pm $(am__append_16) \
- 	$(am__append_17) Amanda/Script.pm
+-	Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
++	$(am__append_const) Amanda/Script_App.pm Amanda/Extract.pm \
+ 	$(am__append_16) $(am__append_17) Amanda/Script.pm
  
  # PACKAGE: Amanda::Archive
-@@ -1670,12 +1672,12 @@
+@@ -1947,12 +1949,12 @@
  @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
  
  # PACKAGE: Amanda::Xfer
diff --git a/misc/amanda-server/pkg-plist b/misc/amanda-server/pkg-plist
index c8026a1ebcf4..abbda283cc32 100644
--- a/misc/amanda-server/pkg-plist
+++ b/misc/amanda-server/pkg-plist
@@ -25,6 +25,7 @@
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/DB/Catalog.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Device.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Disklist.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Extract.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Holding.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/email.pm
@@ -37,6 +38,8 @@
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/human.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json.pm
+%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json_raw.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/postscript.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/xml.pm
 %%SERVER_ONLY%%%%SITE_PERL%%/Amanda/ScanInventory.pm
@@ -146,21 +149,6 @@
 %%SERVER_ONLY%%sbin/amtapetype
 %%SERVER_ONLY%%sbin/amtoc
 %%SERVER_ONLY%%sbin/amvault
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/XferServer
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Disklist
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Device
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Taper/Scan
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Taper
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Report
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Recovery
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Interactivity
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/DB
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Curinfo
-%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Changer
-%%SERVER_ONLY%%@dirrm include/amanda
 @comment
 @comment plist for misc/amanda-client below
 @comment
@@ -193,6 +181,11 @@
 %%CLIENT_ONLY%%libexec/amanda/amndmjob
 %%CLIENT_ONLY%%@mode 4750
 %%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
+%%CLIENT_ONLY%%libexec/amanda/application/ambsdtar
+%%CLIENT_ONLY%%@mode
+%%CLIENT_ONLY%%@group
+%%CLIENT_ONLY%%@mode 4750
+%%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
 %%CLIENT_ONLY%%libexec/amanda/application/amgtar
 %%CLIENT_ONLY%%@mode
 %%CLIENT_ONLY%%@group
@@ -271,6 +264,7 @@
 %%CLIENT_ONLY%%man/man7/amanda-scripts.7.gz
 %%CLIENT_ONLY%%man/man8/amanda.8.gz
 %%CLIENT_ONLY%%man/man8/amarchiver.8.gz
+%%CLIENT_ONLY%%man/man8/ambsdtar.8.gz
 %%CLIENT_ONLY%%man/man8/amdump_client.8.gz
 %%CLIENT_ONLY%%man/man8/amgtar.8.gz
 %%CLIENT_ONLY%%man/man8/ampgsql.8.gz
@@ -306,6 +300,8 @@
 %%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client-postgresql.conf
 %%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client.conf
 %%CLIENT_ONLY%%%%DATADIR%%/example/amanda.conf
+%%CLIENT_ONLY%%%%DATADIR%%/example/amandaclient.xml
+%%CLIENT_ONLY%%%%DATADIR%%/example/amandaserver.xml
 %%CLIENT_ONLY%%%%DATADIR%%/example/chg-multi.conf
 %%CLIENT_ONLY%%%%DATADIR%%/example/chg-scsi.conf
 %%CLIENT_ONLY%%%%DATADIR%%/example/disklist
@@ -329,28 +325,3 @@
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/tapetypes
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/README
 %%CLIENT_ONLY%%%%DATADIR%%/template.d/chg-manual.conf
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Xfer
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Util
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Tests
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/NDMP
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/IPC/Binary
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/IPC
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Header
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Feature
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Debug
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Config
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Archive
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Application
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/IPC
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Config
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Application
-%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda
-%%CLIENT_ONLY%%@dirrm %%DATADIR%%/template.d
-%%CLIENT_ONLY%%@dirrm %%DATADIR%%/example/label-templates
-%%CLIENT_ONLY%%@dirrm %%DATADIR%%/example
-%%CLIENT_ONLY%%@dirrm %%DATADIR%%
-%%CLIENT_ONLY%%@dirrm libexec/amanda/application
-%%CLIENT_ONLY%%@dirrm libexec/amanda
-%%CLIENT_ONLY%%@dirrm lib/amanda