From 3d303a261ddf2f0b3ad576aedb630766861d0c6a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 8 Dec 2000 14:32:00 +0000
Subject: Fix kerberos4 recognition if ${PREFIX} != /usr/local. Also change
 libdes recognition so that it builds with openssl. Fixes pkg/11170.

---
 security/cyrus-sasl/Makefile         |  6 ++----
 security/cyrus-sasl/files/patch-sum  |  3 ++-
 security/cyrus-sasl/patches/patch-ab | 13 +++++++++++++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 security/cyrus-sasl/patches/patch-ab

(limited to 'security')

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index b3deb6d93d7..1221fc6c8a3 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/10/25 08:00:24 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/08 14:32:00 wiz Exp $
 
 DISTNAME=	cyrus-sasl-1.5.24
 PKGNAME=	${DISTNAME}nb1
@@ -17,8 +17,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 .if !exists(/usr/include/openssl/rc4.h)
 DEPENDS+=	openssl-0.9.*:../../security/openssl
 CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include"
-.else
-CONFIGURE_ENV+=	CPPFLAGS="-I/usr/include/openssl"
 .endif
 
 CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/lib/sasl
@@ -31,7 +29,7 @@ DEPENDS+=		PAM-*:../../security/PAM
 CONFIGURE_ARGS+=	--with-pwcheck
 .endif
 .if defined(KERBEROS) && (${KERBEROS} == 4)
-CONFIGURE_ARGS+=	--enable-krb4
+CONFIGURE_ARGS+=	--enable-krb4=${PREFIX}
 DEPENDS+=		kth-krb4-*:../../security/kth-krb4
 .else
 CONFIGURE_ARGS+=	--disable-krb4
diff --git a/security/cyrus-sasl/files/patch-sum b/security/cyrus-sasl/files/patch-sum
index d4a38c0be39..cd5196e074d 100644
--- a/security/cyrus-sasl/files/patch-sum
+++ b/security/cyrus-sasl/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/08/25 15:23:49 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/08 14:32:01 wiz Exp $
 
 MD5 (patch-aa) = b52859d030d1017a4ed95ce103f9f53d
+MD5 (patch-ab) = f2e1354733f40c1be91cb784858f9b97
diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab
new file mode 100644
index 00000000000..90d98beb252
--- /dev/null
+++ b/security/cyrus-sasl/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2000/12/08 14:32:01 wiz Exp $
+
+--- configure.orig	Fri Jul 21 04:35:50 2000
++++ configure
+@@ -3512,6 +3512,8 @@
+   echo "$ac_t""yes" 1>&6
+   LIB_DES="-ldes";
+ 				       with_des=yes
++# we want the des code form openssl
++				       with_des=no
+ else
+   echo "$ac_t""no" 1>&6
+ with_des=no
-- 
cgit v1.2.3