Attachment #180305 for bug #217365




# $FreeBSD$

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

		--with-user=${USERS} --with-group=${AMANDA_GROUP} \
		--with-bsdtcp-security --with-bsdudp-security \
		--with-ssh-security \
		--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

.endif
GROUPS?=	operator amanda

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

.endif

.if ${PORT_OPTIONS:MSAMBA}
SAMBA_PORT?=	samba44
BUILD_DEPENDS+=	smbclient:net/${SAMBA_PORT}
RUN_DEPENDS+=	smbclient:net/${SAMBA_PORT}
CONFIGURE_ARGS+=	--with-smbclient=${LOCALBASE}/bin/smbclient

	@${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 /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"

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

Return to bug 217365

Lines 2-10 Link Here

(-)misc/amanda-server/Makefile (-8 / +6 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= 3
7	PORTEPOCH= 1
8	CATEGORIES= misc	6	CATEGORIES= misc
9	MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}	7	MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
10	PKGNAMESUFFIX?= -server	8	PKGNAMESUFFIX?= -server
Lines 33-39 Link Here
33	--with-user=${USERS} --with-group=${AMANDA_GROUP} \	31	--with-user=${USERS} --with-group=${AMANDA_GROUP} \
34	--with-bsdtcp-security --with-bsdudp-security \	32	--with-bsdtcp-security --with-bsdudp-security \
35	--with-ssh-security \	33	--with-ssh-security \
36	--disable-installperms	34	--disable-installperms --with-security-file=${PREFIX}/etc/amanda/security.conf
37	CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda	35	CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda
38	PKG_MESSAGE= ${WRKDIR}/pkg-message	36	PKG_MESSAGE= ${WRKDIR}/pkg-message
39	SUB_FILES= pkg-message	37	SUB_FILES= pkg-message
Lines 55-62 Link Here
55	.endif	53	.endif
56	GROUPS?= operator amanda	54	GROUPS?= operator amanda
57		55
58	AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists	56	AMANDA_GNUTAR_LISTDIR?= /var/db/amanda/gnutar-lists
59	AMANDA_DATES?= ${PREFIX}/var/amanda/amandates	57	AMANDA_DATES?= /var/db/amanda/amandates
60	PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_GROUP=${AMANDA_GROUP}	58	PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_GROUP=${AMANDA_GROUP}
61		59
62	# amanda-server/amanda-client common part	60	# amanda-server/amanda-client common part
Lines 122-128 Link Here
122	.endif	120	.endif
123		121
124	.if ${PORT_OPTIONS:MSAMBA}	122	.if ${PORT_OPTIONS:MSAMBA}
125	SAMBA_PORT?= samba36	123	SAMBA_PORT?= samba44
126	BUILD_DEPENDS+= smbclient:net/${SAMBA_PORT}	124	BUILD_DEPENDS+= smbclient:net/${SAMBA_PORT}
127	RUN_DEPENDS+= smbclient:net/${SAMBA_PORT}	125	RUN_DEPENDS+= smbclient:net/${SAMBA_PORT}
128	CONFIGURE_ARGS+= --with-smbclient=${LOCALBASE}/bin/smbclient	126	CONFIGURE_ARGS+= --with-smbclient=${LOCALBASE}/bin/smbclient
Lines 156-162 Link Here
156	@${ECHO} " The default is `uname -n`"	154	@${ECHO} " The default is `uname -n`"
157	@${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"	155	@${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"
158	@${ECHO} " the gnutar index files should live in"	156	@${ECHO} " the gnutar index files should live in"
159	@${ECHO} " The default is ${PREFIX}/var/amanda/gnutar-lists"	157	@${ECHO} " The default is /var/db/amanda/gnutar-lists"
160	@${ECHO} " AMANDA_USER=user to specify the default user"	158	@${ECHO} " AMANDA_USER=user to specify the default user"
161	@${ECHO} " The default is amanda"	159	@${ECHO} " The default is amanda"
162	@${ECHO} " AMANDA_GROUP=group to specify the default group"	160	@${ECHO} " AMANDA_GROUP=group to specify the default group"

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