Conversion to a single libtool environment.

Approved by:	portmgr (kris)

7 files changed, 21 insertions, 2 deletions

diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index f9c3dc9a3c96..b59878225feb 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	courier-authlib
 PORTVERSION=	0.58
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -35,9 +35,10 @@ OPTIONS+=	GDBM	"Use gdbm instead of system bdb"	off
 
 .else	# !defined(PKGNAMESUFFIX)
 
+USE_AUTOTOOLS=	libltdl:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15 libltdl:15
+GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_SUBMAKE=	yes
diff --git a/security/courier-authlib/pkg-plist-base b/security/courier-authlib/pkg-plist-base
index b6e8a39df5da..be9b4122fc34 100644
--- a/security/courier-authlib/pkg-plist-base
+++ b/security/courier-authlib/pkg-plist-base
@@ -12,19 +12,27 @@ include/courierauthdebug.h
 include/courierauthsasl.h
 include/courierauthsaslclient.h
 lib/courier-authlib/libcourierauth.a
+lib/courier-authlib/libcourierauth.la
 lib/courier-authlib/libcourierauth.so
 lib/courier-authlib/libcourierauth.so.0
 lib/courier-authlib/libcourierauthcommon.a
+lib/courier-authlib/libcourierauthcommon.la
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthsasl.a
+lib/courier-authlib/libcourierauthsasl.la
 lib/courier-authlib/libcourierauthsasl.so
 lib/courier-authlib/libcourierauthsasl.so.0
 lib/courier-authlib/libcourierauthsaslclient.a
+lib/courier-authlib/libcourierauthsaslclient.la
 lib/courier-authlib/libcourierauthsaslclient.so
 lib/courier-authlib/libcourierauthsaslclient.so.0
+lib/courier-authlib/libauthpam.a
+lib/courier-authlib/libauthpam.la
 lib/courier-authlib/libauthpam.so
 lib/courier-authlib/libauthpam.so.0
+lib/courier-authlib/libauthpipe.a
+lib/courier-authlib/libauthpipe.la
 lib/courier-authlib/libauthpipe.so
 lib/courier-authlib/libauthpipe.so.0
 libexec/courier-authlib/authdaemond
diff --git a/security/courier-authlib/pkg-plist-ldap b/security/courier-authlib/pkg-plist-ldap
index 45a091162a3c..244a21131b12 100644
--- a/security/courier-authlib/pkg-plist-ldap
+++ b/security/courier-authlib/pkg-plist-ldap
@@ -4,6 +4,8 @@ etc/authlib/authldaprc.dist
 @unexec cmp -s %D/etc/openldap/schema/authldap.schema.default %D/etc/openldap/schema/authldap.schema && rm -f %D/etc/openldap/schema/authldap.schema 2>/dev/null || true
 etc/openldap/schema/authldap.schema.default
 @exec [ -f %D/etc/openldap/schema/authldap.schema ] || cp -p %D/etc/openldap/schema/authldap.schema.default %D/etc/openldap/schema/authldap.schema
+lib/courier-authlib/libauthldap.a
+lib/courier-authlib/libauthldap.la
 lib/courier-authlib/libauthldap.so
 lib/courier-authlib/libauthldap.so.0
 %%PORTDOCS%%%%DOCSDIR%%/README.ldap
diff --git a/security/courier-authlib/pkg-plist-mysql b/security/courier-authlib/pkg-plist-mysql
index 86d7ac4c45c0..a5707f2a4859 100644
--- a/security/courier-authlib/pkg-plist-mysql
+++ b/security/courier-authlib/pkg-plist-mysql
@@ -1,6 +1,8 @@
 @unexec cmp -s %D/etc/authlib/authmysqlrc.dist %D/etc/authlib/authmysqlrc && rm -f %D/etc/authlib/authmysqlrc 2>/dev/null || true
 etc/authlib/authmysqlrc.dist
 @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authmysqlrc.dist && chmod 0600 %D/etc/authlib/authmysqlrc
+lib/courier-authlib/libauthmysql.a
+lib/courier-authlib/libauthmysql.la
 lib/courier-authlib/libauthmysql.so
 lib/courier-authlib/libauthmysql.so.0
 %%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
diff --git a/security/courier-authlib/pkg-plist-pgsql b/security/courier-authlib/pkg-plist-pgsql
index dcfb91a26234..cb9078282fef 100644
--- a/security/courier-authlib/pkg-plist-pgsql
+++ b/security/courier-authlib/pkg-plist-pgsql
@@ -1,6 +1,8 @@
 @unexec cmp -s %D/etc/authlib/authpgsqlrc.dist %D/etc/authlib/authpgsqlrc && rm -f %D/etc/authlib/authpgsqlrc 2>/dev/null || true
 etc/authlib/authpgsqlrc.dist
 @exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/authlib/authpgsqlrc.dist && chmod 0600 %D/etc/authlib/authpgsqlrc
+lib/courier-authlib/libauthpgsql.a
+lib/courier-authlib/libauthpgsql.la
 lib/courier-authlib/libauthpgsql.so
 lib/courier-authlib/libauthpgsql.so.0
 %%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
diff --git a/security/courier-authlib/pkg-plist-userdb b/security/courier-authlib/pkg-plist-userdb
index 63bb7da1be85..83ea0cac4b4e 100644
--- a/security/courier-authlib/pkg-plist-userdb
+++ b/security/courier-authlib/pkg-plist-userdb
@@ -5,6 +5,8 @@ sbin/userdb
 sbin/userdb-test-cram-md5
 sbin/userdbpw
 sbin/vchkpw2userdb
+lib/courier-authlib/libauthuserdb.a
+lib/courier-authlib/libauthuserdb.la
 lib/courier-authlib/libauthuserdb.so
 lib/courier-authlib/libauthuserdb.so.0
 
diff --git a/security/courier-authlib/pkg-plist-vchkpw b/security/courier-authlib/pkg-plist-vchkpw
index e0273f2ce1f3..b94d9632a813 100644
--- a/security/courier-authlib/pkg-plist-vchkpw
+++ b/security/courier-authlib/pkg-plist-vchkpw
@@ -1,3 +1,5 @@
+lib/courier-authlib/libauthvchkpw.a
+lib/courier-authlib/libauthvchkpw.la
 lib/courier-authlib/libauthvchkpw.so
 lib/courier-authlib/libauthvchkpw.so.0