diff options
30 files changed, 62 insertions, 62 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk index f69f5504947..5b44a936517 100644 --- a/databases/openldap/buildlink3.mk +++ b/databases/openldap/buildlink3.mk @@ -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 @@ MAKEVARS+= PKG_BUILD_OPTIONS.openldap .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 --git a/databases/openldap/options.mk b/databases/openldap/options.mk index a688793fcf9..ce9e2f25c7d 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -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 @@ PKG_OPTIONS+= sasl .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 --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile index 3f1eef16f62..48bf97739aa 100644 --- a/databases/py-ldap/Makefile +++ b/databases/py-ldap/Makefile @@ -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 @@ SUBST_SED.setup= -e "s|@EXTRALIBS@|${BUILDLINK_PREFIX.cyrus-sasl}/lib ${BUILDLI -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 --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 51a34c9d8d3..a79dca43172 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -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 @@ PERL5_PACKLIST= \ 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 --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index bbb3553e004..c4d3815c4a8 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -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 @@ PERL5_PACKLIST= \ 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 --git a/mail/exim/options.mk b/mail/exim/options.mk index 28a683bdb1f..65c2c31e140 100644 --- a/mail/exim/options.mk +++ b/mail/exim/options.mk @@ -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 @@ EXIM_INCLUDE= -I/usr/${BUILDLINK_INCDIRS.db-native} .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 --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index 2ab0c80b5a9..10f0787310e 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -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 @@ SUBST_MESSAGE.conf= Fixing libetpan-config. .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 --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk index 1f83640c946..45ed3ac16b6 100644 --- a/mail/libetpan/buildlink3.mk +++ b/mail/libetpan/buildlink3.mk @@ -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 @@ BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan .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 --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index a5e35a1aab7..e24b05e77fb 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -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 @@ CONFIGURE_ARGS+= --disable-ipv6 # 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 --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index a85f5c5ee4b..9b5fd24bc6b 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -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 @@ CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} ### 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 --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index 02a2d8c6b27..0d418dc5d81 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -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 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### 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 --git a/mail/postfix/options.mk b/mail/postfix/options.mk index bed54e58799..7cf13272c03 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -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 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### 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 --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk index b4cd416f8e3..c1b4852e676 100644 --- a/mail/sendmail/options.mk +++ b/mail/sendmail/options.mk @@ -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 @@ PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap ### 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 --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk index 3cb6ea45035..bf3a90aee08 100644 --- a/mail/sendmail812/options.mk +++ b/mail/sendmail812/options.mk @@ -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 @@ PKG_SUGGEST_OPTIONS+= db2 ### 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 --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index a1149b509ab..b12df2fbdfa 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -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 @@ USE_TOOLS+= gawk:pkgsrc 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 --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk index d5b5c1ed670..6449c7584c7 100644 --- a/misc/kdepim3/buildlink3.mk +++ b/misc/kdepim3/buildlink3.mk @@ -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 @@ MAKEVARS+= PKG_BUILD_OPTIONS.kdepim .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 --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 19cfa8b9152..d7404d32ec4 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -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 # ### # .if !empty(PKG_OPTIONS:Msasl) -# . include "../../security/cyrus-sasl2/buildlink3.mk" +# . include "../../security/cyrus-sasl/buildlink3.mk" # CONFIGURE_ARGS+= --enable-sasl=${BUILDLINK_PREFIX.sasl} # .endif # diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 75977eecdb0..6eba640a2c8 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.116 2006/04/12 21:01:15 joerg Exp $ +# $NetBSD: mk.conf,v 1.117 2006/04/13 21:45:14 wiz Exp $ # # This file provides default values for variables that may be overridden @@ -680,13 +680,13 @@ CUPS_USER?= lp # Default: not defined CYRUS_GROUP?= mail -# Used in cyrus-imapd, cyrus-imapd21, cyrus-sasl, and cyrus-sasl2 to +# Used in cyrus-imapd, cyrus-imapd21, and cyrus-sasl to # specify the group used for installing setuid programs. # Possible: any group name # Default: mail CYRUS_USER?= cyrus -# Used in cyrus-imapd, cyrus-imapd21, cyrus-sasl, and cyrus-sasl2 to +# Used in cyrus-imapd, cyrus-imapd21, and cyrus-sasl to # specify the userid used for installing setuid programs. # Possible: any user name # Default: cyrus diff --git a/security/cy2-anonymous/Makefile b/security/cy2-anonymous/Makefile index 26cebef3a30..3047d28d8bf 100644 --- a/security/cy2-anonymous/Makefile +++ b/security/cy2-anonymous/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-anonymous/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-anonymous diff --git a/security/cy2-crammd5/Makefile b/security/cy2-crammd5/Makefile index 5c7a169b81f..e10f67a0109 100644 --- a/security/cy2-crammd5/Makefile +++ b/security/cy2-crammd5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-crammd5/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-cram diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile index de82e3e3411..3ab71174355 100644 --- a/security/cy2-digestmd5/Makefile +++ b/security/cy2-digestmd5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-digest CONFIGURE_ARGS+= --with-rc4 diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile index 09824fe7464..efc2d0c045d 100644 --- a/security/cy2-gssapi/Makefile +++ b/security/cy2-gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} diff --git a/security/cy2-login/Makefile b/security/cy2-login/Makefile index 94206e84b47..a0cd47a11d7 100644 --- a/security/cy2-login/Makefile +++ b/security/cy2-login/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/} PKGREVISION= 1 COMMENT= Cyrus SASL LOGIN authentication plugin SASL_PLUGIN= yes -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" # We need to configure the PLAIN plugin as well since some of the important # build variables for the LOGIN plugin are only set if PLAIN is configured. diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile index c33918095d1..aef174ceafa 100644 --- a/security/cy2-ntlm/Makefile +++ b/security/cy2-ntlm/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.15 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} PKGREVISION= 1 COMMENT= Cyrus SASL NTLM authentication plugin SASL_PLUGIN= yes -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-ntlm CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile index 273af0f15fe..f83a958479c 100644 --- a/security/cy2-otp/Makefile +++ b/security/cy2-otp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-otp CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} diff --git a/security/cy2-plain/Makefile b/security/cy2-plain/Makefile index 0a16eb396f2..d9a8c68c384 100644 --- a/security/cy2-plain/Makefile +++ b/security/cy2-plain/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-plain/} PKGREVISION= 1 @@ -7,7 +7,7 @@ SASL_PLUGIN= yes CONFLICTS= cyrus-sasl<=2.1.19nb1 -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" CONFIGURE_ARGS+= --enable-plain diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index 4e1a496709c..3caccac1b1d 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:42 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2006/04/13 21:45:14 wiz Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} PKGREVISION= 2 COMMENT= Cyrus SASL SQL authentication plugin SASL_PLUGIN= yes -.include "../../security/cyrus-sasl2/Makefile.common" +.include "../../security/cyrus-sasl/Makefile.common" PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite diff --git a/security/p5-Authen-SASL-Cyrus/Makefile b/security/p5-Authen-SASL-Cyrus/Makefile index d78a9b07818..e6d913148db 100644 --- a/security/p5-Authen-SASL-Cyrus/Makefile +++ b/security/p5-Authen-SASL-Cyrus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:10:45 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/04/13 21:45:13 wiz Exp $ # DISTNAME= Authen-SASL-Cyrus-0.07 @@ -16,6 +16,6 @@ DEPENDS+= p5-Authen-SASL-[0-9]*:../../security/p5-Authen-SASL PERL5_PACKLIST= auto/Authen/SASL/Cyrus/.packlist .include "../../lang/perl5/module.mk" -.include "../../security/cyrus-sasl2/buildlink3.mk" +.include "../../security/cyrus-sasl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 468aee05f43..a351d8143d5 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2006/04/06 06:23:01 reed Exp $ +# $NetBSD: Makefile,v 1.111 2006/04/13 21:45:13 wiz Exp $ DISTNAME= kdebase-${_KDE_VERSION} PKGREVISION= 1 @@ -204,7 +204,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .if !empty(PKG_OPTIONS:Msasl) -.include "../../security/cyrus-sasl2/buildlink3.mk" +.include "../../security/cyrus-sasl/buildlink3.mk" .endif .include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index 025f9452ff9..9f2dd8ee3d7 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2006/04/12 10:27:41 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2006/04/13 21:45:13 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -34,7 +34,7 @@ BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0 . include "../../net/samba/buildlink3.mk" .endif .if !empty(PKG_BUILD_OPTIONS.kdebase:Msasl) -. include "../../security/cyrus-sasl2/buildlink3.mk" +. include "../../security/cyrus-sasl/buildlink3.mk" .endif .include "../../x11/Xrandr/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" |