Attachment #148644 for bug #193983




# $FreeBSD$

PORTNAME=	amanda
PORTVERSION=	3.3.6
PORTREVISION?=	3
PORTEPOCH=	1
CATEGORIES=	misc
MASTER_SITES=	SF/amanda/amanda%20-%20stable/${PORTVERSION}

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 \
		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple

CONFIGURE_ARGS+=--without-client


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (amanda-3.3.2.tar.gz) = cb40e8aa601e3d106e7d78338b745e5b9c0cd41daaab7937fc23d1b4cf585424	1	SHA256 (amanda-3.3.6.tar.gz) = 832594503a99bd5587f6c645c7af945f565506dc35e2660763d33beef2d4d01c
2	SIZE (amanda-3.3.2.tar.gz) = 4348919	2	SIZE (amanda-3.3.6.tar.gz) = 4571518




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

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

Lines 25-30 Link Here

(-)pkg-plist (-40 / +11 lines)
25	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/DB/Catalog.pm	25	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/DB/Catalog.pm
26	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Device.pm	26	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Device.pm
27	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Disklist.pm	27	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Disklist.pm
		28	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Extract.pm
28	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Holding.pm	29	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Holding.pm
29	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity.pm	30	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity.pm
30	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/email.pm	31	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Interactivity/email.pm
Lines 37-42 Link Here
37	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm	38	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Recovery/Scan.pm
38	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report.pm	39	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report.pm
39	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/human.pm	40	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/human.pm
		41	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json.pm
		42	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/json_raw.pm
40	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/postscript.pm	43	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/postscript.pm
41	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/xml.pm	44	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/Report/xml.pm
42	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/ScanInventory.pm	45	%%SERVER_ONLY%%%%SITE_PERL%%/Amanda/ScanInventory.pm
Lines 146-166 Link Here
146	%%SERVER_ONLY%%sbin/amtapetype	149	%%SERVER_ONLY%%sbin/amtapetype
147	%%SERVER_ONLY%%sbin/amtoc	150	%%SERVER_ONLY%%sbin/amtoc
148	%%SERVER_ONLY%%sbin/amvault	151	%%SERVER_ONLY%%sbin/amvault
149	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/XferServer
150	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
151	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
152	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Disklist
153	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Device
154	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
155	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Taper/Scan
156	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Taper
157	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Report
158	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Recovery
159	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Interactivity
160	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/DB
161	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Curinfo
162	%%SERVER_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Changer
163	%%SERVER_ONLY%%@dirrm include/amanda
164	@comment	152	@comment
165	@comment plist for misc/amanda-client below	153	@comment plist for misc/amanda-client below
166	@comment	154	@comment
Lines 193-198 Link Here
193	%%CLIENT_ONLY%%libexec/amanda/amndmjob	181	%%CLIENT_ONLY%%libexec/amanda/amndmjob
194	%%CLIENT_ONLY%%@mode 4750	182	%%CLIENT_ONLY%%@mode 4750
195	%%CLIENT_ONLY%%@group %%AMANDA_GROUP%%	183	%%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
		184	%%CLIENT_ONLY%%libexec/amanda/application/ambsdtar
		185	%%CLIENT_ONLY%%@mode
		186	%%CLIENT_ONLY%%@group
		187	%%CLIENT_ONLY%%@mode 4750
		188	%%CLIENT_ONLY%%@group %%AMANDA_GROUP%%
196	%%CLIENT_ONLY%%libexec/amanda/application/amgtar	189	%%CLIENT_ONLY%%libexec/amanda/application/amgtar
197	%%CLIENT_ONLY%%@mode	190	%%CLIENT_ONLY%%@mode
198	%%CLIENT_ONLY%%@group	191	%%CLIENT_ONLY%%@group
Lines 271-276 Link Here
271	%%CLIENT_ONLY%%man/man7/amanda-scripts.7.gz	264	%%CLIENT_ONLY%%man/man7/amanda-scripts.7.gz
272	%%CLIENT_ONLY%%man/man8/amanda.8.gz	265	%%CLIENT_ONLY%%man/man8/amanda.8.gz
273	%%CLIENT_ONLY%%man/man8/amarchiver.8.gz	266	%%CLIENT_ONLY%%man/man8/amarchiver.8.gz
		267	%%CLIENT_ONLY%%man/man8/ambsdtar.8.gz
