pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/cyrus-saslauthd Restore (and correct) the fix...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ab0a64a2739d
branches: trunk
changeset: 478911:ab0a64a2739d
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Aug 01 19:43:45 2004 +0000
description:
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.
diffstat:
security/cyrus-saslauthd/Makefile | 5 ++++-
security/cyrus-saslauthd/Makefile.options | 5 +----
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (49 lines):
diff -r 84c2b40b4d4c -r ab0a64a2739d security/cyrus-saslauthd/Makefile
--- a/security/cyrus-saslauthd/Makefile Sun Aug 01 18:37:01 2004 +0000
+++ b/security/cyrus-saslauthd/Makefile Sun Aug 01 19:43:45 2004 +0000
@@ -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 @@
BUILD_DEFS+= SASLSOCKETDIR
FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR}
CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}"
+CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
.include "Makefile.options"
@@ -40,6 +41,8 @@
INSTALLATION_DIRS= bin
+.include "../../security/openssl/buildlink3.mk"
+
post-configure:
${LN} -sf saslauthd.h ${WRKSRC}/config.h
diff -r 84c2b40b4d4c -r ab0a64a2739d security/cyrus-saslauthd/Makefile.options
--- a/security/cyrus-saslauthd/Makefile.options Sun Aug 01 18:37:01 2004 +0000
+++ b/security/cyrus-saslauthd/Makefile.options Sun Aug 01 19:43:45 2004 +0000
@@ -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 @@
.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
Home |
Main Index |
Thread Index |
Old Index