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

3 files changed, 23 insertions, 20 deletions

diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 7ad64082c9e..a131f445861 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 1999/08/18 09:28:02 agc Exp $
+# $NetBSD: Makefile,v 1.7 1999/09/14 02:32:23 kim Exp $
 
-DISTNAME=	cyrus-imapd-v1.5.14
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME=		cyrus-imapd-v1.5.14
+CATEGORIES=		mail
+MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
-MAINTAINER=	kim@tac.nyc.ny.us
+MAINTAINER=		kim@tac.nyc.ny.us
 
-DEPENDS+=	tcl-8.0.5:../../lang/tcl80
+DEPENDS+=		tcl-8.0.5:../../lang/tcl80
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
 # XXX This package is not ready for general use!
 # XXX I've imported it because my work on it has
@@ -24,15 +24,13 @@ CONFIGURE_ARGS+=	--with-statedir=/var/run
 CONFIGURE_ARGS+=	--includedir=${LOCALBASE}/include/tcl8.0
 CONFIGURE_ARGS+=	--enable-netscapehack
 
-BUILD_DEFS+=		USE_KERBEROS4
-
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_KERBEROS4)
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS=		yes
 CONFIGURE_ARGS+=	--with-login=krb
-RESTRICTED=		uses Kerberos encryption code
 .endif
 
 .include "../../mk/bsd.pkg.mk"
 
-PKGNAME!=	${ECHO} "${DISTNAME}" | ${SED} -e 's/-imapd-v/-/'
+PKGNAME!=		${ECHO} "${DISTNAME}" | ${SED} -e 's/-imapd-v/-/'
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index f87133a3e1e..1110d2cd214 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 1999/09/03 22:00:52 tron Exp $
+# $NetBSD: Makefile,v 1.53 1999/09/14 02:32:24 kim Exp $
 #
 
 DISTNAME=       fetchmail-5.0.7
@@ -15,14 +15,17 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  LDFLAGS="${CFLAGS}"
 
-BUILD_DEFS+=	USE_KERBEROS4 USE_INET6
+BUILD_DEFS+=	USE_INET6
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_KERBEROS4)
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-kerberos=yes
-RESTRICTED=	uses Kerberos encryption code
+.else
+CONFIGURE_ARGS+=--with-kerberos=no
 .endif
+
 .if defined(USE_INET6) && ${USE_INET6} == YES
 CONFIGURE_ARGS+=--enable-inet6
 .endif
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 9edc0abb73f..87dd2e48925 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 1999/08/20 14:05:15 enami Exp $
+# $NetBSD: Makefile,v 1.29 1999/09/14 02:32:24 kim Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
@@ -35,14 +35,16 @@ CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
 CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
 .endif
 
-.if defined(USE_KERBEROS4)
+.if defined(KERBEROS) && ${KERBEROS} == 4
+USE_KERBEROS=	yes
 CONFIGURE_ARGS+=--with-krb4=yes
-RESTRICTED=	uses Kerberos encryption code
+.else
+CONFIGURE_ARGS+=--with-krb4=no
 .endif
 
 DOCDIR=		share/doc/nmh
 
-BUILD_DEFS+=	USE_KERBEROS4 NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
+BUILD_DEFS+=	NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
 
 # Since we patch the autoconf files as well as their outputs, avoid attempt
 # to regenerate header input files with 'autoheader' by Makefile.