274	%%CLIENT_ONLY%%man/man8/amdump_client.8.gz	268	%%CLIENT_ONLY%%man/man8/amdump_client.8.gz
275	%%CLIENT_ONLY%%man/man8/amgtar.8.gz	269	%%CLIENT_ONLY%%man/man8/amgtar.8.gz
276	%%CLIENT_ONLY%%man/man8/ampgsql.8.gz	270	%%CLIENT_ONLY%%man/man8/ampgsql.8.gz
Lines 306-311 Link Here
306	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client-postgresql.conf	300	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client-postgresql.conf
307	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client.conf	301	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda-client.conf
308	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda.conf	302	%%CLIENT_ONLY%%%%DATADIR%%/example/amanda.conf
		303	%%CLIENT_ONLY%%%%DATADIR%%/example/amandaclient.xml
		304	%%CLIENT_ONLY%%%%DATADIR%%/example/amandaserver.xml
309	%%CLIENT_ONLY%%%%DATADIR%%/example/chg-multi.conf	305	%%CLIENT_ONLY%%%%DATADIR%%/example/chg-multi.conf
310	%%CLIENT_ONLY%%%%DATADIR%%/example/chg-scsi.conf	306	%%CLIENT_ONLY%%%%DATADIR%%/example/chg-scsi.conf
311	%%CLIENT_ONLY%%%%DATADIR%%/example/disklist	307	%%CLIENT_ONLY%%%%DATADIR%%/example/disklist
Lines 329-356 Link Here
329	%%CLIENT_ONLY%%%%DATADIR%%/template.d/tapetypes	325	%%CLIENT_ONLY%%%%DATADIR%%/template.d/tapetypes
330	%%CLIENT_ONLY%%%%DATADIR%%/template.d/README	326	%%CLIENT_ONLY%%%%DATADIR%%/template.d/README
331	%%CLIENT_ONLY%%%%DATADIR%%/template.d/chg-manual.conf	327	%%CLIENT_ONLY%%%%DATADIR%%/template.d/chg-manual.conf
332	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Xfer
333	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Util
334	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Tests
335	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/NDMP
336	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
337	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/IPC/Binary
338	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/IPC
339	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Header
340	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Feature
341	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Debug
342	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Config
343	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Archive
344	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda/Application
345	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/auto/Amanda
346	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/IPC
347	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Config
348	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda/Application
349	%%CLIENT_ONLY%%@dirrm %%SITE_PERL%%/Amanda
350	%%CLIENT_ONLY%%@dirrm %%DATADIR%%/template.d
351	%%CLIENT_ONLY%%@dirrm %%DATADIR%%/example/label-templates
352	%%CLIENT_ONLY%%@dirrm %%DATADIR%%/example
353	%%CLIENT_ONLY%%@dirrm %%DATADIR%%
354	%%CLIENT_ONLY%%@dirrm libexec/amanda/application
355	%%CLIENT_ONLY%%@dirrm libexec/amanda
356	%%CLIENT_ONLY%%@dirrm lib/amanda

Return to bug 193983

Lines 2-9 Link Here

(-)Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= amanda	4	PORTNAME= amanda
5	PORTVERSION= 3.3.2	5	PORTVERSION= 3.3.6
6	PORTREVISION?= 3
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 106-112 Link Here
106	CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-*	105	CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-*
107		106
108	BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client	107	BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
109	RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client	108	RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client \
		109	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
110		110
111	CONFIGURE_ARGS+=--without-client	111	CONFIGURE_ARGS+=--without-client
112		112

Lines 1-7 Link Here

(-)files/patch-perl__Makefile.in (-8 / +8 lines)
1	--- perl/Makefile.in.orig 2010-10-07 03:58:28.000000000 +0900	1	--- perl/Makefile.in.orig 2014-07-09 16:23:26.000000000 +0200
2	+++ perl/Makefile.in 2010-10-16 21:16:31.327136585 +0900	2	+++ perl/Makefile.in 2014-09-12 16:42:55.653005667 +0200
3	@@ -1541,13 +1541,15 @@	3	@@ -1812,13 +1812,15 @@
4	# PACKAGE: Amanda::Script_App	4	# PACKAGE: Amanda::Extract
5		5
6	# PACKAGE: Amanda::Script	6	# PACKAGE: Amanda::Script
7	+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm	7	+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
Lines 13-24 Link Here
13	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \	13	$(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
14	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \	14	Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
15	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \	15	Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
16	- Amanda/Constants.pm Amanda/Script_App.pm $(am__append_16) \	16	- Amanda/Constants.pm Amanda/Script_App.pm Amanda/Extract.pm \
17	+ $(am__append_const) Amanda/Script_App.pm $(am__append_16) \	17	+ $(am__append_const) Amanda/Script_App.pm Amanda/Extract.pm \
18	$(am__append_17) Amanda/Script.pm	18	$(am__append_16) $(am__append_17) Amanda/Script.pm
19		19
20	# PACKAGE: Amanda::Archive	20	# PACKAGE: Amanda::Archive
21	@@ -1670,12 +1672,12 @@	21	@@ -1947,12 +1949,12 @@
22	@WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm	22	@WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
23		23
24	# PACKAGE: Amanda::Xfer	24	# PACKAGE: Amanda::Xfer