From 0c193e1ad0e05fb69e7c2da23b254d39b217f535 Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Sun, 20 May 2012 11:13:35 +0000
Subject: Convert AMANDA_SSH and AMANFA_FQDN to pkg options and enable
 amanda-ssh.

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

(limited to 'sysutils/amanda-common')

diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 74b75f6d38b..126fe4c65bf 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -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-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
 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 --git a/sysutils/amanda-common/options.mk b/sysutils/amanda-common/options.mk
index 904d8ecf25d..292d8f4ee52 100644
--- a/sysutils/amanda-common/options.mk
+++ b/sysutils/amanda-common/options.mk
@@ -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 @@ CONFIGURE_ARGS+=	--with-ipv6
 .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
-- 
cgit v1.2.3