diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 727cbd0226d..6782c8cf8d8 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.16 2001/09/27 00:32:36 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.17 2001/09/28 17:56:09 jakob Exp $ -MULTI_PACKAGES= -client -PKGNAME-client= openldap-client-${VERSION} - -COMMENT= Open source LDAP client and server software -COMMENT-client= Open source LDAP client software +COMMENT= "Open source LDAP software (client)" +COMMENT-server= "Open source LDAP software (server)" VERSION= 2.0.15 DISTNAME= openldap-${VERSION} +FULLPKGNAME= openldap-client-${VERSION} +PKGNAME-server= openldap-server-${VERSION} CATEGORIES= databases net NEED_VERSION= 1.451 @@ -49,6 +48,9 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build FLAVORS= sasl FLAVOR?= +MULTI_PACKAGES= -server +SUBPACKAGE?= + .if ${FLAVOR:L} == "sasl" CONFIGURE_ARGS+= --with-cyrus-sasl \ --enable-spasswd @@ -60,6 +62,10 @@ CONFIGURE_ARGS+= --without-cyrus-sasl \ --disable-spasswd .endif +.if ${SUBPACKAGE} == "-server" +RUN_DEPENDS= openldap:openldap-client-${VERSION}:databases/openldap +.endif + pre-build: @cd ${WRKBUILD}; ${MAKE_PROGRAM} depend diff --git a/databases/openldap/pkg/DESCR b/databases/openldap/pkg/DESCR index 7ea5c13f0b2..1127820ae28 100644 --- a/databases/openldap/pkg/DESCR +++ b/databases/openldap/pkg/DESCR @@ -1,9 +1,13 @@ -OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers, -clients, utilities and development tools. LDAP is an Internet standard -directory service protocol that can be used stand-alone, or as a front end -to an X.500 directory. LDAP is defined by RFCs 1777 through 1779. +OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) +servers, clients, utilities and development tools. LDAP is an Internet +standard directory service protocol that can be used stand-alone, or as a +front end to an X.500 directory. LDAP is defined by RFCs 1777 through +1779. -OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is -distributed under a Perl-style "Artistic License". +OpenLDAP is derived from the University of Michigan LDAP release 3.3 and +is distributed under a Perl-style "Artistic License". + +This is the client portion of OpenLDAP, it provides the client binaries, +libraries and headers. WWW: ${HOMEPAGE} diff --git a/databases/openldap/pkg/DESCR-client b/databases/openldap/pkg/DESCR-client deleted file mode 100644 index 7ea5c13f0b2..00000000000 --- a/databases/openldap/pkg/DESCR-client +++ /dev/null @@ -1,9 +0,0 @@ -OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers, -clients, utilities and development tools. LDAP is an Internet standard -directory service protocol that can be used stand-alone, or as a front end -to an X.500 directory. LDAP is defined by RFCs 1777 through 1779. - -OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is -distributed under a Perl-style "Artistic License". - -WWW: ${HOMEPAGE} diff --git a/databases/openldap/pkg/DESCR-server b/databases/openldap/pkg/DESCR-server new file mode 100644 index 00000000000..8e56d79c0cf --- /dev/null +++ b/databases/openldap/pkg/DESCR-server @@ -0,0 +1,13 @@ +OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) +servers, clients, utilities and development tools. LDAP is an Internet +standard directory service protocol that can be used stand-alone, or as a +front end to an X.500 directory. LDAP is defined by RFCs 1777 through +1779. + +OpenLDAP is derived from the University of Michigan LDAP release 3.3 and +is distributed under a Perl-style "Artistic License". + +This is the server portion of OpenLDAP, it provides the server as well as +various administrative binaries. + +WWW: ${HOMEPAGE} diff --git a/databases/openldap/pkg/PFRAG.shared-client b/databases/openldap/pkg/PFRAG.shared-client deleted file mode 100644 index f0479ec163d..00000000000 --- a/databases/openldap/pkg/PFRAG.shared-client +++ /dev/null @@ -1,5 +0,0 @@ -@comment $OpenBSD: PFRAG.shared-client,v 1.8 2001/09/21 07:29:35 jakob Exp $ -lib/liblber.so.2.10 -lib/libldap.so.2.10 -lib/libldap_r.so.2.10 -DYNLIBDIR(%B) diff --git a/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST index d2a9f1e10ee..a1df03b1e9e 100644 --- a/databases/openldap/pkg/PLIST +++ b/databases/openldap/pkg/PLIST @@ -1,5 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2001/09/08 22:27:54 jakob Exp $ -@pkgcfl openldap-client-* +@comment $OpenBSD: PLIST,v 1.7 2001/09/28 17:56:09 jakob Exp $ bin/ldapadd bin/ldapdelete bin/ldapmodify @@ -215,52 +214,9 @@ man/man5/ldaptemplates.conf.5 man/man5/ldif.5 man/man5/ud.conf.5 share/openldap/ldapfriendly +@dirrm share/openldap share/examples/openldap/ldap.conf share/examples/openldap/ldapfilter.conf share/examples/openldap/ldaptemplates.conf share/examples/openldap/ldapsearchprefs.conf -libexec/fax500 -libexec/go500 -libexec/go500gw -libexec/in.xfingerd -libexec/mail500 -libexec/maildap -libexec/rcpt500 -libexec/rp500 -libexec/slapd -libexec/slurpd -libexec/xrpcomp -man/man5/slapd.conf.5 -man/man5/slapd.replog.5 -man/man8/fax500.8 -man/man8/go500.8 -man/man8/go500gw.8 -man/man8/in.xfingerd.8 -man/man8/mail500.8 -man/man8/rcpt500.8 -man/man8/slapadd.8 -man/man8/slapcat.8 -man/man8/slapd.8 -man/man8/slapindex.8 -man/man8/slappasswd.8 -man/man8/slurpd.8 -sbin/slapadd -sbin/slapcat -sbin/slapindex -sbin/slappasswd -share/openldap/go500gw.help -share/openldap/rcpt500.help -share/examples/openldap/slapd.conf -share/examples/openldap/schema/corba.schema -share/examples/openldap/schema/core.schema -share/examples/openldap/schema/cosine.schema -share/examples/openldap/schema/inetorgperson.schema -share/examples/openldap/schema/java.schema -share/examples/openldap/schema/krb5-kdc.schema -share/examples/openldap/schema/misc.schema -share/examples/openldap/schema/nadf.schema -share/examples/openldap/schema/nis.schema -share/examples/openldap/schema/openldap.schema -@dirrm share/examples/openldap/schema @dirrm share/examples/openldap -@dirrm share/openldap diff --git a/databases/openldap/pkg/PLIST-client b/databases/openldap/pkg/PLIST-client deleted file mode 100644 index ed4ad7255a4..00000000000 --- a/databases/openldap/pkg/PLIST-client +++ /dev/null @@ -1,223 +0,0 @@ -@comment $OpenBSD: PLIST-client,v 1.3 2001/09/08 22:27:54 jakob Exp $ -@pkgcfl openldap-* -bin/ldapadd -bin/ldapdelete -bin/ldapmodify -bin/ldapmodrdn -bin/ldappasswd -bin/ldapsearch -bin/ud -include/disptmpl.h -include/lber.h -include/lber_types.h -include/ldap.h -include/ldap_cdefs.h -include/ldap_features.h -include/ldap_schema.h -include/srchpref.h -lib/liblber.a -lib/liblber.la -lib/libldap.a -lib/libldap.la -lib/libldap_r.a -lib/libldap_r.la -%%SHARED%% -man/man1/ldapadd.1 -man/man1/ldapdelete.1 -man/man1/ldapmodify.1 -man/man1/ldapmodrdn.1 -man/man1/ldappasswd.1 -man/man1/ldapsearch.1 -man/man1/ud.1 -man/man3/ber_alloc_t.3 -man/man3/ber_first_element.3 -man/man3/ber_flush.3 -man/man3/ber_get_bitstring.3 -man/man3/ber_get_boolean.3 -man/man3/ber_get_enum.3 -man/man3/ber_get_int.3 -man/man3/ber_get_next.3 -man/man3/ber_get_null.3 -man/man3/ber_get_stringa.3 -man/man3/ber_get_stringb.3 -man/man3/ber_next_element.3 -man/man3/ber_peek_tag.3 -man/man3/ber_printf.3 -man/man3/ber_put_enum.3 -man/man3/ber_put_int.3 -man/man3/ber_put_null.3 -man/man3/ber_put_ostring.3 -man/man3/ber_put_seq.3 -man/man3/ber_put_set.3 -man/man3/ber_put_string.3 -man/man3/ber_scanf.3 -man/man3/ber_skip_tag.3 -man/man3/ber_start_set.3 -man/man3/lber-decode.3 -man/man3/lber-encode.3 -man/man3/lber-memory.3 -man/man3/lber-types.3 -man/man3/ld_errno.3 -man/man3/ldap.3 -man/man3/ldap_abandon.3 -man/man3/ldap_abandon_ext.3 -man/man3/ldap_add.3 -man/man3/ldap_add_ext.3 -man/man3/ldap_add_ext_s.3 -man/man3/ldap_add_s.3 -man/man3/ldap_attributetype2name.3 -man/man3/ldap_attributetype2str.3 -man/man3/ldap_attributetype_free.3 -man/man3/ldap_bind.3 -man/man3/ldap_bind_s.3 -man/man3/ldap_build_filter.3 -man/man3/ldap_cache.3 -man/man3/ldap_compare.3 -man/man3/ldap_compare_ext.3 -man/man3/ldap_compare_ext_s.3 -man/man3/ldap_compare_s.3 -man/man3/ldap_count_entries.3 -man/man3/ldap_count_values.3 -man/man3/ldap_count_values_len.3 -man/man3/ldap_delete.3 -man/man3/ldap_delete_ext.3 -man/man3/ldap_delete_ext_s.3 -man/man3/ldap_delete_s.3 -man/man3/ldap_destroy_cache.3 -man/man3/ldap_disable_cache.3 -man/man3/ldap_disptmpl.3 -man/man3/ldap_dn2ufn.3 -man/man3/ldap_enable_cache.3 -man/man3/ldap_entry2html.3 -man/man3/ldap_entry2html_search.3 -man/man3/ldap_entry2text.3 -man/man3/ldap_entry2text_search.3 -man/man3/ldap_err2string.3 -man/man3/ldap_errlist.3 -man/man3/ldap_error.3 -man/man3/ldap_explode_dn.3 -man/man3/ldap_explode_rdn.3 -man/man3/ldap_first_attribute.3 -man/man3/ldap_first_disptmpl.3 -man/man3/ldap_first_entry.3 -man/man3/ldap_first_searchobj.3 -man/man3/ldap_first_tmplcol.3 -man/man3/ldap_first_tmplrow.3 -man/man3/ldap_flush_cache.3 -man/man3/ldap_free_friendlymap.3 -man/man3/ldap_free_searchprefs.3 -man/man3/ldap_free_templates.3 -man/man3/ldap_free_urldesc.3 -man/man3/ldap_friendly.3 -man/man3/ldap_friendly_name.3 -man/man3/ldap_get_dn.3 -man/man3/ldap_get_values.3 -man/man3/ldap_get_values_len.3 -man/man3/ldap_getfilter.3 -man/man3/ldap_getfilter_free.3 -man/man3/ldap_getfirstfilter.3 -man/man3/ldap_getnextfilter.3 -man/man3/ldap_init.3 -man/man3/ldap_init_getfilter.3 -man/man3/ldap_init_getfilter_buf.3 -man/man3/ldap_init_searchprefs.3 -man/man3/ldap_init_searchprefs_buf.3 -man/man3/ldap_init_templates.3 -man/man3/ldap_init_templates_buf.3 -man/man3/ldap_is_ldap_url.3 -man/man3/ldap_kerberos_bind1.3 -man/man3/ldap_kerberos_bind1_s.3 -man/man3/ldap_kerberos_bind2.3 -man/man3/ldap_kerberos_bind2_s.3 -man/man3/ldap_kerberos_bind_s.3 -man/man3/ldap_matchingrule2name.3 -man/man3/ldap_matchingrule2str.3 -man/man3/ldap_matchingrule_free.3 -man/man3/ldap_modify.3 -man/man3/ldap_modify_ext.3 -man/man3/ldap_modify_ext_s.3 -man/man3/ldap_modify_s.3 -man/man3/ldap_modrdn.3 -man/man3/ldap_modrdn2.3 -man/man3/ldap_modrdn2_s.3 -man/man3/ldap_modrdn_s.3 -man/man3/ldap_mods_free.3 -man/man3/ldap_msgfree.3 -man/man3/ldap_msgid.3 -man/man3/ldap_msgtype.3 -man/man3/ldap_next_attribute.3 -man/man3/ldap_next_disptmpl.3 -man/man3/ldap_next_entry.3 -man/man3/ldap_next_searchobj.3 -man/man3/ldap_next_tmplcol.3 -man/man3/ldap_next_tmplrow.3 -man/man3/ldap_objectclass2name.3 -man/man3/ldap_objectclass2str.3 -man/man3/ldap_objectclass_free.3 -man/man3/ldap_oc2template.3 -man/man3/ldap_open.3 -man/man3/ldap_perror.3 -man/man3/ldap_result.3 -man/man3/ldap_result2error.3 -man/man3/ldap_sasl_bind.3 -man/man3/ldap_sasl_bind_s.3 -man/man3/ldap_schema.3 -man/man3/ldap_scherr2str.3 -man/man3/ldap_search.3 -man/man3/ldap_search_ext.3 -man/man3/ldap_search_ext_s.3 -man/man3/ldap_search_s.3 -man/man3/ldap_search_st.3 -man/man3/ldap_searchprefs.3 -man/man3/ldap_set_cache_options.3 -man/man3/ldap_setfilteraffixes.3 -man/man3/ldap_simple_bind.3 -man/man3/ldap_simple_bind_s.3 -man/man3/ldap_sort.3 -man/man3/ldap_sort_entries.3 -man/man3/ldap_sort_strcasecmp.3 -man/man3/ldap_sort_values.3 -man/man3/ldap_str2attributetype.3 -man/man3/ldap_str2matchingrule.3 -man/man3/ldap_str2objectclass.3 -man/man3/ldap_str2syntax.3 -man/man3/ldap_syntax2name.3 -man/man3/ldap_syntax2str.3 -man/man3/ldap_syntax_free.3 -man/man3/ldap_tmplattrs.3 -man/man3/ldap_ufn.3 -man/man3/ldap_ufn_search_c.3 -man/man3/ldap_ufn_search_ct.3 -man/man3/ldap_ufn_search_s.3 -man/man3/ldap_ufn_setfilter.3 -man/man3/ldap_ufn_setprefix.3 -man/man3/ldap_ufn_timeout.3 -man/man3/ldap_unbind.3 -man/man3/ldap_unbind_ext.3 -man/man3/ldap_unbind_ext_s.3 -man/man3/ldap_unbind_s.3 -man/man3/ldap_uncache_entry.3 -man/man3/ldap_uncache_request.3 -man/man3/ldap_url.3 -man/man3/ldap_url_parse.3 -man/man3/ldap_url_search.3 -man/man3/ldap_url_search_s.3 -man/man3/ldap_url_search_st.3 -man/man3/ldap_vals2html.3 -man/man3/ldap_vals2text.3 -man/man3/ldap_value_free.3 -man/man3/ldap_value_free_len.3 -man/man5/ldap.conf.5 -man/man5/ldapfilter.conf.5 -man/man5/ldapfriendly.5 -man/man5/ldapsearchprefs.conf.5 -man/man5/ldaptemplates.conf.5 -man/man5/ldif.5 -man/man5/ud.conf.5 -share/openldap/ldapfriendly -@dirrm share/openldap -share/examples/openldap/ldap.conf -share/examples/openldap/ldapfilter.conf -share/examples/openldap/ldaptemplates.conf -share/examples/openldap/ldapsearchprefs.conf -@dirrm share/examples/openldap diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server new file mode 100644 index 00000000000..73492851379 --- /dev/null +++ b/databases/openldap/pkg/PLIST-server @@ -0,0 +1,45 @@ +@comment $OpenBSD: PLIST-server,v 1.1 2001/09/28 17:56:09 jakob Exp $ +libexec/fax500 +libexec/go500 +libexec/go500gw +libexec/in.xfingerd +libexec/mail500 +libexec/maildap +libexec/rcpt500 +libexec/rp500 +libexec/slapd +libexec/slurpd +libexec/xrpcomp +man/man5/slapd.conf.5 +man/man5/slapd.replog.5 +man/man8/fax500.8 +man/man8/go500.8 +man/man8/go500gw.8 +man/man8/in.xfingerd.8 +man/man8/mail500.8 +man/man8/rcpt500.8 +man/man8/slapadd.8 +man/man8/slapcat.8 +man/man8/slapd.8 +man/man8/slapindex.8 +man/man8/slappasswd.8 +man/man8/slurpd.8 +sbin/slapadd +sbin/slapcat +sbin/slapindex +sbin/slappasswd +share/openldap/go500gw.help +share/openldap/rcpt500.help +share/examples/openldap/slapd.conf +share/examples/openldap/schema/corba.schema +share/examples/openldap/schema/core.schema +share/examples/openldap/schema/cosine.schema +share/examples/openldap/schema/inetorgperson.schema +share/examples/openldap/schema/java.schema +share/examples/openldap/schema/krb5-kdc.schema +share/examples/openldap/schema/misc.schema +share/examples/openldap/schema/nadf.schema +share/examples/openldap/schema/nis.schema +share/examples/openldap/schema/openldap.schema +@dirrm share/examples/openldap/schema +@dirrm share/openldap