From e30a02548250fbd6b0636034f58d735cdf4e8d5f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 1 Aug 2004 19:43:45 +0000
Subject: Restore (and correct) the fix in revision 1.15 of Makefile.  This
 causes openssl/buildlink3.mk to be included unconditionally to provide the
 des.h header and des* routines.

---
 security/cyrus-saslauthd/Makefile         | 5 ++++-
 security/cyrus-saslauthd/Makefile.options | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'security/cyrus-saslauthd')

diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 7b849e5dd62..c9883a67ffe 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/07/30 21:05:42 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/08/01 19:43:45 jlam Exp $
 
 DISTNAME=	cyrus-sasl-2.1.18
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
@@ -30,6 +30,7 @@ SASLSOCKETDIR?=		${VARBASE}/run/saslauthd
 BUILD_DEFS+=		SASLSOCKETDIR
 FILES_SUBST+=		SASLSOCKETDIR=${SASLSOCKETDIR}
 CONFIGURE_ARGS+=	--with-saslauthd="${SASLSOCKETDIR}"
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
 .include "Makefile.options"
 
@@ -40,6 +41,8 @@ FILES_SUBST+=		ROOT_USER=${ROOT_USER}
 
 INSTALLATION_DIRS=	bin
 
+.include "../../security/openssl/buildlink3.mk"
+
 post-configure:
 	${LN} -sf saslauthd.h ${WRKSRC}/config.h
 
diff --git a/security/cyrus-saslauthd/Makefile.options b/security/cyrus-saslauthd/Makefile.options
index 25bb5dc61a7..98f02fa8d4f 100644
--- a/security/cyrus-saslauthd/Makefile.options
+++ b/security/cyrus-saslauthd/Makefile.options
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.options,v 1.1 2004/07/30 21:05:42 jlam Exp $
+# $NetBSD: Makefile.options,v 1.2 2004/08/01 19:43:45 jlam Exp $
 
 # Global and legacy options
 .if defined(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \
@@ -37,13 +37,10 @@ CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap/buildlink3.mk"
 .  include "../../security/cyrus-sasl2/buildlink3.mk"
-.  include "../../security/openssl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap}
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 PLIST_SUBST+=		LDAP=
 .else
-CONFIGURE_ARGS+=	--without-openssl
 PLIST_SUBST+=		LDAP="@comment "
 .endif
 
-- 
cgit v1.2.3