Update sudo package to 1.6.9p4.

pkgsrc change:

Make these options mutual exclusive: kerberos pam skey.
(Really, combinations of kerberos and pam, pam and skey are conflicts.)

CHANGES:

609) Worked around a bug ins some PAM implementations that caused a crash
     when no tty was present.

610) Fixed a crash on some platforms in the error logging function.

611) Documentation improvements.

Sudo 1.6.9p1 released.

612) Fixed updating of the saved environment when the environ pointer
     gets changed out from underneath us.

Sudo 1.6.9p2 released.

613) Fixed a bug related to supplemental group matching introduced
     in 1.6.9.

Sudo 1.6.9p3 released.

614) Added IPv6 support from YOSHIFUJI Hideaki.

615) Fixed sudo_noexec installation path.

616) Fixed a K&R compilation error.

Sudo 1.6.9p4 released.

5 files changed, 15 insertions, 12 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index e8a05b7f6b6..b82a9bc5e6b 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.95 2007/07/27 17:28:48 gdt Exp $
+# $NetBSD: Makefile,v 1.96 2007/08/18 15:09:11 taca Exp $
 #
 
-DISTNAME=		sudo-1.6.9
+DISTNAME=		sudo-1.6.9p4
 CATEGORIES=		security
 MASTER_SITES=		http://www.courtesan.com/sudo/dist/ \
 			ftp://ftp.courtesan.com/pub/sudo/ \
@@ -20,10 +20,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LIBTOOL=		yes
 OWN_DIRS+=		${VARBASE}/run
 GNU_CONFIGURE=		yes
+BUILD_DEFS+=		VARBASE
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ENV+=		NROFFPROG=${CAT} # to always install man instead of cat
+# to always install man instead of cat
+CONFIGURE_ENV+=		NROFFPROG=${CAT:Q}
 CONFIGURE_ENV+=		mansectsu=8
 CONFIGURE_ENV+=		mansectform=5
 CONFIGURE_ARGS+=	--disable-root-mailer
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index f59d7c8a12e..45bd327ad59 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.39 2007/07/30 08:41:20 joerg Exp $
-
-SHA1 (sudo-1.6.9.tar.gz) = 42fa0c9836bdaedeb1a7344f24f7822e598760b5
-RMD160 (sudo-1.6.9.tar.gz) = 141688a479f3dd915075eae98de8f7dc1a5c63f4
-Size (sudo-1.6.9.tar.gz) = 557692 bytes
+$NetBSD: distinfo,v 1.40 2007/08/18 15:09:12 taca Exp $
 
+SHA1 (sudo-1.6.9p4.tar.gz) = 40890e6744572c1fcf23c05f7a1bea49d2cf4fe2
+RMD160 (sudo-1.6.9p4.tar.gz) = 6dbd89c5ef8df4272ecd812e71b784a1da488f71
+Size (sudo-1.6.9p4.tar.gz) = 581385 bytes
 SHA1 (patch-aa) = 98ca6552bc305aeeb726d48f1d722480f792a0ba
 SHA1 (patch-af) = e411f12789f9d5b5fda8b88af3730c89859f5eda
 SHA1 (patch-ag) = c1b89fff452c78120a97622df29125ed6ac5c9a2
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index 6fda4b382e8..ee505a4142c 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.12 2007/07/23 16:38:36 tls Exp $
+# $NetBSD: options.mk,v 1.13 2007/08/18 15:09:12 taca Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
-PKG_SUPPORTED_OPTIONS=	pam kerberos ldap skey
+PKG_SUPPORTED_OPTIONS=	kerberos ldap pam skey
+PKG_OPTIONS_OPTIONAL_GROUPS= auth
+PKG_OPTIONS_GROUP.auth=	kerberos pam skey
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/skey.h)
 PKG_SUGGESTED_OPTIONS=	skey
diff --git a/security/sudo/patches/patch-aa b/security/sudo/patches/patch-aa
index f3ac7796084..cb48a8b24a0 100644
--- a/security/sudo/patches/patch-aa
+++ b/security/sudo/patches/patch-aa
@@ -1,4 +1,4 @@
-/* $NetBSD: patch-aa,v 1.14 2007/07/23 16:38:36 tls Exp $ */
+$NetBSD: patch-aa,v 1.15 2007/08/18 15:09:13 taca Exp $
 
 --- Makefile.in.orig	2007-07-16 22:53:18.000000000 -0400
 +++ Makefile.in	2007-07-23 05:50:01.000000000 -0400
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af
index 59da8978adb..64675fd178b 100644
--- a/security/sudo/patches/patch-af
+++ b/security/sudo/patches/patch-af
@@ -1,4 +1,4 @@
-/* $NetBSD: patch-af,v 1.15 2007/07/23 16:38:36 tls Exp $ */
+$NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $
 
 --- configure.in.orig	2007-07-16 22:51:21.000000000 -0400
 +++ configure.in	2007-07-23 11:15:42.000000000 -0400