14 files changed, 244 insertions, 435 deletions

diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 0de2c48af5f9..9fd6719e8e84 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	amanda
-PORTVERSION=	2.6.1p2
-PORTREVISION=	2
+PORTVERSION=	3.2.0
 PORTEPOCH=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT?=	The Advanced Maryland Automatic Network Disk Archiver (server)
 
+RUN_DEPENDS=	perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
+BUILD_DEPENDS=	perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
+
 WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda-client
 
@@ -24,26 +27,36 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig glib20
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-PATCH_STRIP=
+USE_LDCONFIG=	yes
+USE_PERL5=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--without-amlibexecdir \
 		--with-amandahosts --with-fqdn \
-		--with-dump-honor-nodump --with-buffered-dump \
+		--with-dump-honor-nodump \
 		--prefix=${PREFIX} \
 		--disable-glibtest \
-		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP} \
+		--with-user=${USERS} --with-group=${GROUPS} \
 		--with-bsdtcp-security --with-bsdudp-security \
 		--with-ssh-security
-
-USE_LDCONFIG=	yes
-USE_PERL5=	yes
+CONFIGURE_ENV=	PERL=${LOCALBASE}/bin/perl-amanda
+PKG_MESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTSDIR=${PORTSDIR}
 
 OPTIONS=	GNUTAR "use GNU tar" on
 
 .include <bsd.port.pre.mk>
 
-AMANDA_USER?=		operator
-AMANDA_GROUP?=		operator
+.if defined(AMANDA_USER)
+USERS=		${AMANDA_USER}
+.else
+USERS?=		amanda
+.endif
+.if defined(AMANDA_GROUP)
+GROUPS=		${AMANDA_GROUP}
+.else
+GROUPS?=	amanda
+.endif
 AMANDA_GNUTAR_LISTDIR?=	${PREFIX}/var/amanda/gnutar-lists
 AMANDA_DATES?=		${PREFIX}/var/amanda/amandates
 PLIST_SUB=		SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES}
@@ -54,38 +67,40 @@ CONFIGURE_ARGS+=	--with-index-server=${AMANDA_SERVER}
 CONFIGURE_ARGS+=	--with-tape-server=${AMANDA_SERVER}
 .endif
 
-.if defined (AMANDA_CONFIG)
-CONFIGURE_ARGS+=	--with-config=${AMANDA_CONFIG}
-.endif
-
 .if !defined(WITHOUT_GNUTAR)
 CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
 		--with-gnutar=${LOCALBASE}/bin/gtar
-BUILD_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
+RUN_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .endif
 
 # amanda-server part
 .if !defined(CLIENT_ONLY)
 
+pre-everything::
+.if defined(AMANDA_TAPE)
+	@${ECHO} "Use of \$AMANDA_TAPE is deprecated.  Specify it in amanda.conf."
+	exit 1
+.endif
+.if defined(AMANDA_CONFIG)
+	@${ECHO} "Use of \$AMANDA_CONFIG is deprecated.  Specify it in amanda.conf."
+	exit 1
+.endif
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
-	@${ECHO} "    AMANDA_TAPE=tape to specify the default tape device"
-	@${ECHO} "        The default is /dev/nrsa0"
-	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuration"
-	@${ECHO} "        The default is DailySet1"
 	@${ECHO} "    AMANDA_USER=user to specify the default user"
