2 files changed, 27 insertions, 37 deletions

diff --git a/dns/bind10/Makefile b/dns/bind10/Makefile
index 6d0b3286468b..dd04a1f1a492 100644
--- a/dns/bind10/Makefile
+++ b/dns/bind10/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind10
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	${MASTER_SITE_ISC}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -33,7 +33,7 @@ EXPIRATION_DATE=	2015-12-31
 
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USES=	compiler:c++11-lang pathfix pkgconfig python:3
+USES=	compiler:c++11-lang pathfix pkgconfig python:3 libtool
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var	\
@@ -44,8 +44,6 @@ PLIST_SUB+=	PORTNAME=${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
-
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem.sample
 	${MV} ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-keyfile.pem.sample
diff --git a/dns/bind10/pkg-plist b/dns/bind10/pkg-plist
index a51fefe8f25b..9f4890ba0562 100644
--- a/dns/bind10/pkg-plist
+++ b/dns/bind10/pkg-plist
@@ -377,93 +377,93 @@ include/bind10/log/message_types.h
 include/bind10/util/buffer.h
 include/bind10/util/io_utilities.h
 lib/libb10-acl.a
-lib/libb10-acl.la
 lib/libb10-acl.so
 lib/libb10-acl.so.0
+lib/libb10-acl.so.0.0.0
 lib/libb10-asiodns.a
-lib/libb10-asiodns.la
 lib/libb10-asiodns.so
 lib/libb10-asiodns.so.0
+lib/libb10-asiodns.so.0.0.0
 lib/libb10-asiolink.a
-lib/libb10-asiolink.la
 lib/libb10-asiolink.so
-lib/libb10-asiolink.so.1
+lib/libb10-asiolink.so.0
+lib/libb10-asiolink.so.0.1.0
 lib/libb10-cc.a
-lib/libb10-cc.la
 lib/libb10-cc.so
 lib/libb10-cc.so.0
+lib/libb10-cc.so.0.0.0
 lib/libb10-cfgclient.a
-lib/libb10-cfgclient.la
 lib/libb10-cfgclient.so
-lib/libb10-cfgclient.so.1
+lib/libb10-cfgclient.so.0
+lib/libb10-cfgclient.so.0.1.0
 lib/libb10-cryptolink.a
-lib/libb10-cryptolink.la
 lib/libb10-cryptolink.so
 lib/libb10-cryptolink.so.0
+lib/libb10-cryptolink.so.0.0.0
 lib/libb10-datasrc.a
-lib/libb10-datasrc.la
 lib/libb10-datasrc.so
-lib/libb10-datasrc.so.1
+lib/libb10-datasrc.so.0
+lib/libb10-datasrc.so.0.1.0
 lib/libb10-dhcp++.a
-lib/libb10-dhcp++.la
 lib/libb10-dhcp++.so
 lib/libb10-dhcp++.so.2
+lib/libb10-dhcp++.so.2.0.0
 lib/libb10-dhcp_ddns.a
-lib/libb10-dhcp_ddns.la
 lib/libb10-dhcp_ddns.so
 lib/libb10-dhcp_ddns.so.0
+lib/libb10-dhcp_ddns.so.0.0.0
 lib/libb10-dhcpsrv.a
-lib/libb10-dhcpsrv.la
 lib/libb10-dhcpsrv.so
 lib/libb10-dhcpsrv.so.3
+lib/libb10-dhcpsrv.so.3.0.0
 lib/libb10-dns++.a
-lib/libb10-dns++.la
 lib/libb10-dns++.so
 lib/libb10-dns++.so.2
+lib/libb10-dns++.so.2.0.0
 lib/libb10-dnsacl.a
-lib/libb10-dnsacl.la
 lib/libb10-dnsacl.so
 lib/libb10-dnsacl.so.0
+lib/libb10-dnsacl.so.0.0.0
 lib/libb10-exceptions.a
-lib/libb10-exceptions.la
 lib/libb10-exceptions.so
 lib/libb10-exceptions.so.0
+lib/libb10-exceptions.so.0.0.0
 lib/libb10-hooks.a
-lib/libb10-hooks.la
 lib/libb10-hooks.so
 lib/libb10-hooks.so.0
+lib/libb10-hooks.so.0.0.0
 lib/libb10-log.a
-lib/libb10-log.la
 lib/libb10-log.so
 lib/libb10-log.so.1
+lib/libb10-log.so.1.0.0
 lib/libb10-nsas.a
-lib/libb10-nsas.la
 lib/libb10-nsas.so
 lib/libb10-nsas.so.0
+lib/libb10-nsas.so.0.0.0
 lib/libb10-pydnspp.a
-lib/libb10-pydnspp.la
 lib/libb10-pydnspp.so
 lib/libb10-pydnspp.so.0
+lib/libb10-pydnspp.so.0.0.0
 lib/libb10-server-common.a
-lib/libb10-server-common.la
 lib/libb10-server-common.so
 lib/libb10-server-common.so.0
+lib/libb10-server-common.so.0.0.0
 lib/libb10-threads.a
-lib/libb10-threads.la
 lib/libb10-threads.so
 lib/libb10-threads.so.0
+lib/libb10-threads.so.0.0.0
 lib/libb10-util-io.a
-lib/libb10-util-io.la
 lib/libb10-util-io.so
 lib/libb10-util-io.so.0
+lib/libb10-util-io.so.0.0.0
 lib/libb10-util.a
-lib/libb10-util.la
 lib/libb10-util.so
 lib/libb10-util.so.0
+lib/libb10-util.so.0.0.0
 lib/libb10-xfr.a
-lib/libb10-xfr.la
 lib/libb10-xfr.so
 lib/libb10-xfr.so.0
+lib/libb10-xfr.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bind10_config.py
 %%PYTHON_SITELIBDIR%%/bind10_config.pyc
 %%PYTHON_SITELIBDIR%%/bind10_config.pyo
@@ -495,10 +495,8 @@ lib/libb10-xfr.so.0
 %%PYTHON_SITELIBDIR%%/isc/acl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/isc/acl/__init__.pyo
 %%PYTHON_SITELIBDIR%%/isc/acl/_dns.a
-%%PYTHON_SITELIBDIR%%/isc/acl/_dns.la
 %%PYTHON_SITELIBDIR%%/isc/acl/_dns.so
 %%PYTHON_SITELIBDIR%%/isc/acl/acl.a
-%%PYTHON_SITELIBDIR%%/isc/acl/acl.la
 %%PYTHON_SITELIBDIR%%/isc/acl/acl.so
 %%PYTHON_SITELIBDIR%%/isc/acl/dns.py
 %%PYTHON_SITELIBDIR%%/isc/acl/dns.pyc
@@ -555,7 +553,6 @@ lib/libb10-xfr.so.0
 %%PYTHON_SITELIBDIR%%/isc/datasrc/__init__.pyc
 %%PYTHON_SITELIBDIR%%/isc/datasrc/__init__.pyo
 %%PYTHON_SITELIBDIR%%/isc/datasrc/datasrc.a
-%%PYTHON_SITELIBDIR%%/isc/datasrc/datasrc.la
 %%PYTHON_SITELIBDIR%%/isc/datasrc/datasrc.so
 %%PYTHON_SITELIBDIR%%/isc/datasrc/sqlite3_ds.py
 %%PYTHON_SITELIBDIR%%/isc/datasrc/sqlite3_ds.pyc
@@ -576,7 +573,6 @@ lib/libb10-xfr.so.0
 %%PYTHON_SITELIBDIR%%/isc/dns/__init__.pyc
 %%PYTHON_SITELIBDIR%%/isc/dns/__init__.pyo
 %%PYTHON_SITELIBDIR%%/isc/log.a
-%%PYTHON_SITELIBDIR%%/isc/log.la
 %%PYTHON_SITELIBDIR%%/isc/log.so
 %%PYTHON_SITELIBDIR%%/isc/log_messages/__init__.py
 %%PYTHON_SITELIBDIR%%/isc/log_messages/__init__.pyc
@@ -717,7 +713,6 @@ lib/libb10-xfr.so.0
 %%PYTHON_SITELIBDIR%%/isc/util/cio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/isc/util/cio/__init__.pyo
 %%PYTHON_SITELIBDIR%%/isc/util/cio/socketsession.a
-%%PYTHON_SITELIBDIR%%/isc/util/cio/socketsession.la
 %%PYTHON_SITELIBDIR%%/isc/util/cio/socketsession.so
 %%PYTHON_SITELIBDIR%%/isc/util/file.py
 %%PYTHON_SITELIBDIR%%/isc/util/file.pyc
@@ -738,10 +733,8 @@ lib/libb10-xfr.so.0
 %%PYTHON_SITELIBDIR%%/isc/xfrin/diff.pyc
 %%PYTHON_SITELIBDIR%%/isc/xfrin/diff.pyo
 %%PYTHON_SITELIBDIR%%/libutil_io_python.a
-%%PYTHON_SITELIBDIR%%/libutil_io_python.la
 %%PYTHON_SITELIBDIR%%/libutil_io_python.so
 %%PYTHON_SITELIBDIR%%/pydnspp.a
-%%PYTHON_SITELIBDIR%%/pydnspp.la
 %%PYTHON_SITELIBDIR%%/pydnspp.so
 libdata/pkgconfig/dns++.pc
 libexec/bind10/b10-auth
@@ -761,7 +754,6 @@ libexec/bind10/b10-xfrin
 libexec/bind10/b10-xfrout
 libexec/bind10/b10-zonemgr
 libexec/bind10/backends/sqlite3_ds.a
-libexec/bind10/backends/sqlite3_ds.la
 libexec/bind10/backends/sqlite3_ds.so
 man/man1/b10-certgen.1.gz
 man/man1/bindctl.1.gz