Conversion to a single libtool environment.

Approved by:	portmgr (kris)

3 files changed, 31 insertions, 17 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 86f1410b7f2a..514ac5e8fd2b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -98,7 +98,7 @@ CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 
 USE_OPENSSL=		yes
 USE_REINPLACE=		yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=		libtool:15
 
 DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
 PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 26cbd72ef1c0..3e3bff42a860 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -9,40 +9,51 @@ etc/openldap/slapd.conf.default
 @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf
 etc/openldap/DB_CONFIG.example
 %%SLAPI%%lib/libslapi.a
+%%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
 %%SLAPI%%lib/libslapi-2.3.so
 %%SLAPI%%lib/libslapi-2.3.so.2
 %%MODULES%%@exec mkdir -p %D/libexec/openldap
-%%BACK_BDB%%libexec/openldap/back_bdb.so
 %%BACK_BDB%%libexec/openldap/back_bdb-2.3.so
 %%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.2
-%%BACK_HDB%%libexec/openldap/back_hdb.so
+%%BACK_BDB%%libexec/openldap/back_bdb.la
+%%BACK_BDB%%libexec/openldap/back_bdb.so
 %%BACK_HDB%%libexec/openldap/back_hdb-2.3.so
 %%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.2
-%%BACKEND%%libexec/openldap/back_ldap.so
+%%BACK_HDB%%libexec/openldap/back_hdb.la
+%%BACK_HDB%%libexec/openldap/back_hdb.so
 %%BACKEND%%libexec/openldap/back_ldap-2.3.so
 %%BACKEND%%libexec/openldap/back_ldap-2.3.so.2
-%%BACKEND%%libexec/openldap/back_ldbm.so
+%%BACKEND%%libexec/openldap/back_ldap.la
+%%BACKEND%%libexec/openldap/back_ldap.so
 %%BACKEND%%libexec/openldap/back_ldbm-2.3.so
 %%BACKEND%%libexec/openldap/back_ldbm-2.3.so.2
-%%BACKEND%%libexec/openldap/back_meta.so
+%%BACKEND%%libexec/openldap/back_ldbm.la
+%%BACKEND%%libexec/openldap/back_ldbm.so
 %%BACKEND%%libexec/openldap/back_meta-2.3.so
 %%BACKEND%%libexec/openldap/back_meta-2.3.so.2
-%%BACKEND%%libexec/openldap/back_monitor.so
+%%BACKEND%%libexec/openldap/back_meta.la
+%%BACKEND%%libexec/openldap/back_meta.so
 %%BACKEND%%libexec/openldap/back_monitor-2.3.so
 %%BACKEND%%libexec/openldap/back_monitor-2.3.so.2
-%%BACKEND%%libexec/openldap/back_null.so
+%%BACKEND%%libexec/openldap/back_monitor.la
+%%BACKEND%%libexec/openldap/back_monitor.so
 %%BACKEND%%libexec/openldap/back_null-2.3.so
 %%BACKEND%%libexec/openldap/back_null-2.3.so.2
-%%BACK_PERL%%libexec/openldap/back_perl.so
+%%BACKEND%%libexec/openldap/back_null.la
+%%BACKEND%%libexec/openldap/back_null.so
 %%BACK_PERL%%libexec/openldap/back_perl-2.3.so
 %%BACK_PERL%%libexec/openldap/back_perl-2.3.so.2
-%%BACK_SHELL%%libexec/openldap/back_shell.so
+%%BACK_PERL%%libexec/openldap/back_perl.la
+%%BACK_PERL%%libexec/openldap/back_perl.so
 %%BACK_SHELL%%libexec/openldap/back_shell-2.3.so
 %%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.2
-%%BACK_SQL%%libexec/openldap/back_sql.so
+%%BACK_SHELL%%libexec/openldap/back_shell.la
+%%BACK_SHELL%%libexec/openldap/back_shell.so
 %%BACK_SQL%%libexec/openldap/back_sql-2.3.so
 %%BACK_SQL%%libexec/openldap/back_sql-2.3.so.2
+%%BACK_SQL%%libexec/openldap/back_sql.la
+%%BACK_SQL%%libexec/openldap/back_sql.so
 libexec/slapd
 libexec/slurpd
 @dirrmtry libexec/openldap
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 3a641a560fb9..1fe93c92531c 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -19,18 +19,21 @@ include/ldap_features.h
 include/ldap_schema.h
 include/ldap_utf8.h
 include/slapi-plugin.h
-lib/liblber.a
-lib/liblber.so
 lib/liblber-2.3.so
 lib/liblber-2.3.so.2
-lib/libldap.a
-lib/libldap.so
+lib/liblber.a
+lib/liblber.la
+lib/liblber.so
 lib/libldap-2.3.so
 lib/libldap-2.3.so.2
-lib/libldap_r.a
-lib/libldap_r.so
+lib/libldap.a
+lib/libldap.la
+lib/libldap.so
 lib/libldap_r-2.3.so
 lib/libldap_r-2.3.so.2
+lib/libldap_r.a
+lib/libldap_r.la
+lib/libldap_r.so
 @comment share/openldap/ucdata/case.dat
 @comment share/openldap/ucdata/cmbcl.dat
 @comment share/openldap/ucdata/comp.dat