Sun May 20 11:13:35 2012 UTC ()
Convert AMANDA_SSH and AMANFA_FQDN to pkg options and enable amanda-ssh.


(sbd)
diff -r1.29 -r1.30 pkgsrc/sysutils/amanda-common/Makefile.common
diff -r1.1 -r1.2 pkgsrc/sysutils/amanda-common/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/sysutils/amanda-common/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/Makefile.common 2010/02/19 18:55:56 1.29
+++ pkgsrc/sysutils/amanda-common/Makefile.common 2012/05/20 11:13:35 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.29 2010/02/19 18:55:56 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.30 2012/05/20 11:13:35 sbd Exp $
2 2
3# used by sysutils/amanda-common/Makefile 3# used by sysutils/amanda-common/Makefile
4# used by sysutils/amanda-client/Makefile 4# used by sysutils/amanda-client/Makefile
5# used by sysutils/amanda-server/Makefile 5# used by sysutils/amanda-server/Makefile
6# used by sysutils/amanda-plot/Makefile 6# used by sysutils/amanda-plot/Makefile
7 7
8VERS= 2.5.2p1 8VERS= 2.5.2p1
9DISTNAME?= amanda-${VERS} 9DISTNAME?= amanda-${VERS}
10CATEGORIES= sysutils 10CATEGORIES= sysutils
11MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/} 11MASTER_SITES?= ${MASTER_SITE_SOURCEFORGE:=amanda/}
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.amanda.org/ 14HOMEPAGE= http://www.amanda.org/
@@ -39,24 +39,14 @@ CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} @@ -39,24 +39,14 @@ CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
39 39
40GNU_CONFIGURE= yes 40GNU_CONFIGURE= yes
41CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} 41CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q}
42CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q} 42CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q}
43CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q} 43CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q}
44CONFIGURE_ARGS+= --with-mmap 44CONFIGURE_ARGS+= --with-mmap
45CONFIGURE_ARGS+= --with-amandahosts 45CONFIGURE_ARGS+= --with-amandahosts
46CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} 46CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
47CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} 47CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
48CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists 48CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
49CONFIGURE_ARGS+= --with-dump-honor-nodump 49CONFIGURE_ARGS+= --with-dump-honor-nodump
50CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 50CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
51 51
52BUILD_DEFS+= AMANDA_SSH AMANDA_FQDN 
53 
54.if defined(AMANDA_FQDN) && !empty(AMANDA_FQDN:M[yY][eE][sS]) 
55CONFIGURE_ARGS+= --with-fqdn 
56.endif 
57 
58.if defined(AMANDA_SSH) && !empty(AMANDA_SSH:M[yY][eE][sS]) 
59CONFIGURE_ARGS+= --with-ssh-security 
60.endif 
61 
62.include "../../sysutils/amanda-common/options.mk" 52.include "../../sysutils/amanda-common/options.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/amanda-common/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/amanda-common/options.mk 2008/07/29 17:21:39 1.1
+++ pkgsrc/sysutils/amanda-common/options.mk 2012/05/20 11:13:35 1.2
@@ -1,14 +1,26 @@ @@ -1,14 +1,26 @@
1# $NetBSD: options.mk,v 1.1 2008/07/29 17:21:39 pgoyette Exp $ 1# $NetBSD: options.mk,v 1.2 2012/05/20 11:13:35 sbd Exp $
2 2
3# Since amanda's ipv6 usage is broken, turn it off by default. 3# Since amanda's ipv6 usage is broken, turn it off by default.
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.amanda 5PKG_OPTIONS_VAR= PKG_OPTIONS.amanda
6PKG_SUPPORTED_OPTIONS= inet6 6PKG_SUPPORTED_OPTIONS= inet6 amanda-fqdn amanda-ssh
 7PKG_SUGGESTED_OPTIONS= amanda-ssh
 8
 9PKG_OPTIONS_LEGACY_VARS+= AMANDA_FQDN:amanda-fqdn
 10PKG_OPTIONS_LEGACY_VARS+= AMANDA_SSH:amanda-ssh
7 11
8.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
9 13
10.if !empty(PKG_OPTIONS:Minet6) 14.if !empty(PKG_OPTIONS:Minet6)
11CONFIGURE_ARGS+= --with-ipv6 15CONFIGURE_ARGS+= --with-ipv6
12.else 16.else
13CONFIGURE_ARGS+= --without-ipv6 17CONFIGURE_ARGS+= --without-ipv6
14.endif 18.endif
 19
 20.if !empty(PKG_OPTIONS:Mamanda-fqdn)
 21CONFIGURE_ARGS+= --with-fqdn
 22.endif
 23
 24.if !empty(PKG_OPTIONS:Mamanda-ssh)
 25CONFIGURE_ARGS+= --with-ssh-security
 26.endif