Make the Kerberos option uniform - it is now USE_KERBEROS4 and specifies

use of krb4 _or_ a compatible subsystem.  (MAKE_ was only used by this
option; USE_ is used by many.)
Also set RESTRICTED= in all relevant pkgs when USE_KERBEROS4 is enabled.

6 files changed, 25 insertions, 26 deletions

diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 110cbf1ad4b..7f46ef34771 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/03/07 00:41:51 kim Exp $
+# $NetBSD: Makefile,v 1.4 1999/05/03 23:39:22 tv Exp $
 
 DISTNAME=	cyrus-imapd-v1.5.14
 CATEGORIES=	mail
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=	--with-tcl=/usr/local/tcl
 
 PKGNAME!=	${ECHO} "${DISTNAME}" | ${SED} -e 's/-imapd-v/-/'
 
-.if exists(/usr/lib/libkrb.a) && \
-    (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
+.if defined(USE_KERBEROS4)
 CONFIGURE_ARGS+=	--with-login=krb
+RESTRICTED=		uses Kerberos encryption code
 .endif
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 741022f91ae..cf285c5d4f6 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 1999/05/03 11:54:20 frueauf Exp $
+# $NetBSD: Makefile,v 1.43 1999/05/03 23:39:22 tv Exp $
 #
 
 DISTNAME=       fetchmail-5.0.3
@@ -17,8 +17,9 @@ CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
-CONFIGURE_ARGS += --with-kerberos=yes
+.if defined(USE_KERBEROS4)
+CONFIGURE_ARGS+=--with-kerberos=yes
+RESTRICTED=	uses Kerberos encryption code
 .endif
 
 FDOC=	${PREFIX}/share/doc/fetchmail
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 0acd4f7c517..28e050b4dfc 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/03/07 01:16:25 kim Exp $
+# $NetBSD: Makefile,v 1.26 1999/05/03 23:39:22 tv Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -35,8 +35,9 @@ CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
 CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
 .endif
 
-.if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
-CONFIGURE_ARGS+= --with-krb4=yes
+.if defined(USE_KERBEROS4)
+CONFIGURE_ARGS+=--with-krb4=yes
+RESTRICTED=	uses Kerberos encryption code
 .endif
 
 DOCDIR=		share/doc/nmh
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index fa57b7db1e0..23b94093991 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.52 1999/04/24 19:48:23 tron Exp $
+# $NetBSD: mk.conf.example,v 1.53 1999/05/03 23:39:22 tv Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -210,16 +210,6 @@
                                 # Possible: not defined, YES.
                                 # Default: not defined.
 
-#MAKE_EBONES=			# Used in fetchmail and zephyr to specify use
-                                # of non-USA Kerberos-compatible subsystem.
-                                # Possible: defined, not defined
-                                # Default: not defined
-
-#MAKE_KERBEROS4=		# Used in the fetchmail package to specify use
-                                # of Kerberos subsystem.
-                                # Possible: defined, not defined
-                                # Default: not defined
-
 #MUTT_INTERNATIONAL=	yes	# Used to decide if international export
                                 # restricted version of "mutt" is built.
                                 # Possible: not defined, YES
@@ -267,6 +257,12 @@ PAPERSIZE=	A4		# Default paper size for packages.
                                 # Possible: YES, or NO.
                                 # Default: NO
 
+#USE_KERBEROS4=			# Used in many packages to specify use of
+                                # Kerberos 4 (or a compatible) subsystem.
+                                # Requires Kerberos libraries in /usr/lib.
+                                # Possible: defined, not defined
+                                # Default: not defined
+
 #USE_MENUS=			# Used in xvile package to build in support for
                                 # menus.
                                 # Possible: defined, not defined
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 466470aa4be..1017c598af9 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/04/24 23:53:33 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/03 23:39:22 tv Exp $
 #
 # Tempted to install another radius package?
 #
@@ -31,10 +31,10 @@ MAKE_ENV+=	RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \
 		INSTALL="${INSTALL} -c"
 
 # XXX Kerberos IV support is known to be broken.
-#.if exists(/usr/lib/libkrb.a) && \
-#    (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
+#.if defined(USE_KERBEROS4)
 #CFLAGS+=	-DM_KERB -I/usr/include/kerberosIV
 #RADLIBS=	-lkrb -ldes
+#RESTRICTED=	uses Kerberos encryption code
 #.endif
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 47429c53835..adc1dda9883 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/04/26 19:15:39 garbled Exp $
+# $NetBSD: Makefile,v 1.15 1999/05/03 23:39:23 tv Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
@@ -10,9 +10,10 @@ HOMEPAGE=	http://web.mit.edu/olh/Zephyr/index.html
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(/usr/lib/libkrb.a) && (defined(MAKE_EBONES) || defined(MAKE_KERBEROS4))
+.if defined(USE_KERBEROS4)
 CONFIGURE_ARGS+="--with-krb4"
-CONFIGURE_ENV+=CPPFLAGS=-I/usr/include/kerberosIV
+CONFIGURE_ENV+=	CPPFLAGS=-I/usr/include/kerberosIV
+RESTRICTED=	uses Kerberos encryption code
 .endif
 
 USE_X11=	yes