Index: misc/amanda-server/Makefile
===================================================================
--- misc/amanda-server/Makefile	(revision 434775)
+++ misc/amanda-server/Makefile	(working copy)
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	amanda
-PORTVERSION=	3.3.6
-PORTREVISION=	3
-PORTEPOCH=	1
+PORTVERSION=	3.3.9
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -33,7 +31,7 @@
 		--with-user=${USERS} --with-group=${AMANDA_GROUP} \
 		--with-bsdtcp-security --with-bsdudp-security \
 		--with-ssh-security \
-		--disable-installperms
+		--disable-installperms --with-security-file=${PREFIX}/etc/amanda/security.conf
 CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl-amanda
 PKG_MESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
@@ -55,8 +53,8 @@
 .endif
 GROUPS?=	operator amanda
 
-AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
-AMANDA_DATES?=		${PREFIX}/var/amanda/amandates
+AMANDA_GNUTAR_LISTDIR?=	/var/db/amanda/gnutar-lists
+AMANDA_DATES?=		/var/db/amanda/amandates
 PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_GROUP=${AMANDA_GROUP}
 
 # amanda-server/amanda-client common part
@@ -122,7 +120,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-SAMBA_PORT?=	samba36
+SAMBA_PORT?=	samba44
 BUILD_DEPENDS+=	smbclient:net/${SAMBA_PORT}
 RUN_DEPENDS+=	smbclient:net/${SAMBA_PORT}
 CONFIGURE_ARGS+=	--with-smbclient=${LOCALBASE}/bin/smbclient
@@ -156,7 +154,7 @@
 	@${ECHO} "        The default is `uname -n`"
 	@${ECHO} "    AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"
 	@${ECHO} "        the gnutar index files should live in"
-	@${ECHO} "        The default is ${PREFIX}/var/amanda/gnutar-lists"
+	@${ECHO} "        The default is /var/db/amanda/gnutar-lists"
 	@${ECHO} "    AMANDA_USER=user to specify the default user"
 	@${ECHO} "        The default is amanda"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
Index: misc/amanda-server/distinfo
===================================================================
--- misc/amanda-server/distinfo	(revision 434775)
+++ misc/amanda-server/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c
-SIZE (amanda-3.3.6.tar.gz) = 4571518
+SHA256 (amanda-3.3.9.tar.gz) = 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41
+SIZE (amanda-3.3.9.tar.gz) = 4673301
Index: misc/amanda-server/files/patch-perl__Makefile.in
===================================================================
--- misc/amanda-server/files/patch-perl__Makefile.in	(revision 434775)
+++ misc/amanda-server/files/patch-perl__Makefile.in	(nonexistent)
@@ -1,39 +0,0 @@
---- 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
-+@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm
- Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
- 	Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
--	$(am__append_7) Amanda/Xfer.pm $(am__append_10) \
-+	$(am__append_7) $(am__append_xfer) $(am__append_10) \
- 	$(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 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
-@@ -1947,12 +1949,12 @@
- @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
- 
- # PACKAGE: Amanda::Xfer
--libXferdir = $(amperldir)/auto/Amanda/Xfer
--libXfer_LTLIBRARIES = libXfer.la
--libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
--libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libXfer_la_LIBADD = amglue/libamglue.la \
--	$(top_builddir)/xfer-src/libamxfer.la
-+@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer
-+@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la
-+@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/xfer-src/libamxfer.la
- 
- 
- # PACKAGE: Amanda::NDMP

Property changes on: misc/amanda-server/files/patch-perl__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property