diff options
52 files changed, 141 insertions, 134 deletions
diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 73099786029..7166c08d987 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -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 @@ CONFIGURE_ARGS+= --enable-pgsql .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 --git a/databases/gq/Makefile b/databases/gq/Makefile index a031efbb4e1..0dcdb5f2488 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -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+= --with-ssl-prefix=${BUILDLINK_PREFIX.openssl} 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 --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile index 7836d92d1d9..a0369bd8b9a 100644 --- a/databases/nss_ldap/Makefile +++ b/databases/nss_ldap/Makefile @@ -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 @@ pre-build: ${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 --git a/databases/php-ldap/Makefile b/databases/php-ldap/Makefile index eec0f536db9..d9a8cdaf778 100644 --- a/databases/php-ldap/Makefile +++ b/databases/php-ldap/Makefile @@ -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 --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile index 3960988755f..13b9d4c7fc7 100644 --- a/databases/py-ldap/Makefile +++ b/databases/py-ldap/Makefile @@ -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 @@ COMMENT= LDAP client API for Python 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 @@ post-install: 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 --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index 033bde9b156..18540cde1b9 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -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 @@ MAKEVARS+= PKG_BUILD_OPTIONS.apr .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 --git a/devel/apr/options.mk b/devel/apr/options.mk index dd19c9a7d04..092296110fe 100644 --- a/devel/apr/options.mk +++ b/devel/apr/options.mk @@ -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 @@ APU_CONFIGURE_ARGS+= --with-dbm=sdbm .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 --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index 3fc7c0fe7ad..2de7e06df74 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS= esound ldap xface canna .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 --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 9f7269496bd..4eb5482f54f 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS= ldap xface canna .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 --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 98b5a8fc474..d577db2f366 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -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 @@ post-install: .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 --git a/emulators/wine/options.mk b/emulators/wine/options.mk index f94abe8d28b..e36de681ea5 100644 --- a/emulators/wine/options.mk +++ b/emulators/wine/options.mk @@ -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 @@ PLIST_SUBST+= WINE_OPENGL="@comment " .if !empty(PKG_OPTIONS:Msane) .include "../../graphics/sane-backends/buildlink3.mk" .endif + +.if !empty(PKG_OPTIONS:Mopengl) +.else +CONFIGURE_ARGS+= --without-opengl +.endif 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) diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk index 54acd760549..e1d84d3cf3b 100644 --- a/net/freeradius/options.mk +++ b/net/freeradius/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2006/02/05 15:34:08 adrianp Exp $ +# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:24 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --without-rlm_dbm ### Use OpenLDAP for storing user details ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-rlm_ldap PLIST_SRC+= ${PKGDIR}/PLIST.ldap .else diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile index 236de5e80b9..fa3ac88cd30 100644 --- a/net/hobbitmon/Makefile +++ b/net/hobbitmon/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2006/04/23 00:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/31 18:22:24 ghen Exp $ # DISTNAME= hobbit-4.0-beta6 PKGNAME= hobbit-4.0b6 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hobbitmon/} @@ -74,7 +74,7 @@ do-install: fi .include "../../databases/rrdtool/buildlink3.mk" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk index 518cf3d4879..22edae57e9c 100644 --- a/net/ja-samba/options.mk +++ b/net/ja-samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2005/12/05 23:55:14 rillig Exp $ +# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $ # Global and legacy options @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-cups ### Support LDAP password and account databases. ### .if !empty(PKG_OPTIONS:Mldap-compat) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldapsam PLIST_SUBST+= SAMBA_LDAP="" .else diff --git a/net/nagios-plugin-ldap/Makefile b/net/nagios-plugin-ldap/Makefile index e0d768415b2..bf13d0abad9 100644 --- a/net/nagios-plugin-ldap/Makefile +++ b/net/nagios-plugin-ldap/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:20 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2006/05/31 18:22:25 ghen Exp $ # PKGNAME= nagios-plugin-ldap-${PLUGINSVERSION} +PKGREVISION= 1 CATEGORIES= net sysutils databases MAINTAINER= pkgsrc-users@NetBSD.org @@ -14,7 +15,7 @@ DEPENDS+= nagios-plugins-${PLUGINSVERSION}:../../net/nagios-plugins BINARY_TARGET= check_ldap .include "../../net/nagios-plugins/Makefile.plugin" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd/options.mk b/net/proftpd/options.mk index 5d15e36118e..9b0b86c4483 100644 --- a/net/proftpd/options.mk +++ b/net/proftpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2006/02/13 09:16:05 martti Exp $ +# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:24 ghen Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.proftpd @@ -37,7 +37,7 @@ MODULES:= ${MODULES}:mod_quotatab_ldap .if !empty(PKG_OPTIONS:Mldap) MODULES:= ${MODULES}:mod_ldap -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mmysql) diff --git a/net/pure-ftpd/options.mk b/net/pure-ftpd/options.mk index d6b7e7a32c6..da41770d675 100644 --- a/net/pure-ftpd/options.mk +++ b/net/pure-ftpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2006/02/24 14:35:30 ghen Exp $ +# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:25 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pureftpd PKG_SUPPORTED_OPTIONS= ldap mysql pgsql ssl virtualchroot utf8 @@ -11,7 +11,7 @@ PKG_OPTIONS_LEGACY_VARS+= PURE_FTPD_USE_VIRTUAL_CHROOT:virtualchroot .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif diff --git a/net/samba/options.mk b/net/samba/options.mk index 954d3d25cd3..0ec883d6132 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2006/04/20 11:44:07 grant Exp $ +# $NetBSD: options.mk,v 1.16 2006/05/31 18:22:25 ghen Exp $ # Recommended package options for various setups: # @@ -68,7 +68,7 @@ CONFIGURE_ARGS+= --with-ldapsam ### Support LDAP authentication and storage of Samba account information. ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .else CONFIGURE_ARGS+= --without-ldap diff --git a/news/nntpcache/options.mk b/news/nntpcache/options.mk index 0b06b7d0d58..0b4ebca1224 100644 --- a/news/nntpcache/options.mk +++ b/news/nntpcache/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2006/01/01 18:53:03 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2006/05/31 18:22:25 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nntpcache PKG_SUPPORTED_OPTIONS= nntpcache-pgp @@ -16,5 +16,5 @@ DEPENDS+= pgp-2.*:../../security/pgp2 .if !empty(PKG_OPTIONS:Mopenldap) CONFIGURE_ARGS+= --with-authinfo-ldap -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .endif diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk index f162ec662f3..a7743bc0e25 100644 --- a/security/courier-authlib/options.mk +++ b/security/courier-authlib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2006/04/13 18:27:24 jlam Exp $ +# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.courier-authlib PKG_SUPPORTED_OPTIONS= pam bdb ldap mysql pgsql @@ -62,7 +62,7 @@ PLIST_SUBST+= BDB="@comment " ### LDAP authentication ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-authldap AUTHLIB_PLIST+= ${AUTHLIBDIR}/libauthldap.la AUTHLIB_PLIST+= ${AUTHEXAMPLEDIR}/authldaprc.dist diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk index 78caccd0be6..e03d0db01ba 100644 --- a/security/cyrus-saslauthd/options.mk +++ b/security/cyrus-saslauthd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2006/04/19 17:50:52 tv Exp $ +# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd PKG_SUPPORTED_OPTIONS= pam kerberos ldap gssapi @@ -19,10 +19,10 @@ CONFIGURE_ARGS+= --without-pam ### Authentication against information stored in an LDAP directory ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" . include "../../security/cyrus-sasl/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} PLIST_SUBST+= LDAP= .else CONFIGURE_ARGS+= --without-ldap diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index 44084ea6bf4..d4baa83d918 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/05/25 22:49:23 seb Exp $ +# $NetBSD: Makefile,v 1.23 2006/05/31 18:22:25 ghen Exp $ # DISTNAME= dirmngr-0.9.3 @@ -29,7 +29,7 @@ INFO_FILES= # PLIST CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} -CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-pth-prefix=${WRKDIR}/pth SUBST_FILES+= VARBASE=${VARBASE} @@ -62,7 +62,7 @@ post-install: ${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${PREFIX}/sbin .include "../../converters/libiconv/buildlink3.mk" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" .include "../../security/libassuan/buildlink3.mk" diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile index add8c84b36a..c908b3aead0 100644 --- a/security/gnupg-devel/Makefile +++ b/security/gnupg-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/04/06 06:22:38 reed Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/31 18:22:25 ghen Exp $ # DISTNAME= gnupg-1.9.20 @@ -56,7 +56,7 @@ pre-configure: BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index 8b16ccca849..29171f1d66b 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2006/04/05 10:04:12 drochner Exp $ +# $NetBSD: options.mk,v 1.8 2006/05/31 18:22:25 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= curl idea ldap @@ -40,7 +40,7 @@ pre-configure: .endif .if !empty(PKG_OPTIONS:Mldap) -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" PLIST_SUBST+= OPENLDAP="" .else CONFIGURE_ARGS+=--disable-ldap diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 3e942a36702..a0566f88283 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2006/05/15 09:17:14 minskim Exp $ +# $NetBSD: Makefile,v 1.59 2006/05/31 18:22:26 ghen Exp $ DISTNAME= heimdal-0.7.2 PKGREVISION= 1 @@ -60,8 +60,8 @@ PKG_SUPPORTED_OPTIONS= kerberos-prefix-cmds ldap .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" -CONFIGURE_ARGS+= --with-openldap=${BUILDLINK_PREFIX.openldap} +. include "../../databases/openldap-client/buildlink3.mk" +CONFIGURE_ARGS+= --with-openldap=${BUILDLINK_PREFIX.openldap-client} PLIST_SUBST+= LDAP="" post-install: heimdal-ldap-schema diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index 8b0b01bbb8e..dc3b60e1f37 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2006/04/06 06:22:40 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2006/05/31 18:22:26 ghen Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -28,7 +28,7 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.heimdal=${PKG_BUILD_OPTIONS.heimdal:Q} MAKEVARS+= PKG_BUILD_OPTIONS.heimdal .if !empty(PKG_BUILD_OPTIONS.heimdal:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" .endif .include "../../security/openssl/buildlink3.mk" .include "../../mk/bdb.buildlink3.mk" diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile index c5653fcb6b2..9990c70da12 100644 --- a/security/pam-ldap/Makefile +++ b/security/pam-ldap/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.25 2006/02/05 23:10:45 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2006/05/31 18:22:26 ghen Exp $ # DISTNAME= pam_ldap-180 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.padl.com/pub/ MASTER_SITES+= http://www.padl.com/download/ @@ -16,7 +16,7 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ldap-lib=openldap -CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} @@ -31,7 +31,7 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/pam_ldap.conf ${PKG_SYSCONFDIR}/pam_ldap.conf -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../mk/pam.buildlink3.mk" post-install: diff --git a/security/sudo/options.mk b/security/sudo/options.mk index 11d24ef1750..95ccc9373b9 100644 --- a/security/sudo/options.mk +++ b/security/sudo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2005/08/22 10:20:33 abs Exp $ +# $NetBSD: options.mk,v 1.11 2006/05/31 18:22:26 ghen Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.sudo @@ -25,9 +25,9 @@ CONFIGURE_ARGS+= --without-kerb5 .endif .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" DL_AUTO_VARS= yes -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf .endif diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile index 45157c69343..d66878ddde5 100644 --- a/sysutils/adtool/Makefile +++ b/sysutils/adtool/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2006/05/31 18:22:26 ghen Exp $ # DISTNAME= adtool-1.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://c128.org/adtool/ @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/adtool CONF_FILES= ${EGDIR}/adtool.cfg.dist ${PKG_SYSCONFDIR}/adtool.cfg -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile index 42c0399218f..120302a592d 100644 --- a/www/ap-auth-ldap/Makefile +++ b/www/ap-auth-ldap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 2006/03/04 21:30:56 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2006/05/31 18:22:26 ghen Exp $ DISTNAME= auth_ldap-1.6.1 PKGNAME= ap-auth-ldap-1.6.1 -PKGREVISION= 2 +PKGREVISION= 3 SVR4_PKGNAME= apldap CATEGORIES= www databases MASTER_SITES= http://www.rudedog.org/auth_ldap/ @@ -27,6 +27,6 @@ post-install: .include "../../www/apache/module.mk" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile index a0036f1ed1a..c72e404ae71 100644 --- a/www/ap2-auth-ldap/Makefile +++ b/www/ap2-auth-ldap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2006/04/22 09:22:16 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2006/05/31 18:22:26 ghen Exp $ DISTNAME= mod_auth_ldap3.05 PKGNAME= ap2-auth-ldap-3.05 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www databases MASTER_SITES= http://www.muquit.com/muquit/software/mod_auth_ldap/ @@ -19,7 +19,7 @@ CPPFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47 CONFIGURE_ARGS+= --with-apxs=${APXS:Q} -CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap} +CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap-client} CONFIGURE_ARGS+= --with-apache-dir=${PREFIX:Q} CONFIGURE_ARGS+= --with-apache-ver=2 @@ -33,7 +33,7 @@ SUBST_MESSAGE.paths= Fixing hardcoded paths. do-install: cd ${WRKSRC} && ${APXS} -i -n ${APACHE_MODULE_NAME} mod_auth_ldap.la -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../www/apache2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/www/horde3/options.mk b/www/horde3/options.mk index 6801655e8f8..785e00df23e 100644 --- a/www/horde3/options.mk +++ b/www/horde3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/08/29 13:36:06 tv Exp $ +# $NetBSD: options.mk,v 1.5 2006/05/31 18:22:26 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.horde PKG_SUPPORTED_OPTIONS= ldap pgsql mysql @@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS= mysql ### Use OpenLDAP for storing user details ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" DEPENDS+= php-ldap>=4.3.3:../../databases/php-ldap .endif diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk index 66f4011b0dc..8661d539eed 100644 --- a/www/lighttpd/options.mk +++ b/www/lighttpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:23 rillig Exp $ +# $NetBSD: options.mk,v 1.4 2006/05/31 18:22:26 ghen Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-ipv6 ### Allow using LDAP for "basic" authentication. ### .if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap/buildlink3.mk" +. include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif diff --git a/www/sope/Makefile b/www/sope/Makefile index de4cfb11718..04dbb1929a2 100644 --- a/www/sope/Makefile +++ b/www/sope/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2006/05/28 00:26:27 rh Exp $ +# $NetBSD: Makefile,v 1.10 2006/05/31 18:22:26 ghen Exp $ # DISTNAME= sope-4.5.4-nevermind-r878 PKGNAME= sope-4.5.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www gnustep MASTER_SITES= ftp://ftp.opengroupware.org/nightly/sources/releases/ \ http://download.opengroupware.org/nightly/sources/releases/ @@ -45,7 +45,7 @@ post-configure: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libFoundation/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index d6f4d66debd..fec0a0d7b3b 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.112 2006/04/17 13:46:06 wiz Exp $ +# $NetBSD: Makefile,v 1.113 2006/05/31 18:22:26 ghen Exp $ DISTNAME= kdebase-${_KDE_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop @@ -28,7 +28,7 @@ REQD_DIRS+= ${PREFIX}/share/kde/fonts REQD_DIRS+= ${PREFIX}/share/kde/fonts/override CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" -CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap}" +CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap-client}" CONFIGURE_ARGS+= --without-composite CONFIGURE_ARGS+= --without-java CONFIGURE_ARGS+= --without-pam @@ -196,7 +196,7 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' .include "../../meta-pkgs/kde3/kde3.mk" -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .if ${OPSYS} != "SunOS" .include "../../devel/libusb/buildlink3.mk" .endif diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index d158f3b2d18..416d66d203e 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2006/04/17 13:46:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2006/05/31 18:22:26 ghen Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -26,7 +26,7 @@ MAKEVARS+= PKG_BUILD_OPTIONS.kdebase BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0 -.include "../../databases/openldap/buildlink3.mk" +.include "../../databases/openldap-client/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" |