[pkgsrc/trunk]: pkgsrc/security/sudo Allow building sudo without S/Key suppor...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df5b21df6066
branches:  trunk
changeset: 486063:df5b21df6066
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Dec 22 04:36:32 2004 +0000

description:
Allow building sudo without S/Key support on NetBSD.  Patch from
PR pkg/28743 by Jukka Salmi with minor changes by me.

diffstat:

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

diffs (50 lines):

diff -r 4d6d59f59f3c -r df5b21df6066 security/sudo/Makefile
--- a/security/sudo/Makefile    Wed Dec 22 03:59:30 2004 +0000
+++ b/security/sudo/Makefile    Wed Dec 22 04:36:32 2004 +0000
@@ -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 @@
 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 -r 4d6d59f59f3c -r df5b21df6066 security/sudo/options.mk
--- a/security/sudo/options.mk  Wed Dec 22 03:59:30 2004 +0000
+++ b/security/sudo/options.mk  Wed Dec 22 04:36:32 2004 +0000
@@ -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 @@
 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