Added optional GSSAPI support. To activate this feature, please set

SASL_USE_GSSAPI=YES in /etc/mk.conf

4 files changed, 19 insertions, 24 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 56a242b2d42..6576ef5e120 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2001/12/04 06:15:00 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/12/10 12:43:21 martti Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
-PKGREVISION=		3
+PKGREVISION=		4
 SVR4_PKGNAME=		csasl
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -52,21 +52,13 @@ CONFIGURE_ARGS+=	--disable-scram		# --- no SCRAM-MD5
 CONFIGURE_ARGS+=	--disable-sia		# --- no SIA
 CONFIGURE_ARGS+=	--disable-srp		# --- no SRP
 CONFIGURE_ARGS+=	--disable-x509		# --- no X.509
+CONFIGURE_ARGS+=	--disable-krb4		# --- no KERBEROS_V4
 
-.if defined(KERBEROS)
-.undef USE_BUILDLINK_ONLY
-.if ${OPSYS} == "NetBSD"
-USE_KERBEROS=		# defined
-CONFIGURE_ARGS+=	--enable-krb4=${PREFIX} --enable-gssapi=/usr # KERBEROS_V4
-DEPENDS+=		kth-krb4-[0-9]*:../../security/kth-krb4
-PLIST_SRC+=		${PKGDIR}/PLIST.krb4 ${PKGDIR}/PLIST.krb5
-.elif ${OPSYS} == "SunOS"
-USE_KERBEROS=		# defined
+.if defined(SASL_USE_GSSAPI) && ${SASL_USE_GSSAPI} == "YES"
 CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
 PLIST_SRC+=		${PKGDIR}/PLIST.krb5
 .else
-CONFIGURE_ARGS+=	--disable-krb4 --disable-gssapi # --- no KERBEROS_V4
-.endif
+CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 .endif
 
 PLIST_SRC+=		${PKGDIR}/PLIST.plugins
diff --git a/security/cyrus-sasl/PLIST.krb4 b/security/cyrus-sasl/PLIST.krb4
deleted file mode 100644
index 76f787bf40e..00000000000
--- a/security/cyrus-sasl/PLIST.krb4
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.krb4,v 1.1 2001/11/01 01:22:01 zuntum Exp $
-lib/sasl/libkerberos4.a
-lib/sasl/libkerberos4.la
-lib/sasl/libkerberos4.so
-lib/sasl/libkerberos4.so.1
-lib/sasl/libkerberos4.so.1.15
diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo
index 157fdc87ff0..08fbda57da9 100644
--- a/security/cyrus-sasl/distinfo
+++ b/security/cyrus-sasl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:30 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/12/10 12:43:21 martti Exp $
 
 SHA1 (cyrus-sasl-1.5.24.tar.gz) = 6e8cbc8f1ee5269c4f3aad1f501b422be7117168
 Size (cyrus-sasl-1.5.24.tar.gz) = 494457 bytes
-SHA1 (patch-aa) = 4e6d027a6d4d66d54f7a565a0e5c48b34f05bb08
+SHA1 (patch-aa) = 0cd3f7a221a601008ed42f8edbf6f2724479be02
 SHA1 (patch-ab) = 82359390958c020348e7e7ebc39315da552d34c7
 SHA1 (patch-ac) = b5f99dd4789c19e36c29bbc3fbf47c556e32876e
 SHA1 (patch-ad) = faa888873c16c3c322e110a6f90380748b138942
diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa
index b5935d3aec5..afd3619a606 100644
--- a/security/cyrus-sasl/patches/patch-aa
+++ b/security/cyrus-sasl/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/01/31 22:47:53 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/12/10 12:43:21 martti Exp $
 
---- configure.in.orig	Thu Jul 20 22:35:01 2000
-+++ configure.in
+--- configure.in.orig	Fri Jul 21 04:35:01 2000
++++ configure.in	Mon Dec 10 13:26:32 2001
 @@ -65,9 +65,12 @@
  
  dnl check for -R, etc. switch
@@ -32,6 +32,15 @@ $NetBSD: patch-aa,v 1.3 2001/01/31 22:47:53 jlam Exp $
  
    if test "$with_des" = no; then
      dnl if openssl is around, we might be able to use that for des
+@@ -464,7 +470,7 @@
+ 
+ if test "$gssapi" != no; then
+   if test -d ${gssapi}; then
+-     CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++     CPPFLAGS="$CPPFLAGS -I$gssapi/include -I$gssapi/include/krb5"
+      LDFLAGS="$LDFLAGS -L$gssapi/lib"
+   fi
+   AC_CHECK_HEADER(gssapi.h, AC_DEFINE(HAVE_GSSAPI_H),
 @@ -694,6 +700,9 @@
  
  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`