-	@${ECHO} "        The default is operator"
+	@${ECHO} "        The default is amanda"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
-	@${ECHO} "        The default is operator"
+	@${ECHO} "        The default is amanda"
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
-CONFLICTS=	amanda-server-2.5.*
+CONFLICTS=	amanda-server-2.5.* amanda-server-2.6.*
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
 RUN_DEPENDS+=	${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
@@ -95,7 +110,9 @@ CONFIGURE_ARGS+=--without-client
 MAN5=		disklist.5 \
 		tapelist.5
 MAN7=		amanda-changers.7 \
-		amanda-devices.7
+		amanda-compatibility.7 \
+		amanda-devices.7 \
+		amanda-taperscan.7
 MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
 		amcheckdb.8 amcheckdump.8 amcleanup.8 \
 		amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
@@ -109,8 +126,6 @@ MAN8=		amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
 
 OPTIONS+=	PLOT "enable ploting, requires X11 libraries" off\
 		SAMBA "enable the use of smbclient" off \
-		MTX "enable the use of mtx changer scripts" off \
-		AESPIPE "enable encryption. Needed by amcrypt" off \
 		S3 "enable Amazon S3 device support" off
 
 .if defined (WITH_PLOT)
@@ -131,16 +146,6 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/${SAMBA_PORT}
 CONFIGURE_ARGS+=	--with-smbclient=${PREFIX}/bin/smbclient
 .endif
 
-.if defined (WITH_MTX)
-BUILD_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
-RUN_DEPENDS+=	mtx:${PORTSDIR}/misc/mtx
-.endif
-
-.if defined (WITH_AESPIPE)
-RUN_DEPENDS+=	aespipe:${PORTSDIR}/security/aespipe
-.else
-.endif
-
 # If configure founds libcurl, automatically enabled it (with plist change).
 .if defined(WITH_S3)
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
@@ -151,34 +156,35 @@ CONFIGURE_ARGS+=	--disable-s3-device
 PLIST_SUB+=	S3DEVICE='@comment '
 .endif
 
-.if defined (AMANDA_TAPE)
-CONFIGURE_ARGS+=	--with-tape-device=${AMANDA_TAPE}
-.endif
+post-install:
+	${CAT} ${PKGMESSAGE}
 
 # amanda-client part
 .else
 
+pre-everything::
+.if defined(AMANDA_CONFIG)
+	@${ECHO} "Use of \$AMANDA_CONFIG is deprecated.  Specify it in amanda.conf."
+	exit 1
+.endif
+
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
 	@${ECHO} "    AMANDA_SERVER=server to specify a server name"
 	@${ECHO} "        The default is `uname -n`"
-	@${ECHO} "    AMANDA_CONFIG=config to specify the default configuation"
-	@${ECHO} "        The default is DailySet1"
 	@${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} "    AMANDA_USER=user to specify the default user"
-	@${ECHO} "        The default is operator"
+	@${ECHO} "        The default is amanda"
 	@${ECHO} "    AMANDA_GROUP=group to specify the default group"
-	@${ECHO} "        The default is operator"
+	@${ECHO} "        The default is amanda"
 	@${ECHO} "    AMANDA_DATES=path to client amandates file"
 	@${ECHO} ""
 
-OPTIONS+=	ZFSCOMP "accurate estimation of compressed ZFS filesystems" off
-
-CONFLICTS=	amanda-client-2.5.*
+CONFLICTS=	amanda-client-2.5.* amanda-client-2.6.*
 CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
 
 MAN5=		amanda-archive-format.5 \
@@ -186,43 +192,33 @@ MAN5=		amanda-archive-format.5 \
 		amanda.conf.5
 MAN7=		amanda-applications.7 \
 		amanda-auth.7 \
+		amanda-match.7 \
 		amanda-scripts.7
 MAN8=		amanda.8 \
 		amarchiver.8 \
 		amgtar.8 \
+		ampgsql.8 \
+		amraw.8 \
 		amrecover.8 \
 		amsamba.8 \
 		amstar.8 \
+		amsuntar.8 \
 		amzfs-sendrecv.8 \
 		amzfs-snapshot.8 \
 		script-email.8
 
 post-install:
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/example/chg-multi.conf \
-		${WRKSRC}/example/chg-scsi.conf \
-		${WRKSRC}/example/disklist \
-		${EXAMPLESDIR}
-.endif
 	${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_GNUTAR_LISTDIR}
+	${CHOWN} ${USERS}:${GROUPS} ${AMANDA_GNUTAR_LISTDIR}
 	${TOUCH} ${AMANDA_DATES}
-	${CHOWN} ${AMANDA_USER}:${AMANDA_GROUP} ${AMANDA_DATES}
-
-.endif
+	${CHOWN} ${USERS}:${GROUPS} ${AMANDA_DATES}
+	${CAT} ${PKGMESSAGE}
 
-.if defined(WITH_ZFSCOMP)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-application-src::amzfs-sendrecv.pl
 .endif
 
 # MEMO:
 #   Prefix @WANT_SERVER_TRUE@ for server only files.
 #   Prefix @WANT_CLIENT_TRUE@ for client only files.
 #   For debugging: dbprintf(_("getcmd: %s\n"), line);
-# Maintainer TODO:
-#   o amanda-server installs libexec/amanda/amandad, sbin/amarchiver
-#     which should be handled by amanda-client only.
-#   o pthread issue: http://wiki.zmanda.com/index.php/Installation/OS_Specific_Notes/Installing_Amanda_on_FreeBSD#Threading_and_-pthread
 
 .include <bsd.port.post.mk>
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
index 7d26a0a79d4e..f5d483d37305 100644
--- a/misc/amanda32-server/distinfo
+++ b/misc/amanda32-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (amanda-2.6.1p2.tar.gz) = 816ef0101b6d968c5df7d7d7e793caed
-SHA256 (amanda-2.6.1p2.tar.gz) = 828c71040f1ccf69f9996907a3575b7dc27890ea7a5fae5eac77183125eda195
-SIZE (amanda-2.6.1p2.tar.gz) = 2868102
+MD5 (amanda-3.2.0.tar.gz) = df73a318af8f04e9ad2ecb4d59dc052c
+SHA256 (amanda-3.2.0.tar.gz) = 757b6ea31cce3737a2620c9dd0112e59891fdf48528e00464c42eb26a750290c
+SIZE (amanda-3.2.0.tar.gz) = 4111184
diff --git a/misc/amanda32-server/files/patch-amandad-src::Makefile.in b/misc/amanda32-server/files/patch-amandad-src::Makefile.in
index 9a80b4b90f95..0e3a9389165b 100644
--- a/misc/amanda32-server/files/patch-amandad-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-amandad-src::Makefile.in
@@ -1,12 +1,11 @@
---- amandad-src/Makefile.in.orig	2009-01-27 13:43:16.000000000 +0900
-+++ amandad-src/Makefile.in	2009-01-27 13:44:02.000000000 +0900
-@@ -776,7 +776,8 @@
+--- amandad-src/Makefile.in.orig	2010-10-16 18:41:37.735202558 +0900
++++ amandad-src/Makefile.in	2010-10-16 18:42:00.351165593 +0900
+@@ -1171,7 +1171,7 @@
  AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
  LINT = $(AMLINT)
  LINTFLAGS = $(AMLINTFLAGS)
 -amlib_LTLIBRARIES = libamandad.la
-+@WANT_SERVER_TRUE@amlib_LTLIBRARIES = 
 +@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamandad.la
- LIB_EXTENSION = la
  libamandad_la_SOURCES = amandad_util.c
  libamandad_la_LDFLAGS = -release $(VERSION)
+ libamandad_la_LIBADD = ../common-src/libamanda.la
diff --git a/misc/amanda32-server/files/patch-changer-src::chg-glue.pl b/misc/amanda32-server/files/patch-changer-src::chg-glue.pl
deleted file mode 100644
index 20467d2116fd..000000000000
--- a/misc/amanda32-server/files/patch-changer-src::chg-glue.pl
+++ /dev/null
@@ -1,10 +0,0 @@
---- changer-src/chg-glue.pl.orig	2009-01-28 15:06:00.000000000 +0900
-+++ changer-src/chg-glue.pl	2009-01-28 15:06:22.000000000 +0900
-@@ -206,6 +206,7 @@
- 	finish();
- 	return;
-     }
-+    chomp($command);
- 
-     if (($slot) = ($command =~ /^-slot (.*)$/)) {
- 	do_slot($slot);
diff --git a/misc/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src::Makefile.in
index 9da99a06935e..16be032af49a 100644
--- a/misc/amanda32-server/files/patch-common-src::Makefile.in
+++ b/misc/amanda32-server/files/patch-common-src::Makefile.in
@@ -1,49 +1,11 @@
---- common-src/Makefile.in.orig	2009-11-06 05:11:37.000000000 +0900
-+++ common-src/Makefile.in	2009-12-14 10:29:52.479439079 +0900
-@@ -1091,6 +1091,7 @@
- 
- sbin_SCRIPTS_PERL = \
- 	    $(sbin_CHECK_PERL)
-+@WANT_SERVER_TRUE@sbin_SCRIPTS_PERL =
- 
- amlibexec_CHECK_PERL = 
- amlibexec_SCRIPTS_PERL = \
-@@ -1101,6 +1102,7 @@
- 	    amaespipe \
- 	    amcrypt-ossl \
- 	    amcrypt-ossl-asym
-+@WANT_SERVER_TRUE@sbin_SCRIPTS_SHELL =
- 
- amlibexec_SCRIPTS_SHELL = 
- SCRIPTS_INCLUDE = \
-@@ -1155,18 +1157,18 @@
- versuff.c: $(top_builddir)/config.status $(srcdir)/versuff.c.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- install-amlibLTLIBRARIES: $(amlib_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
--	@list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \
--	list2=; for p in $$list; do \
--	  if test -f $$p; then \
--	    list2="$$list2 $$p"; \
--	  else :; fi; \
--	done; \
--	test -z "$$list2" || { \
--	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \
--	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
--	}
-+@WANT_CLIENT_TRUE@	@$(NORMAL_INSTALL)
-+@WANT_CLIENT_TRUE@	test -z "$(amlibdir)" || $(MKDIR_P) "$(DESTDIR)$(amlibdir)"
-+@WANT_CLIENT_TRUE@	@list='$(amlib_LTLIBRARIES)'; test -n "$(amlibdir)" || list=; \
-+@WANT_CLIENT_TRUE@	list2=; for p in $$list; do \
-+@WANT_CLIENT_TRUE@	  if test -f $$p; then \
-+@WANT_CLIENT_TRUE@	    list2="$$list2 $$p"; \
-+@WANT_CLIENT_TRUE@	  else :; fi; \
-+@WANT_CLIENT_TRUE@	done; \
-+@WANT_CLIENT_TRUE@	test -z "$$list2" || { \
-+@WANT_CLIENT_TRUE@	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \
-+@WANT_CLIENT_TRUE@	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
-+@WANT_CLIENT_TRUE@	}
- 
- uninstall-amlibLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
+--- 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 @@
+ INCLUDES = -I$(top_srcdir)/gnulib   
+ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+-amlib_LTLIBRARIES = libamanda.la
++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la
+ LINT = $(AMLINT)
+ LINTFLAGS = $(AMLINTFLAGS)
+ libamanda_la_SOURCES = alloc.c amfeatures.c amflock.c ipc-binary.c \
diff --git a/misc/amanda32-server/files/patch-common-src::glib-util.c b/misc/amanda32-server/files/patch-common-src::glib-util.c
deleted file mode 100644
index c7450c7835eb..000000000000
--- a/misc/amanda32-server/files/patch-common-src::glib-util.c
+++ /dev/null
@@ -1,51 +0,0 @@
-
---- common-src/glib-util.c.orig	2010-05-20 13:19:58.000000000 -0400
-+++ common-src/glib-util.c	2010-05-20 13:24:40.000000000 -0400
-@@ -38,26 +38,15 @@
-     if (did_glib_init) return;
-     did_glib_init = TRUE;
- 
--    /* Initialize glib's type system */
--    g_type_init();
--
-     /* set up libcurl (this must happen before threading 
-      * is initialized) */
- #ifdef HAVE_LIBCURL
- # ifdef G_THREADS_ENABLED
--    g_assert(!g_thread_supported());
-+    g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
- # endif
-     g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
- #endif
- 
--    /* And set up glib's threads */
--#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
--    if (g_thread_supported()) {
--        return;
--    }
--    g_thread_init(NULL);
--#endif
--
-     /* do a version check */
- #if GLIB_CHECK_VERSION(2,6,0)
-     {
-@@ -71,6 +60,17 @@
- 	}
-     }
- #endif
-+
-+    /* Initialize glib's type system.  On glib >= 2.24, this will initialize
-+     * threads, so it must be done after curl is initialized. */
-+    g_type_init();
-+
-+    /* And set up glib's threads */
-+#if defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)
-+    if (!g_thread_supported())
-+        g_thread_init(NULL);
-+#endif
-+
- }
- 
- typedef enum {
-
-
diff --git a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in b/misc/amanda32-server/files/patch-ndmp-src::Makefile.in
new file mode 100644
index 000000000000..2dd3f4b9f32d
--- /dev/null
+++ b/misc/amanda32-server/files/patch-ndmp-src::Makefile.in
@@ -0,0 +1,15 @@
+--- ndmp-src/Makefile.in.orig	2010-10-16 18:45:40.253086014 +0900
++++ ndmp-src/Makefile.in	2010-10-16 18:46:36.949487552 +0900
+@@ -1289,9 +1289,9 @@
+ # Divide the library up into the library side and down (libndmlib.la),
+ # and the full set of rules, agents, and so on required to build ndmjob
+ # (libndmjob.la).
+-amlib_LTLIBRARIES = \
+-	libndmlib.la \
+-	libndmjob.la
++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = \
++@WANT_CLIENT_TRUE@	libndmlib.la \
++@WANT_CLIENT_TRUE@	libndmjob.la
+ 
+ libndmjla = \
+ 	ndma_comm_job.c \
diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl::Makefile.in
index b32626c1144e..a2bed44a04be 100644
--- a/misc/amanda32-server/files/patch-perl::Makefile.in
+++ b/misc/amanda32-server/files/patch-perl::Makefile.in
@@ -1,195 +1,39 @@
---- perl/Makefile.in.orig	2009-01-22 22:51:25.000000000 +0900
-+++ perl/Makefile.in	2009-01-27 16:15:23.000000000 +0900
-@@ -316,9 +316,9 @@
- 	$(libApplication_la_LDFLAGS) $(LDFLAGS) -o $@
- @WANT_CLIENT_TRUE@am_libApplication_la_rpath = -rpath \
- @WANT_CLIENT_TRUE@	$(libApplicationdir)
--libArchive_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/amar-src/libamar.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libArchive_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/amar-src/libamar.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libArchive_la_OBJECTS = Archive.lo $(am__objects_1)
- libArchive_la_OBJECTS = $(am_libArchive_la_OBJECTS)
- libArchive_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -337,15 +337,15 @@
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libCmdline_la_LDFLAGS) $(LDFLAGS) -o $@
- @WANT_SERVER_TRUE@am_libCmdline_la_rpath = -rpath $(libCmdlinedir)
--libConfig_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libConfig_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libConfig_la_OBJECTS = Config.lo $(am__objects_1)
- libConfig_la_OBJECTS = $(am_libConfig_la_OBJECTS)
- libConfig_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libConfig_la_LDFLAGS) $(LDFLAGS) -o $@
--libDebug_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libDebug_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libDebug_la_OBJECTS = Debug.lo $(am__objects_1)
- libDebug_la_OBJECTS = $(am_libDebug_la_OBJECTS)
- libDebug_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -376,8 +376,8 @@
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libLogfile_la_LDFLAGS) $(LDFLAGS) -o $@
- @WANT_SERVER_TRUE@am_libLogfile_la_rpath = -rpath $(libLogfiledir)
--libMainLoop_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libMainLoop_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libMainLoop_la_OBJECTS = MainLoop.lo $(am__objects_1)
- libMainLoop_la_OBJECTS = $(am_libMainLoop_la_OBJECTS)
- libMainLoop_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -396,23 +396,23 @@
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libTapelist_la_LDFLAGS) $(LDFLAGS) -o $@
- @WANT_SERVER_TRUE@am_libTapelist_la_rpath = -rpath $(libTapelistdir)
--libTests_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libTests_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libTests_la_OBJECTS = Tests.lo $(am__objects_1)
- libTests_la_OBJECTS = $(am_libTests_la_OBJECTS)
- libTests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libTests_la_LDFLAGS) $(LDFLAGS) -o $@
--libTypes_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libTypes_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- am_libTypes_la_OBJECTS = Types.lo $(am__objects_1)
- libTypes_la_OBJECTS = $(am_libTypes_la_OBJECTS)
- libTypes_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(libTypes_la_LDFLAGS) $(LDFLAGS) -o $@
--libUtil_la_DEPENDENCIES = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
--am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
-+@WANT_CLIENT_TRUE@libUtil_la_DEPENDENCIES = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@am_libUtil_la_OBJECTS = Util.lo $(am__objects_1)
- libUtil_la_OBJECTS = $(am_libUtil_la_OBJECTS)
- libUtil_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -984,7 +984,8 @@
- 	$(am__append_2) $(am__append_3) $(am__append_4)
- 
- # (amplot has a conditional, but doesn't have any header files)
--amlib_LTLIBRARIES = libamglue.la
-+@WANT_SERVER_TRUE@amlib_LTLIBRARIES = 
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamglue.la
- libamglue_la_SOURCES = \
- 	amglue/ghashtable.c \
- 	amglue/bigint.c \
-@@ -1042,10 +1043,11 @@
- 	Amanda/Types.pm Amanda/Tests.pm Amanda/MainLoop.pm \
- 	Amanda/Paths.pm Amanda/Constants.pm Amanda/Script_App.pm \
- 	$(am__append_8) Amanda/Script.pm
-+@WANT_SERVER_TRUE@Amanda_DATA = $(am__append_5)
+--- 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
+ 
+ # 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 $(am__append_16) \
++	$(am__append_const) Amanda/Script_App.pm $(am__append_16) \
+ 	$(am__append_17) Amanda/Script.pm
  
  # PACKAGE: Amanda::Archive
