From 02e7a05425bea55caa102458003ca3fab994548b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 22 Dec 2004 04:36:32 +0000
Subject: Allow building sudo without S/Key support on NetBSD.  Patch from PR
 pkg/28743 by Jukka Salmi with minor changes by me.

---
 security/sudo/Makefile   |  8 +-------
 security/sudo/options.mk | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'security/sudo')

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 0bbcb1eb719..4df8ffa9546 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2004/11/30 00:27:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.76 2004/12/22 04:36:32 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.8p5
@@ -28,12 +28,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-root-mailer --disable-setreuid
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--with-skey
-.elif ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--without-skey
-.endif
-
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index d42630b118c..b211b6d5ff0 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,8 +1,12 @@
-# $NetBSD: options.mk,v 1.5 2004/12/22 03:59:10 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2004/12/22 04:36:33 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
-PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap
+PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap skey
+.if ${OPSYS} == "NetBSD"
+PKG_DEFAULT_OPTIONS+=	skey
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:MPAM)
@@ -25,3 +29,9 @@ DL_AUTO_VARS=		yes
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
 CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
 .endif
+
+.if !empty(PKG_OPTIONS:Mskey)
+CONFIGURE_ARGS+=	--with-skey
+.else
+CONFIGURE_ARGS+=	--without-skey
+.endif
-- 
cgit v1.2.3