Change USE_KERBEROS to PKG_USE_KERBEROS in pkgsrc. There was a "conflict"

which the basesrc USE_KERBEROS variable. Discussed on packages@

This fixes PR#17182 from Takahiro Kambe. The problem was pointed out by
FUKAUMI Naoki on a Japanese NetBSD mailing list.

12 files changed, 25 insertions, 25 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 2cb5a9b653c..52ae7d74082 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2002/03/07 23:40:56 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2002/06/15 21:19:59 cjep Exp $
 
 DISTNAME=	openldap-2.0.23
 SVR4_PKGNAME=	oldap
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--enable-spasswd
 .endif
 
 .if defined(KERBEROS)
-USE_KERBEROS=		YES
+PKG_USE_KERBEROS=	YES
 CONFIGURE_ARGS+=	--with-kerberos
 .else
 CONFIGURE_ARGS+=	--without-kerberos
diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile
index 0c8d319efc5..c5493fd4bb5 100644
--- a/databases/openldap1/Makefile
+++ b/databases/openldap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/25 18:46:29 kleink Exp $
+# $NetBSD: Makefile,v 1.3 2002/06/15 21:20:00 cjep Exp $
 #
 
 DISTNAME=	openldap-1.2.13
@@ -46,7 +46,7 @@ post-configure:
 	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
 
 .if defined(KERBEROS)
-USE_KERBEROS=	yes
+PKG_USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-kerberos
 .else
 CONFIGURE_ARGS+=--without-kerberos
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index b4446aaf505..8bdc2f41fdb 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/12/06 09:50:13 martti Exp $
+# $NetBSD: Makefile,v 1.27 2002/06/15 21:20:01 cjep Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 PKGREVISION=		1
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--with-com_err=yes
 .endif
 
 .if defined(KERBEROS) && ${KERBEROS} == 4
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--with-auth=krb
 .else
 CONFIGURE_ARGS+=	--with-auth=unix
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 4f04a66d538..725aaaf71a1 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2002/04/06 16:53:01 frueauf Exp $
+# $NetBSD: Makefile,v 1.114 2002/06/15 21:20:01 cjep Exp $
 
 DISTNAME=	fetchmail-5.9.11
 CATEGORIES=	mail
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--without-ssl
 BUILD_DEFS+=		FETCHMAIL_USE_SSL
 
 .if defined(KERBEROS)
-USE_KERBEROS=		yes
+PKG_USE_KERBEROS=	yes
 CONFIGURE_ARGS+=	--with-kerberos=yes
 .if ${MACHINE_PLATFORM:MNetBSD-1.[0-4]*-i386} == ""
 REPLACE_KERBEROS_LIBS=	# defined
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 2b4bbced29e..e7d6b5a6124 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/03/11 08:57:50 skrll Exp $
+# $NetBSD: Makefile,v 1.47 2002/06/15 21:20:01 cjep Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
 .endif
 
 .if defined(KERBEROS)
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--with-krb4
 .else
 CONFIGURE_ARGS+=	--without-krb4
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index 05c67f31f7b..7ea374a90d2 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2002/05/03 15:09:51 taca Exp $
+# $NetBSD: Makefile.common,v 1.6 2002/06/15 21:20:02 cjep Exp $
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libexecdir=${LOCALBASE}/libexec \
@@ -20,7 +20,7 @@ VERSION=		4.0.4
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
 
 .if defined(KERBEROS)
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--enable-kerberos
 .endif
 
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 4aafa5daa9c..16e17e9b4b4 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.990 2002/06/15 11:28:12 cjep Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.991 2002/06/15 21:20:02 cjep Exp $
 #
 # This file is in the public domain.
 #
@@ -184,7 +184,7 @@ MAKE_PROGRAM=		${MAKE}
 .endif
 CONFIGURE_ENV+=		MAKE="${MAKE_PROGRAM}"
 
-.if defined(USE_KERBEROS)
+.if defined(PKG_USE_KERBEROS)
 RESTRICTED?=		uses Kerberos encryption code
 BUILD_DEFS+=		KERBEROS
 .endif
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 8d24b342f5a..921ee81a8a4 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/12/19 13:42:10 tron Exp $
+# $NetBSD: Makefile,v 1.20 2002/06/15 21:20:03 cjep Exp $
 #
 # Tempted to install another radius package?
 #
@@ -29,7 +29,7 @@ DIST_SUBDIR=	radius
 CFLAGS+=	-DHAVE_SETVBUF -DNOSHADOW
 
 .if defined(KERBEROS)
-USE_KERBEROS=	yes
+PKG_USE_KERBEROS=	yes
 CFLAGS+=	-DM_KERB -I/usr/include/kerberosIV
 RADLIBS=	-lkrb -ldes
 .endif
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index c37f4c7874b..159a02c6819 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/06/11 06:34:47 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2002/06/15 21:20:03 cjep Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -12,7 +12,7 @@ COMMENT=	Zephyr Messaging Service
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(KERBEROS)
-USE_KERBEROS=	yes
+PKG_USE_KERBEROS=	yes
 CONFIGURE_ARGS+="--with-krb4"
 CPPFLAGS+=	-I/usr/include/kerberosIV
 .else
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 66c94073941..bbdce61784f 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2002/05/24 04:11:47 itojun Exp $
+# $NetBSD: Makefile,v 1.72 2002/06/15 21:20:04 cjep Exp $
 
 DISTNAME=		openssh-3.2.3p1
 PKGNAME=		openssh-3.2.3.1
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--with-md5-passwords
 
 # XXX: <krb.h>
 #.if defined(KERBEROS)
-#USE_KERBEROS=		yes
+#PKG_USE_KERBEROS=		yes
 #CONFIGURE_ARGS+=	--with-kerberos4=/usr
 #.endif
 
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index ad20d09d805..610342c6333 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2002/02/05 04:26:56 jlam Exp $
+# $NetBSD: Makefile,v 1.99 2002/06/15 21:20:04 cjep Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -104,13 +104,13 @@ DEPENDS+=		socks5-1.0.2:../../net/socks5
 # MD5 (ssh-1.2.27-afs-kerberos.patch-1) = d440f74958d9c3805b76dbc13e97e87d
 
 .if defined(KERBEROS)
-USE_KERBEROS=		yes
+PKG_USE_KERBEROS=		yes
 CONFIGURE_ARGS+=	--with-krb4=/usr
 .endif
 
 # XXX KERBEROS 5 SUPPORT BROKEN WITH HEIMDAL
 #.if defined(KERBEROS) && ${KERBEROS} == 5
-#USE_KERBEROS=	yes
+#PKG_USE_KERBEROS=	yes
 #CONFIGURE_ARGS+=--with-krb5=/usr
 #.else
 #CONFIGURE_ARGS+=--without-krb5
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index ea90c25c4b6..91089122111 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/04/25 16:57:13 jschauma Exp $
+# $NetBSD: Makefile,v 1.47 2002/06/15 21:20:05 cjep Exp $
 #
 
 DISTNAME=		sudo-1.6.6
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--without-skey
 .endif
 
 .if defined(KERBEROS)
-USE_KERBEROS=		# defined
+PKG_USE_KERBEROS=	# defined
 CONFIGURE_ARGS+=	--with-kerb4 --with-kerb5
 .else
 CONFIGURE_ARGS+=	--without-kerb4 --without-kerb5