summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/balsa2/options.mk4
-rw-r--r--mail/courier-mta/options.mk4
-rw-r--r--mail/dovecot/options.mk4
-rw-r--r--mail/evolution-data-server/Makefile6
-rw-r--r--mail/evolution-exchange/Makefile6
-rw-r--r--mail/evolution/Makefile6
-rw-r--r--mail/exim/options.mk6
-rw-r--r--mail/pine/Makefile4
-rw-r--r--mail/postfix-current/options.mk8
-rw-r--r--mail/postfix/options.mk8
-rw-r--r--mail/sendmail/options.mk4
-rw-r--r--mail/sendmail812/options.mk4
-rw-r--r--mail/sylpheed-claws/Makefile4
-rw-r--r--mail/sylpheed-devel/options.mk4
-rw-r--r--mail/sylpheed/options.mk4
-rw-r--r--mail/teapop/options.mk8
16 files changed, 42 insertions, 42 deletions
diff --git a/mail/balsa2/options.mk b/mail/balsa2/options.mk
index b47ccdf9dae..bc6da08ea23 100644
--- a/mail/balsa2/options.mk
+++ b/mail/balsa2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/10/03 21:36:59 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.balsa2
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS= ldap ssl
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mssl)
diff --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk
index 4a5855b229f..33c2c3bc99a 100644
--- a/mail/courier-mta/options.mk
+++ b/mail/courier-mta/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/31 18:22:24 ghen Exp $
# Global and legacy options
@@ -116,7 +116,7 @@ PKG_FAIL_REASON+= "[courier/options.mk] No mail transports specified."
### LDAP alias lookup support
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+= --with-ldapaliasd
PLIST_SRC+= ${PKGDIR}/PLIST.ldap
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index bc2bc8f624b..2e604061a6f 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2006/02/12 19:13:49 markd Exp $
+# $NetBSD: options.mk,v 1.16 2006/05/31 18:22:23 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
PKG_SUPPORTED_OPTIONS= gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-ipv6
###
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
###
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 2051dc7184f..e5b088fc4fe 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2006/05/12 17:00:58 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/05/31 18:22:24 ghen Exp $
#
DISTNAME= evolution-data-server-1.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-data-server/1.6/}
EXTRACT_SUFX= .tar.bz2
@@ -58,7 +58,7 @@ PKGCONFIG_OVERRIDE+= evolution-data-server.pc.in
BUILDLINK_TRANSFORM+= rm:-ldl
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 5ea6a8b371d..7ec3d618a03 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/05/31 18:22:24 ghen Exp $
#
DISTNAME= evolution-exchange-2.6.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution-exchange/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/evolution-exchange
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 04599ffa7cc..bdcd9d7ee9d 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.108 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2006/05/31 18:22:23 ghen Exp $
DISTNAME= evolution-2.6.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail time gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/evolution/2.6/}
EXTRACT_SUFX= .tar.bz2
@@ -113,7 +113,7 @@ BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
LDFLAGS+= -lsemaphore
.include "../../devel/pthread-sem/buildlink3.mk"
.endif
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/mail/exim/options.mk b/mail/exim/options.mk
index 65c2c31e140..59064fa43a2 100644
--- a/mail/exim/options.mk
+++ b/mail/exim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2006/04/13 21:45:13 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2006/05/31 18:22:24 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.exim
PKG_SUPPORTED_OPTIONS= exim-build-eximon exim-content-scan exim-lookup-dnsdb
@@ -33,8 +33,8 @@ LOCAL_MAKEFILE_OPTIONS+=LOOKUP_DSEARCH=YES
.if !empty(PKG_OPTIONS:Mexim-lookup-ldap)
LOCAL_MAKEFILE_OPTIONS+=LOOKUP_LDAP=YES
LOCAL_MAKEFILE_OPTIONS+=LDAP_LIB_TYPE=OPENLDAP2
-LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap} -lldap -llber
-. include "../../databases/openldap/buildlink3.mk"
+LOOKUP_LIBS+=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap-client} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.openldap-client} -lldap -llber
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mexim-lookup-mysql)
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 68ffac5633e..9716f06e3cf 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2006/04/06 06:22:19 reed Exp $
+# $NetBSD: Makefile,v 1.111 2006/05/31 18:22:24 ghen Exp $
DISTNAME= pine4.64
PKGNAME= pine-4.64
@@ -50,7 +50,7 @@ PKG_SUPPORTED_OPTIONS= ldap
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
PINE_LDAPCFLAGS= LDAPCFLAGS="-DENABLE_LDAP"
PINE_LDAPLIBS= LDAPLIBS="-lldap -llber"
.endif
diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk
index 0d418dc5d81..e66c6d80119 100644
--- a/mail/postfix-current/options.mk
+++ b/mail/postfix-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2006/04/13 21:45:13 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2006/05/31 18:22:24 ghen Exp $
# Global and legacy options
@@ -46,10 +46,10 @@ CCARGS+= -DNO_PCRE
### Support LDAP directories for table lookups.
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
CCARGS+= -DHAS_LDAP
-AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
+AUXLIBS+= -L${BUILDLINK_PREFIX.openldap-client}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib \
-lldap -llber
.endif
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index 7cf13272c03..80546fee5da 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2006/04/13 21:45:13 wiz Exp $
+# $NetBSD: options.mk,v 1.22 2006/05/31 18:22:24 ghen Exp $
# Global and legacy options
@@ -46,10 +46,10 @@ CCARGS+= -DNO_PCRE
### Support LDAP directories for table lookups.
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
CCARGS+= -DHAS_LDAP
-AUXLIBS+= -L${BUILDLINK_PREFIX.openldap}/lib \
- ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib \
+AUXLIBS+= -L${BUILDLINK_PREFIX.openldap-client}/lib \
+ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openldap-client}/lib \
-lldap -llber
.endif
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index c1b4852e676..4513f640dd8 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2006/04/13 21:45:14 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2006/05/31 18:22:24 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap
@@ -22,7 +22,7 @@ PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap
### Use OpenLDAP for remote database access
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
###
diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk
index 7d055c759a7..f2aa404b878 100644
--- a/mail/sendmail812/options.mk
+++ b/mail/sendmail812/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/05/22 07:08:50 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_OPTIONS_OPTIONAL_GROUPS= database
@@ -27,7 +27,7 @@ PKG_SUGGESTED_OPTIONS+= db2
### Use OpenLDAP for remote database access
###
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
###
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index e25dea78a03..def429ec11c 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/05/31 18:22:24 ghen Exp $
.include "Makefile.common"
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --enable-jpilot
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --enable-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Minet6)
diff --git a/mail/sylpheed-devel/options.mk b/mail/sylpheed-devel/options.mk
index 168b36c99bd..c3c14e4f628 100644
--- a/mail/sylpheed-devel/options.mk
+++ b/mail/sylpheed-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/11/19 10:46:11 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/31 18:22:24 ghen Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed-devel
@@ -22,7 +22,7 @@ FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --enable-ldap
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mjpilot)
diff --git a/mail/sylpheed/options.mk b/mail/sylpheed/options.mk
index 89724be1761..6d4abe60909 100644
--- a/mail/sylpheed/options.mk
+++ b/mail/sylpheed/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/03/29 22:54:42 chris Exp $
+# $NetBSD: options.mk,v 1.3 2006/05/31 18:22:24 ghen Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed
@@ -22,7 +22,7 @@ FACES_IS_INSTALLED!= ${PKG_INFO} -e faces || ${ECHO}
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --enable-ldap
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mjpilot)
diff --git a/mail/teapop/options.mk b/mail/teapop/options.mk
index 6f6bc1a4813..a9356ca08b6 100644
--- a/mail/teapop/options.mk
+++ b/mail/teapop/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.4 2006/05/31 18:22:24 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.teapop
PKG_SUPPORTED_OPTIONS= drac mysql apop vpop tcpd pgsql ldap inet6
@@ -44,10 +44,10 @@ LDFLAGS+= ${BUILDLINK_LDFLAGS.postgresql-lib}
.endif
.if !empty(PKG_OPTIONS:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
CONFIGURE_ARGS+= --with-ldap=openldap
-CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap}
-LDFLAGS+= ${BUILDLINK_LDFLAGS.openldap}
+CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client}
+LDFLAGS+= ${BUILDLINK_LDFLAGS.openldap-client}
.endif
.if !empty(PKG_OPTIONS:Minet6)