Date: Fri, 19 Sep 2014 15:26:17 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368569 - head/net/openldap24-server Message-ID: <201409191526.s8JFQHUw077687@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Sep 19 15:26:16 2014 New Revision: 368569 URL: http://svnweb.freebsd.org/changeset/ports/368569 QAT: https://qat.redports.org/buildarchive/r368569/ Log: Install smbk5pwd and pw-sha2 modules using make install such that the libtool libraries are installed correctly. Modified: head/net/openldap24-server/Makefile head/net/openldap24-server/pkg-plist Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Fri Sep 19 15:23:22 2014 (r368568) +++ head/net/openldap24-server/Makefile Fri Sep 19 15:26:16 2014 (r368569) @@ -59,7 +59,7 @@ BROKEN= incompatible OpenLDAP version: .endif PORTREVISION_CLIENT= 2 -PORTREVISION_SERVER= 4 +PORTREVISION_SERVER= 5 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_MAJOR= ${DISTVERSION:R} @@ -539,22 +539,18 @@ post-install: done .else @${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR} -.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so.${OPENLDAP_SHLIB_MAJOR} -.endif .if ${PORT_OPTIONS:MSMBPWD} - @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ - ${STAGEDIR}${PREFIX}/libexec/openldap/ - @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so.0 \ - ${STAGEDIR}${PREFIX}/libexec/openldap/ - @${LN} -s smbk5pwd.so.0 ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.so + @(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install) + ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a .endif .if ${PORT_OPTIONS:MSHA2} - @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/pw-sha2.la \ - ${STAGEDIR}${PREFIX}/libexec/openldap/ - @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/.libs/pw-sha2.so.0 \ - ${STAGEDIR}${PREFIX}/libexec/openldap/ - @${LN} -s pw-sha2.so.0 ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.so + @(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \ + ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install) + ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a +.endif +.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so .endif .endif # defined(CLIENT_ONLY) Modified: head/net/openldap24-server/pkg-plist ============================================================================== --- head/net/openldap24-server/pkg-plist Fri Sep 19 15:23:22 2014 (r368568) +++ head/net/openldap24-server/pkg-plist Fri Sep 19 15:26:16 2014 (r368569) @@ -94,9 +94,11 @@ %%SHA2%%libexec/openldap/pw-sha2.la %%SHA2%%libexec/openldap/pw-sha2.so %%SHA2%%libexec/openldap/pw-sha2.so.0 +%%SHA2%%libexec/openldap/pw-sha2.so.0.0.0 %%SMBPWD%%libexec/openldap/smbk5pwd.la %%SMBPWD%%libexec/openldap/smbk5pwd.so %%SMBPWD%%libexec/openldap/smbk5pwd.so.0 +%%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0 libexec/slapd man/man5/slapd-bdb.5.gz man/man5/slapd-config.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409191526.s8JFQHUw077687>