pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/openldap Split the databases/openldap packag...
details: https://anonhg.NetBSD.org/pkgsrc/rev/701eac628f7e
branches: trunk
changeset: 513599:701eac628f7e
user: ghen <ghen%pkgsrc.org@localhost>
date: Wed May 31 18:17:49 2006 +0000
description:
Split the databases/openldap package in -client and -server component packages
(and add a -doc component), which I'll import in a minute. This package is now
nothing but a meta-package, depending on those three. Take over MAINTAINERship
(ok with joerg). Add an inet6 option to -client and -server (PR pkg/33524).
Bump PKGREVISION.
diffstat:
databases/openldap/DESCR | 10 +-
databases/openldap/Makefile | 148 ++-------------------
databases/openldap/Makefile.common | 104 +++++++++++++++
databases/openldap/PLIST | 250 +------------------------------------
databases/openldap/buildlink3.mk | 37 -----
databases/openldap/files/slapd.sh | 3 +-
databases/openldap/files/slurpd.sh | 3 +-
databases/openldap/options.mk | 76 -----------
8 files changed, 136 insertions(+), 495 deletions(-)
diffs (truncated from 694 to 300 lines):
diff -r 95f8128606b6 -r 701eac628f7e databases/openldap/DESCR
--- a/databases/openldap/DESCR Wed May 31 18:17:23 2006 +0000
+++ b/databases/openldap/DESCR Wed May 31 18:17:49 2006 +0000
@@ -1,2 +1,8 @@
-A open source implementation of the lighthweight directory access protocol
-(LDAP) server and client. OpenLDAP is derived from the U. Mich release 3.3
+OpenLDAP is an open source implementation of the Lightweight Directory Access
+Protocol. This package includes:
+
+* slapd - stand-alone LDAP daemon (server)
+* slurpd - stand-alone LDAP update replication daemon
+* libraries implementing the LDAP protocol
+* utilities, tools, and sample clients
+* administration guide
diff -r 95f8128606b6 -r 701eac628f7e databases/openldap/Makefile
--- a/databases/openldap/Makefile Wed May 31 18:17:23 2006 +0000
+++ b/databases/openldap/Makefile Wed May 31 18:17:49 2006 +0000
@@ -1,136 +1,26 @@
-# $NetBSD: Makefile,v 1.114 2006/05/22 11:57:50 dsainty Exp $
-
-DISTNAME= openldap-2.3.23
-SVR4_PKGNAME= oldap
-CATEGORIES= databases
-MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
- http://www.openldap.org/software/download/OpenLDAP/openldap-release/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= joerg%NetBSD.org@localhost
-HOMEPAGE= http://www.OpenLDAP.org/
-COMMENT= Lightweight Directory Access Protocol server and client
-
-CONFLICTS+= ldapsdk-[0-9]*
-
-PKG_INSTALLATION_TYPES= overwrite pkgviews
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-TEST_TARGET= test
-
-MAKE_ENV+= LIBMODE=${LIBMODE:Q}
-OPENLDAP_ETCDIR= ${PKG_SYSCONFDIR}/openldap
-OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap
-OPENLDAP_VARDIR= ${VARBASE}/openldap
-FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
+# $NetBSD: Makefile,v 1.115 2006/05/31 18:17:49 ghen Exp $
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-# the internal avl_* prototypes conflict with those in <sys/avl.h> which
-# is included by another system header file on Solaris, so subst them.
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+= conflict
-SUBST_STAGE.conflict= post-patch
-SUBST_FILES.conflict= ${WRKSRC}/*/*.h
-SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
-SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g'
-SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g'
-SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g'
-SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g'
-SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g'
-SUBST_MESSAGE.conflict= Fixing conflicting function prototypes.
-.endif
-
-CPPFLAGS.Darwin+= -DBIND_8_COMPAT
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR:Q}
-CONFIGURE_ARGS+= --enable-dynamic # link servers against shared libs
-CONFIGURE_ARGS+= --with-tls=openssl
-
-# SLAPD options
-CONFIGURE_ARGS+= --enable-crypt
-.if !empty(PKG_OPTIONS:Msasl)
-CONFIGURE_ARGS+= --enable-spasswd
-.endif
-CONFIGURE_ARGS+= --enable-wrappers
+DISTNAME= openldap-${OPENLDAP_VERSION}
+OPENLDAP_VERSION= 2.3.23
+PKGREVISION= 1
+CATEGORIES= databases
+MASTER_SITES= # empty
+DISTFILES= # empty
-# SLAPD backends
-CONFIGURE_ARGS+= --enable-dnssrv
-CONFIGURE_ARGS+= --enable-ldap
-CONFIGURE_ARGS+= --enable-ldbm
-CONFIGURE_ARGS+= --enable-meta
-CONFIGURE_ARGS+= --enable-monitor
-CONFIGURE_ARGS+= --enable-null
-CONFIGURE_ARGS+= --enable-passwd
-CONFIGURE_ARGS+= --enable-shell
-
-# SLAPD (stackable) overlays
-CONFIGURE_ARGS+= --enable-overlays
+MAINTAINER= ghen%NetBSD.org@localhost
+HOMEPAGE= http://www.openldap.org/
+COMMENT= Lightweight Directory Access Protocol meta-package
-OPENLDAP_FILEPERMS= ${ROOT_USER} ${ROOT_GROUP} 0600
-OPENLDAP_DIRPERMS= ${ROOT_USER} ${ROOT_GROUP} 0700
-
-EGDIR= ${PREFIX}/share/examples/openldap
-MAKE_DIRS= ${OPENLDAP_ETCDIR} ${OPENLDAP_ETCDIR}/schema
-OWN_DIRS= ${OPENLDAP_VARDIR} ${OPENLDAP_VARDIR}/run
-OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${OPENLDAP_DIRPERMS}
-OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/openldap-slurp ${OPENLDAP_DIRPERMS}
-
-CNFS= ldap.conf ${CNFS_SCHEMAS_cmd:sh}
-CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
-CNFS_PERMS= slapd.conf
+DEPENDS+= openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client
+DEPENDS+= openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server
+DEPENDS+= openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc
-CONF_FILES= # empty
-CONF_FILES_PERMS= # empty
-.for FILE in ${CNFS}
-CONF_FILES+= ${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE}
-.endfor
-.for FILE in ${CNFS_PERMS}
-CONF_FILES_PERMS+= ${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE} \
- ${OPENLDAP_FILEPERMS}
-.endfor
-CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG \
- ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG \
- ${OPENLDAP_FILEPERMS}
-RCD_SCRIPTS= slapd
-
-PTHREAD_OPTS+= require
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
+EXTRACT_ONLY= # yes
+NO_CHECKSUM= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
-.if ${PTHREAD_TYPE} == "native"
-CONFIGURE_ARGS+= --with-threads
-.elif ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+= --with-threads=pth
-#
-# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
-# pth.h header).
-#
-PTH_FDSETSIZE_cmd= \
- if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then \
- ${AWK} '/if FD_SETSIZE >/ { print $$4 }' \
- ${BUILDLINK_PREFIX.pth}/include/pth.h; \
- else \
- ${ECHO} 0; \
- fi
-CPPFLAGS+= -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
-.endif
-RCD_SCRIPTS+= slurpd
-
-MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR:Q}
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-# Set the correct file modes for the example config files.
-post-install:
-.for _file_ in ${CNFS} ${CNFS_PERMS}
- ${CHMOD} ${SHAREMODE} ${EGDIR}/${_file_}
- ${RM} -f ${EGDIR}/${_file_}.default
-.endfor
- ${CHMOD} ${SHAREMODE} ${EGDIR}/DB_CONFIG
+do-patch: # empty
+do-install: # empty
.include "../../mk/bsd.pkg.mk"
diff -r 95f8128606b6 -r 701eac628f7e databases/openldap/Makefile.common
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/Makefile.common Wed May 31 18:17:49 2006 +0000
@@ -0,0 +1,104 @@
+# $NetBSD: Makefile.common,v 1.1 2006/05/31 18:17:49 ghen Exp $
+
+DISTNAME= openldap-2.3.23
+CATEGORIES= databases
+MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+EXTRACT_SUFX= .tgz
+
+MAINTAINER= ghen%NetBSD.org@localhost
+HOMEPAGE= http://www.openldap.org/
+
+CONFLICTS+= ldapsdk-[0-9]*
+
+DISTINFO_FILE= ${.CURDIR}/../../databases/openldap/distinfo
+PATCHDIR= ${.CURDIR}/../../databases/openldap/patches
+FILESDIR= ${.CURDIR}/../../databases/openldap/files
+
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+TEST_TARGET= test
+
+MAKE_ENV+= LIBMODE=${LIBMODE:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+OPENLDAP_ETCDIR?= ${PKG_SYSCONFDIR}/openldap
+OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap
+OPENLDAP_VARDIR?= ${VARBASE}/openldap
+
+SLAPD_USER?= slapd
+SLURPD_USER?= slurpd
+LDAP_GROUP?= ldap
+
+.include "${.CURDIR}/options.mk"
+
+# the internal avl_* prototypes conflict with those in <sys/avl.h> which
+# is included by another system header file on Solaris, so subst them.
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+= conflict
+SUBST_STAGE.conflict= post-patch
+SUBST_FILES.conflict= ${WRKSRC}/*/*.h
+SUBST_FILES.conflict+= ${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_SED.conflict+= -e 's,avl_free,openldap_avl_free,g'
+SUBST_SED.conflict+= -e 's,avl_insert,openldap_avl_insert,g'
+SUBST_SED.conflict+= -e 's,avl_delete,openldap_avl_delete,g'
+SUBST_SED.conflict+= -e 's,avl_find,openldap_avl_find,g'
+SUBST_SED.conflict+= -e 's,avl_find2,openldap_avl_find2,g'
+SUBST_MESSAGE.conflict= Fixing conflicting function prototypes.
+.endif
+
+CPPFLAGS.Darwin+= -DBIND_8_COMPAT
+
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${OPENLDAP_VARDIR:Q}
+CONFIGURE_ARGS+= --enable-dynamic
+CONFIGURE_ARGS+= --with-tls=openssl
+
+EGDIR= ${PREFIX}/share/examples/openldap
+
+CONF_FILES= # empty
+CONF_FILES_PERMS= # empty
+.for FILE in ${CNFS}
+CONF_FILES+= ${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q}
+.endfor
+.for FILE in ${CNFS_PERMS}
+CONF_FILES_PERMS+= ${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q} ${OPENLDAP_FILEPERMS}
+.endfor
+
+DB_CONFIG?= # empty
+
+PTHREAD_OPTS+= require
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+= --with-threads
+.elif ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+= --with-threads=pth
+
+#
+# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
+# pth.h header).
+#
+PTH_FDSETSIZE_cmd= \
+ if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then \
+ ${AWK} '/if FD_SETSIZE >/ { print $$4 }' \
+ ${BUILDLINK_PREFIX.pth}/include/pth.h; \
+ else \
+ ${ECHO} 0; \
+ fi
+CPPFLAGS+= -DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
+.endif
+
+MAKE_FLAGS+= moduledir=${OPENLDAP_MODULEDIR:Q}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
+
+# Set the correct file modes for the example config files.
+post-install:
+.for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG}
+ ${CHMOD} ${SHAREMODE} ${EGDIR}/${file:Q}
+ ${RM} -f ${EGDIR}/${file:Q}.default
+.endfor
diff -r 95f8128606b6 -r 701eac628f7e databases/openldap/PLIST
--- a/databases/openldap/PLIST Wed May 31 18:17:23 2006 +0000
+++ b/databases/openldap/PLIST Wed May 31 18:17:49 2006 +0000
@@ -1,249 +1,1 @@
-@comment $NetBSD: PLIST,v 1.26 2006/05/15 19:01:23 ghen Exp $
-bin/ldapadd
-bin/ldapcompare
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ldapwhoami
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
Home |
Main Index |
Thread Index |
Old Index