Date: Sun, 2 Feb 2014 09:51:17 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342258 - in head/net: openldap24-client openldap24-sasl-client openldap24-server openldap24-server/files Message-ID: <201402020951.s129pHSQ067932@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Sun Feb 2 09:51:17 2014 New Revision: 342258 URL: http://svnweb.freebsd.org/changeset/ports/342258 QAT: https://qat.redports.org/buildarchive/r342258/ Log: - Stage support Reviewed by: mat (via a crappy vnc session and it looked nice :-p) Deleted: head/net/openldap24-server/files/manpages.client head/net/openldap24-server/files/manpages.server Modified: head/net/openldap24-client/Makefile head/net/openldap24-sasl-client/Makefile head/net/openldap24-server/Makefile head/net/openldap24-server/pkg-plist head/net/openldap24-server/pkg-plist.client Modified: head/net/openldap24-client/Makefile ============================================================================== --- head/net/openldap24-client/Makefile Sun Feb 2 09:27:42 2014 (r342257) +++ head/net/openldap24-client/Makefile Sun Feb 2 09:51:17 2014 (r342258) @@ -5,5 +5,4 @@ CLIENT_ONLY= yes MASTERDIR= ${.CURDIR}/../openldap24-server -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net/openldap24-sasl-client/Makefile ============================================================================== --- head/net/openldap24-sasl-client/Makefile Sun Feb 2 09:27:42 2014 (r342257) +++ head/net/openldap24-sasl-client/Makefile Sun Feb 2 09:51:17 2014 (r342258) @@ -5,5 +5,4 @@ CLIENT_ONLY= sasl MASTERDIR= ${.CURDIR}/../openldap24-server -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Sun Feb 2 09:27:42 2014 (r342257) +++ head/net/openldap24-server/Makefile Sun Feb 2 09:51:17 2014 (r342258) @@ -125,7 +125,6 @@ OPENLDAP_PKGFILESUFX= CONFIGURE_SED= -e 's,-kthread,${PTHREAD_LIBS},g' -e 's,uuid/uuid.h,xxuuid/uuid.h,g' -NO_STAGE= yes .include <bsd.port.pre.mk> .if defined(CLIENT_ONLY) @@ -489,12 +488,10 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= LIBS="${LIBS}" .if defined(CLIENT_ONLY) -.include "${FILESDIR}/manpages.client" .else SUB_LIST+= RC_DIR=${PREFIX} \ LDAP_RUN_DIR=${LDAP_RUN_DIR} \ DATABASEDIR=${DATABASEDIR} -.include "${FILESDIR}/manpages.server" .endif PLIST_SUB+= ${SUB_LIST} @@ -540,21 +537,20 @@ pre-su-install: ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ fi .if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} - @${MKDIR} ${PREFIX}/libexec/openldap + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap .endif post-install: .if defined(CLIENT_ONLY) -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} @for dir in drafts rfc; do \ - ${MKDIR} ${DOCSDIR}/$${dir}; \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \ + ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \ done -.endif + .else - @${MKDIR} ${LDAP_RUN_DIR} + @${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR} @for schema in ${SCHEMATA}; do \ ${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \ "%D/etc/openldap/schema/$${schema}.schema.default; then" \ @@ -566,19 +562,18 @@ post-install: @${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST} .if ${PORT_OPTIONS:MSMBPWD} @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ - ${PREFIX}/libexec/openldap/ + ${STAGEDIR}${PREFIX}/libexec/openldap/ @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so.0 \ - ${PREFIX}/libexec/openldap/ - @${LN} -s smbk5pwd.so.0 ${PREFIX}/libexec/openldap/smbk5pwd.so + ${STAGEDIR}${PREFIX}/libexec/openldap/ + @${LN} -s smbk5pwd.so.0 ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.so .endif .if ${PORT_OPTIONS:MSHA2} @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/pw-sha2.la \ - ${PREFIX}/libexec/openldap/ + ${STAGEDIR}${PREFIX}/libexec/openldap/ @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/.libs/pw-sha2.so.0 \ - ${PREFIX}/libexec/openldap/ + ${STAGEDIR}${PREFIX}/libexec/openldap/ @${LN} -s pw-sha2.so.0 ${PREFIX}/libexec/openldap/pw-sha2.so .endif .endif - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/net/openldap24-server/pkg-plist ============================================================================== --- head/net/openldap24-server/pkg-plist Sun Feb 2 09:27:42 2014 (r342257) +++ head/net/openldap24-server/pkg-plist Sun Feb 2 09:51:17 2014 (r342258) @@ -98,7 +98,62 @@ sbin/slapindex sbin/slappasswd sbin/slapschema sbin/slaptest +man/man5/slapd-bdb.5.gz +man/man5/slapd-config.5.gz +man/man5/slapd-dnssrv.5.gz +man/man5/slapd-hdb.5.gz +man/man5/slapd-ldap.5.gz +man/man5/slapd-ldbm.5.gz +man/man5/slapd-ldif.5.gz +man/man5/slapd-mdb.5.gz +man/man5/slapd-meta.5.gz +man/man5/slapd-monitor.5.gz +man/man5/slapd-ndb.5.gz +man/man5/slapd-null.5.gz +man/man5/slapd-passwd.5.gz +man/man5/slapd-perl.5.gz +man/man5/slapd-relay.5.gz +man/man5/slapd-shell.5.gz +man/man5/slapd-sock.5.gz +man/man5/slapd-sql.5.gz +man/man5/slapd.access.5.gz +man/man5/slapd.backends.5.gz +man/man5/slapd.conf.5.gz +man/man5/slapd.overlays.5.gz +man/man5/slapd.plugin.5.gz +man/man5/slapo-accesslog.5.gz +man/man5/slapo-auditlog.5.gz +man/man5/slapo-chain.5.gz +man/man5/slapo-collect.5.gz +man/man5/slapo-constraint.5.gz +man/man5/slapo-dds.5.gz +man/man5/slapo-dyngroup.5.gz +man/man5/slapo-dynlist.5.gz +man/man5/slapo-memberof.5.gz +man/man5/slapo-pbind.5.gz +man/man5/slapo-pcache.5.gz +man/man5/slapo-ppolicy.5.gz +man/man5/slapo-refint.5.gz +man/man5/slapo-retcode.5.gz +man/man5/slapo-rwm.5.gz +man/man5/slapo-sock.5.gz +man/man5/slapo-sssvlv.5.gz +man/man5/slapo-syncprov.5.gz +man/man5/slapo-translucent.5.gz +man/man5/slapo-unique.5.gz +man/man5/slapo-valsort.5.gz +man/man8/slapacl.8.gz +man/man8/slapadd.8.gz +man/man8/slapauth.8.gz +man/man8/slapcat.8.gz +man/man8/slapd.8.gz +man/man8/slapdn.8.gz +man/man8/slapindex.8.gz +man/man8/slappasswd.8.gz +man/man8/slapschema.8.gz +man/man8/slaptest.8.gz @cwd / @exec mkdir -p %%LDAP_RUN_DIR%% @dirrmtry %%LDAP_RUN_DIR%% +@dirrmtry %%DATABASEDIR%% @cwd %%PREFIX%% Modified: head/net/openldap24-server/pkg-plist.client ============================================================================== --- head/net/openldap24-server/pkg-plist.client Sun Feb 2 09:27:42 2014 (r342257) +++ head/net/openldap24-server/pkg-plist.client Sun Feb 2 09:51:17 2014 (r342258) @@ -36,3 +36,197 @@ lib/libldap_r-2.4.so.%%SHLIB_MAJOR%% lib/libldap_r.a lib/libldap_r.la lib/libldap_r.so +man/man1/ldapadd.1.gz +man/man1/ldapcompare.1.gz +man/man1/ldapdelete.1.gz +man/man1/ldapexop.1.gz +man/man1/ldapmodify.1.gz +man/man1/ldapmodrdn.1.gz +man/man1/ldappasswd.1.gz +man/man1/ldapsearch.1.gz +man/man1/ldapurl.1.gz +man/man1/ldapwhoami.1.gz +man/man3/ber_alloc_t.3.gz +man/man3/ber_bvarray_add.3.gz +man/man3/ber_bvarray_free.3.gz +man/man3/ber_bvdup.3.gz +man/man3/ber_bvecadd.3.gz +man/man3/ber_bvecfree.3.gz +man/man3/ber_bvfree.3.gz +man/man3/ber_bvstr.3.gz +man/man3/ber_bvstrdup.3.gz +man/man3/ber_dupbv.3.gz +man/man3/ber_first_element.3.gz +man/man3/ber_flush.3.gz +man/man3/ber_free.3.gz +man/man3/ber_get_bitstring.3.gz +man/man3/ber_get_boolean.3.gz +man/man3/ber_get_enum.3.gz +man/man3/ber_get_int.3.gz +man/man3/ber_get_next.3.gz +man/man3/ber_get_null.3.gz +man/man3/ber_get_stringa.3.gz +man/man3/ber_get_stringb.3.gz +man/man3/ber_next_element.3.gz +man/man3/ber_peek_tag.3.gz +man/man3/ber_printf.3.gz +man/man3/ber_put_enum.3.gz +man/man3/ber_put_int.3.gz +man/man3/ber_put_null.3.gz +man/man3/ber_put_ostring.3.gz +man/man3/ber_put_seq.3.gz +man/man3/ber_put_set.3.gz +man/man3/ber_put_string.3.gz +man/man3/ber_scanf.3.gz +man/man3/ber_skip_tag.3.gz +man/man3/ber_start_set.3.gz +man/man3/ber_str2bv.3.gz +man/man3/lber-decode.3.gz +man/man3/lber-encode.3.gz +man/man3/lber-memory.3.gz +man/man3/lber-sockbuf.3.gz +man/man3/lber-types.3.gz +man/man3/ld_errno.3.gz +man/man3/ldap.3.gz +man/man3/ldap_abandon.3.gz +man/man3/ldap_abandon_ext.3.gz +man/man3/ldap_add.3.gz +man/man3/ldap_add_ext.3.gz +man/man3/ldap_add_ext_s.3.gz +man/man3/ldap_add_s.3.gz +man/man3/ldap_attributetype2name.3.gz +man/man3/ldap_attributetype2str.3.gz +man/man3/ldap_attributetype_free.3.gz +man/man3/ldap_bind.3.gz +man/man3/ldap_bind_s.3.gz +man/man3/ldap_compare.3.gz +man/man3/ldap_compare_ext.3.gz +man/man3/ldap_compare_ext_s.3.gz +man/man3/ldap_compare_s.3.gz +man/man3/ldap_control_create.3.gz +man/man3/ldap_control_dup.3.gz +man/man3/ldap_control_find.3.gz +man/man3/ldap_control_free.3.gz +man/man3/ldap_controls.3.gz +man/man3/ldap_controls_dup.3.gz +man/man3/ldap_controls_free.3.gz +man/man3/ldap_count_entries.3.gz +man/man3/ldap_count_messages.3.gz +man/man3/ldap_count_references.3.gz +man/man3/ldap_count_values.3.gz +man/man3/ldap_count_values_len.3.gz +man/man3/ldap_dcedn2dn.3.gz +man/man3/ldap_delete.3.gz +man/man3/ldap_delete_ext.3.gz +man/man3/ldap_delete_ext_s.3.gz +man/man3/ldap_delete_s.3.gz +man/man3/ldap_destroy.3.gz +man/man3/ldap_dn2ad_canonical.3.gz +man/man3/ldap_dn2dcedn.3.gz +man/man3/ldap_dn2str.3.gz +man/man3/ldap_dn2ufn.3.gz +man/man3/ldap_dnfree.3.gz +man/man3/ldap_dup.3.gz +man/man3/ldap_err2string.3.gz +man/man3/ldap_errlist.3.gz +man/man3/ldap_error.3.gz +man/man3/ldap_explode_dn.3.gz +man/man3/ldap_explode_rdn.3.gz +man/man3/ldap_extended_operation.3.gz +man/man3/ldap_extended_operation_s.3.gz +man/man3/ldap_first_attribute.3.gz +man/man3/ldap_first_entry.3.gz +man/man3/ldap_first_message.3.gz +man/man3/ldap_first_reference.3.gz +man/man3/ldap_free_urldesc.3.gz +man/man3/ldap_get_dn.3.gz +man/man3/ldap_get_option.3.gz +man/man3/ldap_get_values.3.gz +man/man3/ldap_get_values_len.3.gz +man/man3/ldap_init.3.gz +man/man3/ldap_init_fd.3.gz +man/man3/ldap_initialize.3.gz +man/man3/ldap_install_tls.3.gz +man/man3/ldap_is_ldap_url.3.gz +man/man3/ldap_matchingrule2name.3.gz +man/man3/ldap_matchingrule2str.3.gz +man/man3/ldap_matchingrule_free.3.gz +man/man3/ldap_memalloc.3.gz +man/man3/ldap_memcalloc.3.gz +man/man3/ldap_memfree.3.gz +man/man3/ldap_memory.3.gz +man/man3/ldap_memrealloc.3.gz +man/man3/ldap_memvfree.3.gz +man/man3/ldap_modify.3.gz +man/man3/ldap_modify_ext.3.gz +man/man3/ldap_modify_ext_s.3.gz +man/man3/ldap_modify_s.3.gz +man/man3/ldap_modrdn.3.gz +man/man3/ldap_modrdn2.3.gz +man/man3/ldap_modrdn2_s.3.gz +man/man3/ldap_modrdn_s.3.gz +man/man3/ldap_mods_free.3.gz +man/man3/ldap_msgfree.3.gz +man/man3/ldap_msgid.3.gz +man/man3/ldap_msgtype.3.gz +man/man3/ldap_next_attribute.3.gz +man/man3/ldap_next_entry.3.gz +man/man3/ldap_next_message.3.gz +man/man3/ldap_next_reference.3.gz +man/man3/ldap_objectclass2name.3.gz +man/man3/ldap_objectclass2str.3.gz +man/man3/ldap_objectclass_free.3.gz +man/man3/ldap_open.3.gz +man/man3/ldap_parse_extended_result.3.gz +man/man3/ldap_parse_reference.3.gz +man/man3/ldap_parse_result.3.gz +man/man3/ldap_parse_sasl_bind_result.3.gz +man/man3/ldap_parse_sort_control.3.gz +man/man3/ldap_parse_vlv_control.3.gz +man/man3/ldap_perror.3.gz +man/man3/ldap_rename.3.gz +man/man3/ldap_rename_s.3.gz +man/man3/ldap_result.3.gz +man/man3/ldap_result2error.3.gz +man/man3/ldap_sasl_bind.3.gz +man/man3/ldap_sasl_bind_s.3.gz +man/man3/ldap_schema.3.gz +man/man3/ldap_scherr2str.3.gz +man/man3/ldap_search.3.gz +man/man3/ldap_search_ext.3.gz +man/man3/ldap_search_ext_s.3.gz +man/man3/ldap_search_s.3.gz +man/man3/ldap_search_st.3.gz +man/man3/ldap_set_option.3.gz +man/man3/ldap_set_rebind_proc.3.gz +man/man3/ldap_set_urllist_proc.3.gz +man/man3/ldap_simple_bind.3.gz +man/man3/ldap_simple_bind_s.3.gz +man/man3/ldap_sort.3.gz +man/man3/ldap_sort_entries.3.gz +man/man3/ldap_sort_strcasecmp.3.gz +man/man3/ldap_sort_values.3.gz +man/man3/ldap_start_tls.3.gz +man/man3/ldap_start_tls_s.3.gz +man/man3/ldap_str2attributetype.3.gz +man/man3/ldap_str2dn.3.gz +man/man3/ldap_str2matchingrule.3.gz +man/man3/ldap_str2objectclass.3.gz +man/man3/ldap_str2syntax.3.gz +man/man3/ldap_strdup.3.gz +man/man3/ldap_sync.3.gz +man/man3/ldap_syntax2name.3.gz +man/man3/ldap_syntax2str.3.gz +man/man3/ldap_syntax_free.3.gz +man/man3/ldap_tls.3.gz +man/man3/ldap_tls_inplace.3.gz +man/man3/ldap_unbind.3.gz +man/man3/ldap_unbind_ext.3.gz +man/man3/ldap_unbind_ext_s.3.gz +man/man3/ldap_unbind_s.3.gz +man/man3/ldap_url.3.gz +man/man3/ldap_url_parse.3.gz +man/man3/ldap_value_free.3.gz +man/man3/ldap_value_free_len.3.gz +man/man5/ldap.conf.5.gz +man/man5/ldif.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402020951.s129pHSQ067932>