--libArchivedir = $(amperldir)/auto/Amanda/Archive
--libArchive_LTLIBRARIES = libArchive.la
-+@WANT_CLIENT_TRUE@libArchivedir = $(amperldir)/auto/Amanda/Archive
-+@WANT_CLIENT_TRUE@libArchive_LTLIBRARIES = libArchive.la
- libArchive_la_SOURCES = Amanda/Archive.c $(AMGLUE_SWG)
- libArchive_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
- libArchive_la_LIBADD = libamglue.la \
-@@ -1118,57 +1120,57 @@
- 
- 
- # PACKAGE: Amanda::Debug
--libDebugdir = $(amperldir)/auto/Amanda/Debug
--libDebug_LTLIBRARIES = libDebug.la
--libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
--libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libDebug_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libDebugdir = $(amperldir)/auto/Amanda/Debug
-+@WANT_CLIENT_TRUE@libDebug_LTLIBRARIES = libDebug.la
-+@WANT_CLIENT_TRUE@libDebug_la_SOURCES = Amanda/Debug.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libDebug_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libDebug_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::Config
--libConfigdir = $(amperldir)/auto/Amanda/Config
--libConfig_LTLIBRARIES = libConfig.la
--libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
--libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libConfig_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libConfigdir = $(amperldir)/auto/Amanda/Config
-+@WANT_CLIENT_TRUE@libConfig_LTLIBRARIES = libConfig.la
-+@WANT_CLIENT_TRUE@libConfig_la_SOURCES = Amanda/Config.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libConfig_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libConfig_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::Util
--libUtildir = $(amperldir)/auto/Amanda/Util
--libUtil_LTLIBRARIES = libUtil.la
--libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
--libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libUtil_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libUtildir = $(amperldir)/auto/Amanda/Util
-+@WANT_CLIENT_TRUE@libUtil_LTLIBRARIES = libUtil.la
-+@WANT_CLIENT_TRUE@libUtil_la_SOURCES = Amanda/Util.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libUtil_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libUtil_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::Types
--libTypesdir = $(amperldir)/auto/Amanda/Types
--libTypes_LTLIBRARIES = libTypes.la
--libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
--libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libTypes_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libTypesdir = $(amperldir)/auto/Amanda/Types
-+@WANT_CLIENT_TRUE@libTypes_LTLIBRARIES = libTypes.la
-+@WANT_CLIENT_TRUE@libTypes_la_SOURCES = Amanda/Types.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libTypes_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libTypes_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::Tests
--libTestsdir = $(amperldir)/auto/Amanda/Tests
--libTests_LTLIBRARIES = libTests.la
--libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG)
--libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libTests_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libTestsdir = $(amperldir)/auto/Amanda/Tests
-+@WANT_CLIENT_TRUE@libTests_LTLIBRARIES = libTests.la
-+@WANT_CLIENT_TRUE@libTests_la_SOURCES = Amanda/Tests.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libTests_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libTests_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::MainLoop
--libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop
--libMainLoop_LTLIBRARIES = libMainLoop.la
--libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG)
--libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libMainLoop_la_LIBADD = libamglue.la \
--	$(top_builddir)/common-src/libamanda.la
-+@WANT_CLIENT_TRUE@libMainLoopdir = $(amperldir)/auto/Amanda/MainLoop
-+@WANT_CLIENT_TRUE@libMainLoop_LTLIBRARIES = libMainLoop.la
-+@WANT_CLIENT_TRUE@libMainLoop_la_SOURCES = Amanda/MainLoop.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libMainLoop_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libMainLoop_la_LIBADD = libamglue.la \
-+@WANT_CLIENT_TRUE@	$(top_builddir)/common-src/libamanda.la
- 
- 
- # PACKAGE: Amanda::Application
+@@ -1670,12 +1672,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
diff --git a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in b/misc/amanda32-server/files/patch-perl::amglue::Makefile.in
new file mode 100644
index 000000000000..96d2bc290602
--- /dev/null
+++ b/misc/amanda32-server/files/patch-perl::amglue::Makefile.in
@@ -0,0 +1,10 @@
+--- perl/amglue/Makefile.in	2010-10-16 19:29:45.554806332 +0900
++++ perl/amglue/Makefile.in.orig	2010-10-07 03:58:28.000000000 +0900
+@@ -1212,6 +1212,7 @@
+ 	    list2="$$list2 $$p"; \
+ 	  else :; fi; \
+ 	done; \
++@WANT_CLIENT_FALSE@	list2=; \
+ 	test -z "$$list2" || { \
+ 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \
+ 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
diff --git a/misc/amanda32-server/files/patch-server-src::amcleanup.pl b/misc/amanda32-server/files/patch-server-src::amcleanup.pl
deleted file mode 100644
index fbd45ccbea63..000000000000
--- a/misc/amanda32-server/files/patch-server-src::amcleanup.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- server-src/amcleanup.pl.orig	2009-01-28 13:57:21.000000000 +0900
-+++ server-src/amcleanup.pl	2009-01-28 13:57:33.000000000 +0900
-@@ -94,7 +94,7 @@
- } elsif (!$process_alive) {
-     #check amdump/amflush process
-     foreach my $pname ("amdump", "amflush") {
--	my $pid = `ps -ef|grep -w ${pname}|grep -w ${config_name}| grep -v grep | awk '{print \$2}'`;
-+	my $pid = `ps -f|grep -w ${pname}|grep -w ${config_name}| grep -v grep | awk '{print \$2}'`;
- 	chomp $pid;
- 	if ($pid ne "") {
- 	    $Amanda_process->set_master($pname, $pid);
diff --git a/misc/amanda32-server/files/patch-xfer-src::Makefile.in b/misc/amanda32-server/files/patch-xfer-src::Makefile.in
new file mode 100644
index 000000000000..e9c3e7838a30
--- /dev/null
+++ b/misc/amanda32-server/files/patch-xfer-src::Makefile.in
@@ -0,0 +1,11 @@
+--- 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 @@
+ 
+ AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
+ AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
+-amlib_LTLIBRARIES = libamxfer.la
++@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la
+ LINT = $(AMLINT)
+ LINTFLAGS = $(AMLINTFLAGS)
+ libamxfer_la_SOURCES = \
diff --git a/misc/amanda32-server/files/pkg-message.in b/misc/amanda32-server/files/pkg-message.in
new file mode 100644
index 000000000000..95ecbc36ae0f
--- /dev/null
+++ b/misc/amanda32-server/files/pkg-message.in
@@ -0,0 +1,3 @@
+Please install these ports (they are only on-demand runtime dependencies):
+  - %%PORTSDIR%%/misc/mtx if you want chg-robot changer.
+  - %%PORTSDIR%%/security/aespipe if you want amcrypt(8).
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
index 655238c1d854..447d05ac893a 100644
--- a/misc/amanda32-server/pkg-plist
+++ b/misc/amanda32-server/pkg-plist
@@ -6,41 +6,54 @@ lib/amanda/libamserver-%%SHLIBVER%%.so
 lib/amanda/libamserver.a
 lib/amanda/libamserver.la
 lib/amanda/libamserver.so
-lib/amanda/libamxfer-%%SHLIBVER%%.so
-lib/amanda/libamxfer.a
-lib/amanda/libamxfer.la
-lib/amanda/libamxfer.so
-lib/amanda/librestore-%%SHLIBVER%%.so
-lib/amanda/librestore.a
-lib/amanda/librestore.la
-lib/amanda/librestore.so
 %%SITE_PERL%%/Amanda/Changer.pm
 %%SITE_PERL%%/Amanda/Changer/compat.pm
 %%SITE_PERL%%/Amanda/Changer/disk.pm
+%%SITE_PERL%%/Amanda/Changer/multi.pm
+%%SITE_PERL%%/Amanda/Changer/ndmp.pm
+%%SITE_PERL%%/Amanda/Changer/null.pm
+%%SITE_PERL%%/Amanda/Changer/rait.pm
+%%SITE_PERL%%/Amanda/Changer/robot.pm
 %%SITE_PERL%%/Amanda/Changer/single.pm
 %%SITE_PERL%%/Amanda/Cmdline.pm
+%%SITE_PERL%%/Amanda/Curinfo.pm
+%%SITE_PERL%%/Amanda/Curinfo/Info.pm
 %%SITE_PERL%%/Amanda/DB/Catalog.pm
 %%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/Logfile.pm
-%%SITE_PERL%%/Amanda/Process.pm
+%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
+%%SITE_PERL%%/Amanda/Recovery/Planner.pm
+%%SITE_PERL%%/Amanda/Recovery/Scan.pm
+%%SITE_PERL%%/Amanda/Report.pm
+%%SITE_PERL%%/Amanda/Report/human.pm
+%%SITE_PERL%%/Amanda/Report/postscript.pm
+%%SITE_PERL%%/Amanda/Report/xml.pm
 %%SITE_PERL%%/Amanda/Tapelist.pm
-%%SITE_PERL%%/Amanda/Xfer.pm
-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.a
+%%SITE_PERL%%/Amanda/Taper/Controller.pm
+%%SITE_PERL%%/Amanda/Taper/Protocol.pm
+%%SITE_PERL%%/Amanda/Taper/Scan.pm
+%%SITE_PERL%%/Amanda/Taper/Scan/traditional.pm
+%%SITE_PERL%%/Amanda/Taper/Scribe.pm
+%%SITE_PERL%%/Amanda/Taper/Worker.pm
+%%SITE_PERL%%/Amanda/XferServer.pm
 %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
 %%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
-%%SITE_PERL%%/auto/Amanda/Device/libDevice.a
 %%SITE_PERL%%/auto/Amanda/Device/libDevice.la
 %%SITE_PERL%%/auto/Amanda/Device/libDevice.so
-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.a
+%%SITE_PERL%%/auto/Amanda/Disklist/libDisklist.la
+%%SITE_PERL%%/auto/Amanda/Disklist/libDisklist.so
 %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
 %%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
-%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.a
 %%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la
 %%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so
-%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.a
-%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la
-%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
+%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.la
+%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.so
 %%PLOT%%libexec/amanda/amcat.awk
+libexec/amanda/amcheck-device
 libexec/amanda/amcleanupdisk
 libexec/amanda/amindexd
 libexec/amanda/amlogroll
@@ -49,20 +62,10 @@ libexec/amanda/amlogroll
 %%PLOT%%libexec/amanda/amplot.gp
 libexec/amanda/amtrmidx
 libexec/amanda/amtrmlog
-libexec/amanda/chg-chio
-libexec/amanda/chg-chs
 libexec/amanda/chg-disk
-libexec/amanda/chg-glue
-libexec/amanda/chg-iomega
-libexec/amanda/chg-juke
 libexec/amanda/chg-lib.sh
 libexec/amanda/chg-manual
-libexec/amanda/chg-mcutil
-libexec/amanda/chg-mtx
 libexec/amanda/chg-multi
-libexec/amanda/chg-null
-libexec/amanda/chg-rait
-libexec/amanda/chg-rth
 libexec/amanda/chg-zd-mtx
 libexec/amanda/chunker
 libexec/amanda/amidxtaped
@@ -94,11 +97,18 @@ sbin/amtape
 sbin/amtapetype
 sbin/amtoc
 sbin/amvault
-@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
-@dirrm %%SITE_PERL%%/auto/Amanda/Device
-@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
+@dirrm %%SITE_PERL%%/auto/Amanda/XferServer
 @dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
-@dirrm %%SITE_PERL%%/auto/Amanda/Xfer
+@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
+@dirrm %%SITE_PERL%%/auto/Amanda/Disklist
+@dirrm %%SITE_PERL%%/auto/Amanda/Device
+@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
+@dirrm %%SITE_PERL%%/Amanda/Taper/Scan
+@dirrm %%SITE_PERL%%/Amanda/Taper
+@dirrm %%SITE_PERL%%/Amanda/Report
+@dirrm %%SITE_PERL%%/Amanda/Recovery
+@dirrm %%SITE_PERL%%/Amanda/Interactive
 @dirrm %%SITE_PERL%%/Amanda/DB
+@dirrm %%SITE_PERL%%/Amanda/Curinfo
 @dirrm %%SITE_PERL%%/Amanda/Changer
 @dirrm include/amanda
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
index 428adc9b1350..4eb7901b5d01 100644
--- a/misc/amanda32-server/pkg-plist.client
+++ b/misc/amanda32-server/pkg-plist.client
@@ -14,21 +14,38 @@ lib/amanda/libamclient-%%SHLIBVER%%.so
 lib/amanda/libamclient.a
 lib/amanda/libamclient.la
 lib/amanda/libamclient.so
+lib/amanda/libamglue-%%SHLIBVER%%.so
 lib/amanda/libamglue.a
 lib/amanda/libamglue.la
 lib/amanda/libamglue.so
+lib/amanda/libamxfer-%%SHLIBVER%%.so
+lib/amanda/libamxfer.a
+lib/amanda/libamxfer.la
+lib/amanda/libamxfer.so
+lib/amanda/libndmjob-%%SHLIBVER%%.so
+lib/amanda/libndmjob.a
+lib/amanda/libndmjob.la
+lib/amanda/libndmjob.so
+lib/amanda/libndmlib-%%SHLIBVER%%.so
+lib/amanda/libndmlib.a
+lib/amanda/libndmlib.la
+lib/amanda/libndmlib.so
 libexec/amanda/amanda-sh-lib.sh
 libexec/amanda/amandad
+libexec/amanda/amndmjob
 libexec/amanda/application/amgtar
-libexec/amanda/application/amgtar_perl
 libexec/amanda/application/amlog-script
+libexec/amanda/application/ampgsql
+libexec/amanda/application/amraw
 libexec/amanda/application/amsamba
 libexec/amanda/application/amstar
+libexec/amanda/application/amsuntar
 libexec/amanda/application/amzfs-sendrecv
 libexec/amanda/application/amzfs-snapshot
 libexec/amanda/application/script-email
 libexec/amanda/calcsize
 libexec/amanda/killpgrp
+libexec/amanda/ndmjob
 libexec/amanda/noop
 libexec/amanda/patch-system
 libexec/amanda/rundump
@@ -37,45 +54,52 @@ libexec/amanda/selfcheck
 libexec/amanda/sendbackup
 libexec/amanda/sendsize
 libexec/amanda/teecount
-libexec/amanda/versionsuffix
 %%SITE_PERL%%/Amanda/Application.pm
 %%SITE_PERL%%/Amanda/Application/Zfs.pm
 %%SITE_PERL%%/Amanda/Archive.pm
 %%SITE_PERL%%/Amanda/BigIntCompat.pm
+%%SITE_PERL%%/Amanda/ClientService.pm
 %%SITE_PERL%%/Amanda/Config.pm
+%%SITE_PERL%%/Amanda/Config/FoldingHash.pm
 %%SITE_PERL%%/Amanda/Constants.pm
 %%SITE_PERL%%/Amanda/Debug.pm
+%%SITE_PERL%%/Amanda/Feature.pm
+%%SITE_PERL%%/Amanda/Header.pm
+%%SITE_PERL%%/Amanda/IPC/Binary.pm
+%%SITE_PERL%%/Amanda/IPC/LineProtocol.pm
 %%SITE_PERL%%/Amanda/MainLoop.pm
+%%SITE_PERL%%/Amanda/NDMP.pm
 %%SITE_PERL%%/Amanda/Paths.pm
+%%SITE_PERL%%/Amanda/Process.pm
 %%SITE_PERL%%/Amanda/Script.pm
 %%SITE_PERL%%/Amanda/Script_App.pm
 %%SITE_PERL%%/Amanda/Tests.pm
-%%SITE_PERL%%/Amanda/Types.pm
 %%SITE_PERL%%/Amanda/Util.pm
-%%SITE_PERL%%/auto/Amanda/Application/libApplication.a
+%%SITE_PERL%%/Amanda/Xfer.pm
 %%SITE_PERL%%/auto/Amanda/Application/libApplication.la
 %%SITE_PERL%%/auto/Amanda/Application/libApplication.so
-%%SITE_PERL%%/auto/Amanda/Archive/libArchive.a
 %%SITE_PERL%%/auto/Amanda/Archive/libArchive.la
 %%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
-%%SITE_PERL%%/auto/Amanda/Config/libConfig.a
 %%SITE_PERL%%/auto/Amanda/Config/libConfig.la
 %%SITE_PERL%%/auto/Amanda/Config/libConfig.so
-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.a
 %%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
 %%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
-%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.a
+%%SITE_PERL%%/auto/Amanda/Feature/libFeature.la
+%%SITE_PERL%%/auto/Amanda/Feature/libFeature.so
+%%SITE_PERL%%/auto/Amanda/Header/libHeader.la
+%%SITE_PERL%%/auto/Amanda/Header/libHeader.so
+%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.la
+%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.so
 %%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la
 %%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
-%%SITE_PERL%%/auto/Amanda/Tests/libTests.a
+%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.la
+%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.so
 %%SITE_PERL%%/auto/Amanda/Tests/libTests.la
 %%SITE_PERL%%/auto/Amanda/Tests/libTests.so
-%%SITE_PERL%%/auto/Amanda/Types/libTypes.a
-%%SITE_PERL%%/auto/Amanda/Types/libTypes.la
-%%SITE_PERL%%/auto/Amanda/Types/libTypes.so
-%%SITE_PERL%%/auto/Amanda/Util/libUtil.a
 %%SITE_PERL%%/auto/Amanda/Util/libUtil.la
 %%SITE_PERL%%/auto/Amanda/Util/libUtil.so
+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la
+%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
 sbin/amaespipe
 sbin/amarchiver
 sbin/amcrypt
@@ -90,11 +114,12 @@ sbin/amrecover
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/NEWS
 %%DATADIR%%/ReleaseNotes
-%%PORTDOCS%%%%EXAMPLESDIR%%/disklist
-%%PORTDOCS%%%%EXAMPLESDIR%%/chg-scsi.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/chg-multi.conf
-%%DATADIR%%/example/amanda.conf
+%%DATADIR%%/example/amanda-client-postgresql.conf
 %%DATADIR%%/example/amanda-client.conf
+%%DATADIR%%/example/amanda.conf
+%%DATADIR%%/example/chg-multi.conf
+%%DATADIR%%/example/chg-scsi.conf
+%%DATADIR%%/example/disklist
 %%DATADIR%%/example/inetd.conf.amandaclient
 %%DATADIR%%/example/inetd.conf.amandaserver
 %%DATADIR%%/example/label-templates/3hole.ps
@@ -115,15 +140,22 @@ sbin/amrecover
 %%DATADIR%%/template.d/tapetypes
 %%DATADIR%%/template.d/README
 %%DATADIR%%/template.d/chg-manual.conf
+@dirrm %%SITE_PERL%%/auto/Amanda/Xfer
 @dirrm %%SITE_PERL%%/auto/Amanda/Util
-@dirrm %%SITE_PERL%%/auto/Amanda/Types
 @dirrm %%SITE_PERL%%/auto/Amanda/Tests
+@dirrm %%SITE_PERL%%/auto/Amanda/NDMP
 @dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
+@dirrm %%SITE_PERL%%/auto/Amanda/IPC/Binary
+@dirrm %%SITE_PERL%%/auto/Amanda/IPC
+@dirrm %%SITE_PERL%%/auto/Amanda/Header
+@dirrm %%SITE_PERL%%/auto/Amanda/Feature
 @dirrm %%SITE_PERL%%/auto/Amanda/Debug
 @dirrm %%SITE_PERL%%/auto/Amanda/Config
 @dirrm %%SITE_PERL%%/auto/Amanda/Archive
 @dirrm %%SITE_PERL%%/auto/Amanda/Application
 @dirrm %%SITE_PERL%%/auto/Amanda
+@dirrm %%SITE_PERL%%/Amanda/IPC
+@dirrm %%SITE_PERL%%/Amanda/Config
 @dirrm %%SITE_PERL%%/Amanda/Application
 @dirrm %%SITE_PERL%%/Amanda
 @dirrm %%DATADIR%%/template.d
@@ -133,4 +165,3 @@ sbin/amrecover
 @dirrm libexec/amanda/application
 @dirrm libexec/amanda
 @dirrm lib/amanda
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%