pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update path from cyrus-sasl2 to cyrus-sasl.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e4de9215828d
branches: trunk
changeset: 511401:e4de9215828d
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Apr 13 21:45:12 2006 +0000
description:
Update path from cyrus-sasl2 to cyrus-sasl.
diffstat:
databases/openldap/buildlink3.mk | 4 ++--
databases/openldap/options.mk | 4 ++--
databases/py-ldap/Makefile | 4 ++--
mail/cyrus-imapd/Makefile | 4 ++--
mail/cyrus-imapd21/Makefile | 4 ++--
mail/exim/options.mk | 6 +++---
mail/libetpan/Makefile | 4 ++--
mail/libetpan/buildlink3.mk | 4 ++--
mail/mail-notification/Makefile | 4 ++--
mail/mutt-devel/options.mk | 4 ++--
mail/postfix-current/options.mk | 4 ++--
mail/postfix/options.mk | 4 ++--
mail/sendmail/options.mk | 4 ++--
mail/sendmail812/options.mk | 4 ++--
misc/kdepim3/Makefile | 4 ++--
misc/kdepim3/buildlink3.mk | 4 ++--
mk/bsd.options.mk | 4 ++--
mk/defaults/mk.conf | 6 +++---
security/cy2-anonymous/Makefile | 4 ++--
security/cy2-crammd5/Makefile | 4 ++--
security/cy2-digestmd5/Makefile | 4 ++--
security/cy2-gssapi/Makefile | 4 ++--
security/cy2-login/Makefile | 4 ++--
security/cy2-ntlm/Makefile | 4 ++--
security/cy2-otp/Makefile | 4 ++--
security/cy2-plain/Makefile | 4 ++--
security/cy2-sql/Makefile | 4 ++--
security/p5-Authen-SASL-Cyrus/Makefile | 4 ++--
x11/kdebase3/Makefile | 4 ++--
x11/kdebase3/buildlink3.mk | 4 ++--
30 files changed, 62 insertions(+), 62 deletions(-)
diffs (truncated from 543 to 300 lines):
diff -r f9aeac70f746 -r e4de9215828d databases/openldap/buildlink3.mk
--- a/databases/openldap/buildlink3.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/databases/openldap/buildlink3.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2006/04/12 10:27:04 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2006/04/13 21:45:13 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -30,7 +30,7 @@
.if !empty(PKG_BUILD_OPTIONS.openldap:Mkerberos) || \
!empty(PKG_BUILD_OPTIONS.openldap:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
.include "../../security/openssl/buildlink3.mk"
diff -r f9aeac70f746 -r e4de9215828d databases/openldap/options.mk
--- a/databases/openldap/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/databases/openldap/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2006/04/06 06:21:41 reed Exp $
+# $NetBSD: options.mk,v 1.17 2006/04/13 21:45:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp
@@ -62,7 +62,7 @@
.if !empty(PKG_OPTIONS:Msasl)
CONFIGURE_ARGS+= --with-cyrus-sasl
BUILDLINK_API_DEPENDS.cyrus-sasl+= cyrus-sasl>=2.1.15
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-cyrus-sasl
.endif
diff -r f9aeac70f746 -r e4de9215828d databases/py-ldap/Makefile
--- a/databases/py-ldap/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/databases/py-ldap/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2006/04/13 21:45:13 wiz Exp $
DISTNAME= python-ldap-2.0.10
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -20,7 +20,7 @@
-e "s|@EXTRAINCS@|${BUILDLINK_PREFIX.cyrus-sasl}/include/sasl ${BUILDLINK_PREFIX.openldap}/include|"
.include "../../databases/openldap/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../lang/python/extension.mk"
.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == ""
diff -r f9aeac70f746 -r e4de9215828d mail/cyrus-imapd/Makefile
--- a/mail/cyrus-imapd/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/cyrus-imapd/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2006/04/13 21:45:13 wiz Exp $
DISTNAME= cyrus-imapd-2.2.12
PKGREVISION= 4
@@ -117,7 +117,7 @@
auto/Cyrus/SIEVE/managesieve/.packlist
.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bdb.buildlink3.mk"
diff -r f9aeac70f746 -r e4de9215828d mail/cyrus-imapd21/Makefile
--- a/mail/cyrus-imapd21/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/cyrus-imapd21/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/03/14 01:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/04/13 21:45:13 wiz Exp $
DISTNAME= cyrus-imapd-2.1.18
PKGREVISION= 3
@@ -128,7 +128,7 @@
auto/Cyrus/SIEVE/managesieve/.packlist
.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/tcp_wrappers/buildlink3.mk"
diff -r f9aeac70f746 -r e4de9215828d mail/exim/options.mk
--- a/mail/exim/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/exim/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2006/04/01 22:02:19 abs Exp $
+# $NetBSD: options.mk,v 1.8 2006/04/13 21:45:13 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
PKG_SUPPORTED_OPTIONS= exim-build-eximon exim-content-scan exim-lookup-dnsdb
@@ -96,6 +96,6 @@
.if !empty(PKG_OPTIONS:Msaslauthd)
LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=YES
LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl2} -lsasl2
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.cyrus-sasl} -lsasl2
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
diff -r f9aeac70f746 -r e4de9215828d mail/libetpan/Makefile
--- a/mail/libetpan/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/libetpan/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/08 06:34:25 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/04/13 21:45:13 wiz Exp $
#
DISTNAME= libetpan-0.43
@@ -20,7 +20,7 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f9aeac70f746 -r e4de9215828d mail/libetpan/buildlink3.mk
--- a/mail/libetpan/buildlink3.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/libetpan/buildlink3.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/04/12 10:27:23 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/04/13 21:45:12 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
LIBETPAN_BUILDLINK3_MK:= ${LIBETPAN_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r f9aeac70f746 -r e4de9215828d mail/mail-notification/Makefile
--- a/mail/mail-notification/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/mail-notification/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/04/13 21:45:13 wiz Exp $
#
DISTNAME= mail-notification-2.0
@@ -36,7 +36,7 @@
# Whether to add SASL2 support.
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-sasl
.endif
diff -r f9aeac70f746 -r e4de9215828d mail/mutt-devel/options.mk
--- a/mail/mutt-devel/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/mutt-devel/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2005/12/20 17:23:11 tonio Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/13 21:45:13 wiz Exp $
# Global and legacy options
@@ -26,7 +26,7 @@
### SASLv2
###
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
.endif
diff -r f9aeac70f746 -r e4de9215828d mail/postfix-current/options.mk
--- a/mail/postfix-current/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/postfix-current/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2006/01/10 06:39:00 martti Exp $
+# $NetBSD: options.mk,v 1.13 2006/04/13 21:45:13 wiz Exp $
# Global and legacy options
@@ -84,7 +84,7 @@
### SASL support for SMTP authentication.
###
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
BUILDLINK_INCDIRS.cyrus-sasl= include/sasl
SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
diff -r f9aeac70f746 -r e4de9215828d mail/postfix/options.mk
--- a/mail/postfix/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/postfix/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2005/07/31 03:46:05 grant Exp $
+# $NetBSD: options.mk,v 1.21 2006/04/13 21:45:13 wiz Exp $
# Global and legacy options
@@ -84,7 +84,7 @@
### SASL support for SMTP authentication.
###
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
BUILDLINK_INCDIRS.cyrus-sasl= include/sasl
SASLLIBDIR= ${PREFIX}/lib/sasl2
PWCHECK_METHOD= auxprop
diff -r f9aeac70f746 -r e4de9215828d mail/sendmail/options.mk
--- a/mail/sendmail/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/sendmail/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2005/10/20 15:10:01 adrianp Exp $
+# $NetBSD: options.mk,v 1.14 2006/04/13 21:45:14 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap
@@ -29,7 +29,7 @@
### Use SASL/v2 for SMTP AUTH
###
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
###
diff -r f9aeac70f746 -r e4de9215828d mail/sendmail812/options.mk
--- a/mail/sendmail812/options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mail/sendmail812/options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2006/04/13 21:45:14 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_OPTIONS_OPTIONAL_GROUPS= database
@@ -34,7 +34,7 @@
### Use SASL/v2 for SMTP AUTH
###
.if !empty(PKG_OPTIONS:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
###
diff -r f9aeac70f746 -r e4de9215828d misc/kdepim3/Makefile
--- a/misc/kdepim3/Makefile Thu Apr 13 21:41:10 2006 +0000
+++ b/misc/kdepim3/Makefile Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/04/06 06:22:23 reed Exp $
+# $NetBSD: Makefile,v 1.60 2006/04/13 21:45:13 wiz Exp $
DISTNAME= kdepim-${_KDE_VERSION}
CATEGORIES= misc
@@ -44,7 +44,7 @@
BUILDLINK_DEPMETHOD.qt3-tools= full
.if !empty(PKG_OPTIONS:Msasl)
-.include "../../security/cyrus-sasl2/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
PLIST_SUBST+= HAVE_SASL=""
.else
PLIST_SUBST+= HAVE_SASL="@comment "
diff -r f9aeac70f746 -r e4de9215828d misc/kdepim3/buildlink3.mk
--- a/misc/kdepim3/buildlink3.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/misc/kdepim3/buildlink3.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:22:23 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/04/13 21:45:13 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.if !empty(PKG_BUILD_OPTIONS.kdepim:Msasl)
-. include "../../security/cyrus-sasl2/buildlink3.mk"
+. include "../../security/cyrus-sasl/buildlink3.mk"
.endif
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff -r f9aeac70f746 -r e4de9215828d mk/bsd.options.mk
--- a/mk/bsd.options.mk Thu Apr 13 21:41:10 2006 +0000
+++ b/mk/bsd.options.mk Thu Apr 13 21:45:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.50 2005/11/14 04:25:50 rillig Exp $
+# $NetBSD: bsd.options.mk,v 1.51 2006/04/13 21:45:14 wiz Exp $
#
# This Makefile fragment provides boilerplate code for standard naming
# conventions for handling per-package build options.
@@ -128,7 +128,7 @@
# ### SASL authentication
# ###
Home |
Main Index |
Thread Index |
Old Index