Change how Kerberos support is enabled in pkgsrc.

Quick guide for compiling packages:
- set KERBEROS=4 or KERBEROS=5 in /etc/mk.conf

Quick guide for configuring Kerberos support in a package Makefile:
- test for KERBEROS value and enable the appropriate version with
  CONFIGURE_ARGS or other means and set USE_KERBEROS=yes
- make sure to disable Kerberos support otherwise (especially if
  using configure, which might automatically detect it)
- BUILD_DEFS and RESTRICTED are set automatically in bsd.pkg.mk
  when USE_KERBEROS=yes is set

2 files changed, 16 insertions, 11 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index bff7c93a551..33d1d76d15f 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.337 1999/09/09 02:01:21 hubertf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.338 1999/09/14 02:32:24 kim Exp $
 #
 # This file is in the public domain.
 #
@@ -97,6 +97,11 @@ GMAKE?=			gmake
 MAKE_PROGRAM=		${MAKE}
 .endif
 
+.if defined(USE_KERBEROS)
+RESTRICTED?=		uses Kerberos encryption code
+BUILD_DEFS+=		KERBEROS
+.endif
+
 .if defined(USE_PERL5)
 DEPENDS+=		perl-5.00404:${PKGSRCDIR}/lang/perl5
 .endif
diff --git a/mk/mk.conf.example b/mk/mk.conf.example
index 59df61e0937..6ce17556f3e 100644
--- a/mk/mk.conf.example
+++ b/mk/mk.conf.example
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf.example,v 1.73 1999/09/07 14:55:37 jlam Exp $
+# $NetBSD: mk.conf.example,v 1.74 1999/09/14 02:32:25 kim Exp $
 #
 
 # Sample /etc/mk.conf file, which can be used to set specific values
@@ -241,6 +241,12 @@
                                 # Possible: not defined, british
                                 # Default: not defined
 
+#KERBEROS=			# Used in many packages to specify use of
+                                # a Kerberos (or compatible) subsystem.
+                                # Requires Kerberos libraries in /usr/lib.
+                                # Possible: 4, 5, not defined
+                                # Default: not defined
+
 #LIBWRAP_FWD=			# Used in ssh package to make libwrap also
                                 # compare against forwarded connection attempts
                                 # Possible: not defined, YES
@@ -337,10 +343,9 @@ 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
+#USE_INET6=			# Enable IPv6 support on certain packages.
+                                # Use IPv6-ready kernel if you define this.
+                                # Possible: not defined, YES
                                 # Default: not defined
 
 #USE_INN=			# Used in trn and nn to specify use of
@@ -393,11 +398,6 @@ PAPERSIZE=	A4		# Default paper size for packages.
                                 # Possible: defined, not defined
                                 # Default: not defined
 
-#USE_INET6=			# Enable IPv6 support on certain packages.
-                                # Use IPv6-ready kernel if you define this.
-                                # Possible: not defined, YES
-                                # Default: not defined
-
 #
 #	Overrides for faster or cheaper sites.
 #