pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc The databases/openldap package has been split in -clie...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7d56a492c671
branches: trunk
changeset: 513604:7d56a492c671
user: ghen <ghen%pkgsrc.org@localhost>
date: Wed May 31 18:22:23 2006 +0000
description:
The databases/openldap package has been split in -client and -server component
packages. Convert LDAP-based applications to depend on openldap-client, and
bump PKGREVISION for those that depend on it by default.
diffstat:
chat/jabberd2/options.mk | 4 ++--
databases/gq/Makefile | 6 +++---
databases/nss_ldap/Makefile | 6 +++---
databases/php-ldap/Makefile | 8 ++++----
databases/py-ldap/Makefile | 9 +++++----
devel/apr/buildlink3.mk | 4 ++--
devel/apr/options.mk | 4 ++--
editors/xemacs-current/options.mk | 4 ++--
editors/xemacs/options.mk | 4 ++--
emulators/wine/Makefile | 5 +++--
emulators/wine/options.mk | 8 ++++++--
mail/balsa2/options.mk | 4 ++--
mail/courier-mta/options.mk | 4 ++--
mail/dovecot/options.mk | 4 ++--
mail/evolution-data-server/Makefile | 6 +++---
mail/evolution-exchange/Makefile | 6 +++---
mail/evolution/Makefile | 6 +++---
mail/exim/options.mk | 6 +++---
mail/pine/Makefile | 4 ++--
mail/postfix-current/options.mk | 8 ++++----
mail/postfix/options.mk | 8 ++++----
mail/sendmail/options.mk | 4 ++--
mail/sendmail812/options.mk | 4 ++--
mail/sylpheed-claws/Makefile | 4 ++--
mail/sylpheed-devel/options.mk | 4 ++--
mail/sylpheed/options.mk | 4 ++--
mail/teapop/options.mk | 8 ++++----
net/freeradius/options.mk | 4 ++--
net/hobbitmon/Makefile | 6 +++---
net/ja-samba/options.mk | 4 ++--
net/nagios-plugin-ldap/Makefile | 5 +++--
net/proftpd/options.mk | 4 ++--
net/pure-ftpd/options.mk | 4 ++--
net/samba/options.mk | 4 ++--
news/nntpcache/options.mk | 4 ++--
security/courier-authlib/options.mk | 4 ++--
security/cyrus-saslauthd/options.mk | 6 +++---
security/dirmngr/Makefile | 6 +++---
security/gnupg-devel/Makefile | 4 ++--
security/gnupg/options.mk | 4 ++--
security/heimdal/Makefile | 6 +++---
security/heimdal/buildlink3.mk | 4 ++--
security/pam-ldap/Makefile | 8 ++++----
security/sudo/options.mk | 6 +++---
sysutils/adtool/Makefile | 6 +++---
www/ap-auth-ldap/Makefile | 6 +++---
www/ap2-auth-ldap/Makefile | 8 ++++----
www/horde3/options.mk | 4 ++--
www/lighttpd/options.mk | 4 ++--
www/sope/Makefile | 6 +++---
x11/kdebase3/Makefile | 8 ++++----
x11/kdebase3/buildlink3.mk | 4 ++--
52 files changed, 141 insertions(+), 134 deletions(-)
diffs (truncated from 1082 to 300 lines):
diff -r 15cfa1150573 -r 7d56a492c671 chat/jabberd2/options.mk
--- a/chat/jabberd2/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/chat/jabberd2/options.mk Wed May 31 18:22:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/06/02 20:39:16 dillo Exp $
+# $NetBSD: options.mk,v 1.11 2006/05/31 18:22:23 ghen Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2
@@ -29,7 +29,7 @@
.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:Mpam)
diff -r 15cfa1150573 -r 7d56a492c671 databases/gq/Makefile
--- a/databases/gq/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/databases/gq/Makefile Wed May 31 18:22:23 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/04/17 13:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/05/31 18:22:23 ghen Exp $
#
DISTNAME= gq-1.0beta1
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= databases net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqclient/}
@@ -20,7 +20,7 @@
CONFIGURE_ARGS+= --enable-cache
.include "../../security/openssl/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 15cfa1150573 -r 7d56a492c671 databases/nss_ldap/Makefile
--- a/databases/nss_ldap/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/databases/nss_ldap/Makefile Wed May 31 18:22:23 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/03/15 19:23:47 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/31 18:22:23 ghen Exp $
#
DISTNAME= nss_ldap-240
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= databases
MASTER_SITES= http://www.padl.com/download/
@@ -29,5 +29,5 @@
${CP} ${FILESDIR}/netbsd.c ${FILESDIR}/netbsd.h ${WRKSRC}
${LN} -fs /usr/include/nsswitch.h ${BUILDLINK_DIR}/include/nss.h
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 15cfa1150573 -r 7d56a492c671 databases/php-ldap/Makefile
--- a/databases/php-ldap/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/databases/php-ldap/Makefile Wed May 31 18:22:23 2006 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/05/31 18:22:23 ghen Exp $
MODNAME= ldap
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES+= databases
COMMENT= PHP extension for LDAP database access
USE_PHP_EXT_PATCHES= yes
-CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap}
+CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openldap-client}
.include "../../lang/php/ext.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 15cfa1150573 -r 7d56a492c671 databases/py-ldap/Makefile
--- a/databases/py-ldap/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/databases/py-ldap/Makefile Wed May 31 18:22:23 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/05/15 06:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/05/31 18:22:23 ghen Exp $
DISTNAME= python-ldap-2.2.0
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
+PKGREVISION= 1
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
@@ -12,8 +13,8 @@
PYTHON_VERSIONS_ACCEPTED= 23 24
PYDISTUTILSPKG= yes
-PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap}/lib
-PY_LDAP_INCLUDE_DIRS= ${BUILDLINK_PREFIX.openldap}/include
+PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap-client}/lib
+PY_LDAP_INCLUDE_DIRS= ${BUILDLINK_PREFIX.openldap-client}/include
PY_LDAP_LIBS= ldap_r lber ssl crypto
.include "options.mk"
@@ -32,7 +33,7 @@
cd ${WRKSRC} && ${PAX} -rw CHANGES README INSTALL TODO Demo \
${PY_LDAP_DOCDIR}
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff -r 15cfa1150573 -r 7d56a492c671 devel/apr/buildlink3.mk
--- a/devel/apr/buildlink3.mk Wed May 31 18:21:24 2006 +0000
+++ b/devel/apr/buildlink3.mk Wed May 31 18:22:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/04/12 10:27:06 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/05/31 18:22:23 ghen Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -36,7 +36,7 @@
.endif
.if !empty(PKG_BUILD_OPTIONS.apr:Mldap)
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
.include "../../textproc/expat/buildlink3.mk"
diff -r 15cfa1150573 -r 7d56a492c671 devel/apr/options.mk
--- a/devel/apr/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/devel/apr/options.mk Wed May 31 18:22:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/12/22 21:46:25 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apr
PKG_SUPPORTED_OPTIONS= db4 ldap
@@ -16,5 +16,5 @@
.if !empty(PKG_OPTIONS:Mldap)
APU_CONFIGURE_ARGS+= --with-ldap
APR_CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
diff -r 15cfa1150573 -r 7d56a492c671 editors/xemacs-current/options.mk
--- a/editors/xemacs-current/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/editors/xemacs-current/options.mk Wed May 31 18:22:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/12/05 20:50:10 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:23 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
PKG_SUPPORTED_OPTIONS= esound ldap xface canna
@@ -7,7 +7,7 @@
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-ldap
.endif
diff -r 15cfa1150573 -r 7d56a492c671 editors/xemacs/options.mk
--- a/editors/xemacs/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/editors/xemacs/options.mk Wed May 31 18:22:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2005/10/23 14:16:46 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:23 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
PKG_SUPPORTED_OPTIONS= ldap xface canna
@@ -7,7 +7,7 @@
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-ldap
.endif
diff -r 15cfa1150573 -r 7d56a492c671 emulators/wine/Makefile
--- a/emulators/wine/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/emulators/wine/Makefile Wed May 31 18:22:23 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2006/05/26 09:40:33 adam Exp $
+# $NetBSD: Makefile,v 1.107 2006/05/31 18:22:23 ghen Exp $
DISTNAME= wine-0.9.14
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wine/} \
http://ibiblio.org/pub/linux/system/emulators/wine/
@@ -45,7 +46,7 @@
.endfor
.include "../../audio/esound/buildlink3.mk"
-.include "../../databases/openldap/buildlink3.mk"
+.include "../../databases/openldap-client/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff -r 15cfa1150573 -r 7d56a492c671 emulators/wine/options.mk
--- a/emulators/wine/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/emulators/wine/options.mk Wed May 31 18:22:23 2006 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2006/03/31 10:48:00 adam Exp $
+# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:23 ghen Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.wine
PKG_SUPPORTED_OPTIONS= arts cups opengl sane
-PKG_SUGGESTED_OPTIONS= opengl
.include "../../mk/bsd.options.mk"
@@ -26,3 +25,8 @@
.if !empty(PKG_OPTIONS:Msane)
.include "../../graphics/sane-backends/buildlink3.mk"
.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+.else
+CONFIGURE_ARGS+= --without-opengl
+.endif
diff -r 15cfa1150573 -r 7d56a492c671 mail/balsa2/options.mk
--- a/mail/balsa2/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/mail/balsa2/options.mk Wed May 31 18:22:23 2006 +0000
@@ -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 @@
.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 -r 15cfa1150573 -r 7d56a492c671 mail/courier-mta/options.mk
--- a/mail/courier-mta/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/mail/courier-mta/options.mk Wed May 31 18:22:23 2006 +0000
@@ -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 @@
### 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 -r 15cfa1150573 -r 7d56a492c671 mail/dovecot/options.mk
--- a/mail/dovecot/options.mk Wed May 31 18:21:24 2006 +0000
+++ b/mail/dovecot/options.mk Wed May 31 18:22:23 2006 +0000
@@ -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 @@
###
.if !empty(PKG_OPTIONS:Mldap)
CONFIGURE_ARGS+= --with-ldap
-. include "../../databases/openldap/buildlink3.mk"
+. include "../../databases/openldap-client/buildlink3.mk"
.endif
###
diff -r 15cfa1150573 -r 7d56a492c671 mail/evolution-data-server/Makefile
--- a/mail/evolution-data-server/Makefile Wed May 31 18:21:24 2006 +0000
+++ b/mail/evolution-data-server/Makefile Wed May 31 18:22:23 2006 +0000
@@ -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 @@
BUILDLINK_TRANSFORM+= rm:-ldl
Home |
Main Index |
Thread Index |
Old Index