Attachment #182602 for bug #217365

Lines 2-9 Link Here

(-)misc/amanda-server/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= amanda	4	PORTNAME= amanda
5	PORTVERSION= 3.3.6	5	PORTVERSION= 3.3.9
6	PORTREVISION= 5
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES= misc	7	CATEGORIES= misc
9	MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}	8	MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
Lines 32-38 Link Here
32	--with-user=${USERS} --with-group=${AMANDA_GROUP} \	31	--with-user=${USERS} --with-group=${AMANDA_GROUP} \
33	--with-bsdtcp-security --with-bsdudp-security \	32	--with-bsdtcp-security --with-bsdudp-security \
34	--with-ssh-security \	33	--with-ssh-security \
35	--disable-installperms	34	--disable-installperms --with-security-file=${ETCDIR}/security.conf
36	CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda	35	CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda
37	PKG_MESSAGE= ${WRKDIR}/pkg-message	36	PKG_MESSAGE= ${WRKDIR}/pkg-message
38	SUB_FILES= pkg-message	37	SUB_FILES= pkg-message

Lines 1-2 Link Here

(-)misc/amanda-server/distinfo (-2 / +2 lines)
1	SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c	1	SHA256 (amanda-3.3.9.tar.gz) = 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41
2	SIZE (amanda-3.3.6.tar.gz) = 4571518	2	SIZE (amanda-3.3.9.tar.gz) = 4673301




--- 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




@comment
@comment plist for misc/amanda-server below
@comment
%%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
%%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so
%%SERVER_ONLY%%lib/amanda/libamdevice.a
%%SERVER_ONLY%%lib/amanda/libamdevice.so

%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm

%%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz
%%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz
%%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
%%CLIENT_ONLY%%man/man5/amanda-security.conf.5.gz
%%CLIENT_ONLY%%man/man7/amanda-applications.7.gz
%%CLIENT_ONLY%%man/man7/amanda-auth.7.gz
%%CLIENT_ONLY%%man/man7/amanda-match.7.gz

Return to bug 217365

Lines 1-39 Link Here

(-)misc/amanda-server/files/patch-perl__Makefile.in (-39 lines)
1	--- perl/Makefile.in.orig 2014-07-09 16:23:26.000000000 +0200
2	+++ perl/Makefile.in 2014-09-12 16:42:55.653005667 +0200
3	@@ -1812,13 +1812,15 @@
4	# PACKAGE: Amanda::Extract
5
6	# PACKAGE: Amanda::Script
7	+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
8	+@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm
9	Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
10	Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
11	- $(am__append_7) Amanda/Xfer.pm $(am__append_10) \
12	+ $(am__append_7) $(am__append_xfer) $(am__append_10) \
13	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
14	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
15	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
16	- Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
17	+ $(am__append_const) Amanda/Script_App.pm Amanda/Extract.pm \
18	$(am__append_16) $(am__append_17) Amanda/Script.pm
19
20	# PACKAGE: Amanda::Archive
21	@@ -1947,12 +1949,12 @@
22	@WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
23
24	# PACKAGE: Amanda::Xfer
25	-libXferdir = $(amperldir)/auto/Amanda/Xfer
26	-libXfer_LTLIBRARIES = libXfer.la
27	-libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
28	-libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
29	-libXfer_la_LIBADD = amglue/libamglue.la \
30	- $(top_builddir)/xfer-src/libamxfer.la
31	+@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer
32	+@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la
33	+@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
34	+@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
35	+@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \
36	+@WANT_CLIENT_TRUE@ $(top_builddir)/xfer-src/libamxfer.la
37
38
39	# PACKAGE: Amanda::NDMP

Lines 3-8 Link Here

(-)misc/amanda-server/pkg-plist (+3 lines)
3	@comment	3	@comment
4	@comment plist for misc/amanda-server below	4	@comment plist for misc/amanda-server below
5	@comment	5	@comment
		6	%%SERVER_ONLY%%%%ETCDIR%%/amanda-security.conf
6	%%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so	7	%%SERVER_ONLY%%lib/amanda/libamdevice-%%SHLIBVER%%.so
7	%%SERVER_ONLY%%lib/amanda/libamdevice.a	8	%%SERVER_ONLY%%lib/amanda/libamdevice.a
8	%%SERVER_ONLY%%lib/amanda/libamdevice.so	9	%%SERVER_ONLY%%lib/amanda/libamdevice.so
Lines 33-38 Link Here
33	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm	34	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty.pm
34	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm	35	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/tty_email.pm
35	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm	36	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Logfile.pm
		37	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Message.pm
36	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm	38	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
37	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm	39	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Planner.pm
38	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm	40	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
Lines 258-263 Link Here
258	%%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz	260	%%CLIENT_ONLY%%man/man5/amanda-archive-format.5.gz
259	%%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz	261	%%CLIENT_ONLY%%man/man5/amanda-client.conf.5.gz
260	%%CLIENT_ONLY%%man/man5/amanda.conf.5.gz	262	%%CLIENT_ONLY%%man/man5/amanda.conf.5.gz
		263	%%CLIENT_ONLY%%man/man5/amanda-security.conf.5.gz
261	%%CLIENT_ONLY%%man/man7/amanda-applications.7.gz	264	%%CLIENT_ONLY%%man/man7/amanda-applications.7.gz
262	%%CLIENT_ONLY%%man/man7/amanda-auth.7.gz	265	%%CLIENT_ONLY%%man/man7/amanda-auth.7.gz
263	%%CLIENT_ONLY%%man/man7/amanda-match.7.gz	266	%%CLIENT_ONLY%%man/man7/amanda-match.7.gz