Conversion to a single libtool environment.

Approved by:	portmgr (kris)

14 files changed, 34 insertions, 13 deletions

diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index 23ef9d8f3b76..cf7586068010 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	idnkit
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nic.ad.jp/ja/idn/idnkit/download/sources/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library to handle internationalized domain names
 
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} \
 		--enable-runidn \
@@ -36,6 +36,10 @@ MANCOMPRESSED=	no
 DOCS_EN=	ChangeLog NEWS README
 DOCS_JA=	README.ja
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|mode=link $$(LD)|mode=link $$(CC)|'
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/tools/runidn/libidnkitres.la ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
diff --git a/dns/idnkit/pkg-plist b/dns/idnkit/pkg-plist
index 43edcd580708..e147ce65e636 100644
--- a/dns/idnkit/pkg-plist
+++ b/dns/idnkit/pkg-plist
@@ -38,9 +38,11 @@ include/idn/util.h
 include/idn/version.h
 @dirrm include/idn
 lib/libidnkit.a
+lib/libidnkit.la
 lib/libidnkit.so
 lib/libidnkit.so.1
 lib/libidnkitlite.a
+lib/libidnkitlite.la
 lib/libidnkitlite.so
 lib/libidnkitlite.so.1
 lib/libidnkitres.a
diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 0b9da9b21776..b1342f8c8614 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ldns
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/
 
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 OPTIONS=	EXAMPLES "With example programs" Off
diff --git a/dns/ldns/pkg-plist b/dns/ldns/pkg-plist
index c73af841f8c3..11e4171b7646 100644
--- a/dns/ldns/pkg-plist
+++ b/dns/ldns/pkg-plist
@@ -31,5 +31,6 @@ include/ldns/wire2host.h
 include/ldns/zone.h
 lib/libldns-1.0.1.so
 lib/libldns.a
+lib/libldns.la
 lib/libldns.so
 @dirrm include/ldns
diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index 402ff1a230de..f4d4e99fcc18 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libidn
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA} \
 		http://josefsson.org/libidn/releases/
@@ -18,7 +19,7 @@ COMMENT=	Internationalized Domain Names command line tool
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 
diff --git a/dns/libidn/pkg-plist b/dns/libidn/pkg-plist
index 41d9661d7d7c..28e74bdcdfcc 100644
--- a/dns/libidn/pkg-plist
+++ b/dns/libidn/pkg-plist
@@ -7,6 +7,7 @@ include/punycode.h
 include/stringprep.h
 include/tld.h
 lib/libidn.a
+lib/libidn.la
 lib/libidn.so
 lib/libidn.so.16
 libdata/pkgconfig/libidn.pc
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index e012b92f0ce8..0620d4676317 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -16,7 +16,6 @@ COMMENT=	DNS server designed to utilize the MySQL database
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 
 USE_RC_SUBR=	mydns.sh
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index e012b92f0ce8..0620d4676317 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -16,7 +16,6 @@ COMMENT=	DNS server designed to utilize the MySQL database
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 
 USE_RC_SUBR=	mydns.sh
diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile
index 6eb2ea9cf6ee..2bb930abec5b 100644
--- a/dns/posadis/Makefile
+++ b/dns/posadis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	posadis
 PORTVERSION=	0.60.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/dns/posadis/pkg-plist b/dns/posadis/pkg-plist
index 12a36c8486eb..6af18e2dd1b3 100644
--- a/dns/posadis/pkg-plist
+++ b/dns/posadis/pkg-plist
@@ -23,10 +23,16 @@ include/posadis-%%VERSION%%/updates.h
 include/posadis-%%VERSION%%/vector.h
 include/posadis-%%VERSION%%/zones.h
 include/posadis-%%VERSION%%/zonetransfer.h
+%%FAM%%lib/posadis/fam.a
+%%FAM%%lib/posadis/fam.la
 %%FAM%%lib/posadis/fam.so
 %%FAM%%lib/posadis/fam.so.0
+lib/posadis/localhost.a
+lib/posadis/localhost.la
 lib/posadis/localhost.so
 lib/posadis/localhost.so.0
+lib/posadis/revmap.a
+lib/posadis/revmap.la
 lib/posadis/revmap.so
 lib/posadis/revmap.so.0
 lib/posadis-%%VERSION%%/include/posadis-config.h
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index f8a99b79d50a..d8e5cfbf3e64 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	2.9.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 60bcc32562ef..5e5921e60e88 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -2,15 +2,19 @@ bin/pdns_control
 bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
+%%WITHMYSQL%%lib/libgmysqlbackend.a
 %%WITHMYSQL%%lib/libgmysqlbackend.so
 %%WITHMYSQL%%lib/libgmysqlbackend.so.0
+%%WITHSQLLITE%%lib/libgsqlitebackend.a
 %%WITHSQLLITE%%lib/libgsqlitebackend.so
 %%WITHSQLLITE%%lib/libgsqlitebackend.so.0
+%%WITHLDAP%%lib/libldapbackend.a
 %%WITHLDAP%%lib/libldapbackend.so
 %%WITHLDAP%%lib/libldapbackend.so.0
-%%WITHLDAP%%lib/libldapbackend.a
-lib/libpipebackend.so.0
+lib/libpipebackend.a
+lib/libpipebackend.la
 lib/libpipebackend.so
+lib/libpipebackend.so.0
 %%RECURSOR%%sbin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index f8a99b79d50a..d8e5cfbf3e64 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	powerdns
 PORTVERSION=	2.9.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/ \
 		http://mirrors.evolva.ro/powerdns.com/releases/
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index 60bcc32562ef..5e5921e60e88 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -2,15 +2,19 @@ bin/pdns_control
 bin/zone2ldap
 bin/zone2sql
 sbin/pdns_server
+%%WITHMYSQL%%lib/libgmysqlbackend.a
 %%WITHMYSQL%%lib/libgmysqlbackend.so
 %%WITHMYSQL%%lib/libgmysqlbackend.so.0
+%%WITHSQLLITE%%lib/libgsqlitebackend.a
 %%WITHSQLLITE%%lib/libgsqlitebackend.so
 %%WITHSQLLITE%%lib/libgsqlitebackend.so.0
+%%WITHLDAP%%lib/libldapbackend.a
 %%WITHLDAP%%lib/libldapbackend.so
 %%WITHLDAP%%lib/libldapbackend.so.0
-%%WITHLDAP%%lib/libldapbackend.a
-lib/libpipebackend.so.0
+lib/libpipebackend.a
+lib/libpipebackend.la
 lib/libpipebackend.so
+lib/libpipebackend.so.0
 %%RECURSOR%%sbin/pdns_recursor
 @unexec if cmp -s %D/etc/pdns.conf %D/etc/pdns.conf-dist; then rm -f %D/etc/pdns.conf; fi
 etc/pdns.conf-dist