[pkgsrc/trunk]: pkgsrc/sysutils/amanda-common Convert AMANDA_SSH and AMANFA_F...

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3fa7814e71c6
branches:  trunk
changeset: 604003:3fa7814e71c6
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Sun May 20 11:13:35 2012 +0000

description:
Convert AMANDA_SSH and AMANFA_FQDN to pkg options and enable amanda-ssh.

diffstat:

 sysutils/amanda-common/Makefile.common |  12 +-----------
 sysutils/amanda-common/options.mk      |  16 ++++++++++++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r af68ce23f9de -r 3fa7814e71c6 sysutils/amanda-common/Makefile.common
--- a/sysutils/amanda-common/Makefile.common    Sun May 20 10:26:31 2012 +0000
+++ b/sysutils/amanda-common/Makefile.common    Sun May 20 11:13:35 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2010/02/19 18:55:56 joerg Exp $
+# $NetBSD: Makefile.common,v 1.30 2012/05/20 11:13:35 sbd Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -49,14 +49,4 @@
 CONFIGURE_ARGS+=       --with-dump-honor-nodump
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-BUILD_DEFS+=           AMANDA_SSH AMANDA_FQDN
-
-.if defined(AMANDA_FQDN) && !empty(AMANDA_FQDN:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --with-fqdn
-.endif
-
-.if defined(AMANDA_SSH) && !empty(AMANDA_SSH:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --with-ssh-security
-.endif
-
 .include "../../sysutils/amanda-common/options.mk"
diff -r af68ce23f9de -r 3fa7814e71c6 sysutils/amanda-common/options.mk
--- a/sysutils/amanda-common/options.mk Sun May 20 10:26:31 2012 +0000
+++ b/sysutils/amanda-common/options.mk Sun May 20 11:13:35 2012 +0000
@@ -1,9 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2008/07/29 17:21:39 pgoyette Exp $
+# $NetBSD: options.mk,v 1.2 2012/05/20 11:13:35 sbd Exp $
 
 # Since amanda's ipv6 usage is broken, turn it off by default.
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.amanda
-PKG_SUPPORTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS= inet6 amanda-fqdn amanda-ssh
+PKG_SUGGESTED_OPTIONS= amanda-ssh
+
+PKG_OPTIONS_LEGACY_VARS+=      AMANDA_FQDN:amanda-fqdn
+PKG_OPTIONS_LEGACY_VARS+=      AMANDA_SSH:amanda-ssh
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,3 +16,11 @@
 .else
 CONFIGURE_ARGS+=       --without-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mamanda-fqdn)
+CONFIGURE_ARGS+=        --with-fqdn
+.endif
+
+.if !empty(PKG_OPTIONS:Mamanda-ssh)
+CONFIGURE_ARGS+=        --with-ssh-security
+.endif