4 files changed, 202 insertions, 197 deletions

diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index 05cee416030d..e150ce86bcc4 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bundy
-PORTVERSION=	0.20140524
-PORTREVISION=	1
+PORTVERSION=	0.20140822
 CATEGORIES=	dns
 MASTER_SITES=	GH GHC LOCAL/mat/bundy
 
@@ -19,26 +18,24 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/interprocess/sync/interprocess_upgradable_mutex.hpp:${PORTSDIR}/devel/boost-libs \
 		${LOCALBASE}/include/log4cplus/logger.h:${PORTSDIR}/devel/log4cplus \
 		sqlite3>=3.3.9:${PORTSDIR}/databases/sqlite3 \
-		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 LIB_DEPENDS=	libbotan-1.10.so:${PORTSDIR}/security/botan110 \
 		liblog4cplus.so:${PORTSDIR}/devel/log4cplus \
 		libicuuc.so:${PORTSDIR}/devel/icu \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3
-RUN_DEPENDS=	${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bundy-dns
-GH_COMMIT=	b809bfb
+GH_COMMIT=	af90337
 GH_TAGNAME=	${GH_COMMIT}
 
-USE_PYTHON=	3
 USE_OPENSSL=	yes
 
-USES=	compiler:c++11-lang pathfix pkgconfig libtool
+USES=	compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf
 
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	aclocal autoconf automake autoheader libtoolize
 PATHFIX_MAKEFILEIN=	Makefile.am
 ACLOCAL_ARGS=	-I m4macros
 AUTOMAKE_ARGS=	--add-missing
@@ -49,7 +46,7 @@ CONFIGURE_ARGS=	--localstatedir=/var	\
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
+PLIST_SUB=	PYTHON_SUFFIX=cpython-${PYTHON_SUFFIX}
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem ${STAGEDIR}${ETCDIR}/cmdctl-certfile.pem.sample
diff --git a/dns/bundy/distinfo b/dns/bundy/distinfo
index 1d03fe7b83e4..5b0ef6925218 100644
--- a/dns/bundy/distinfo
+++ b/dns/bundy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bundy-0.20140524.tar.gz) = 86c43788d7ba4ce5e8dc9c49970173e3687d0b0df786b9b8c9e9f028d2fe07b6
-SIZE (bundy-0.20140524.tar.gz) = 5253900
+SHA256 (bundy-0.20140822.tar.gz) = b82b1f925509ffc89d3b5831fb175a56ffcc1de6e6d910e5f2df23b70ad6361a
+SIZE (bundy-0.20140822.tar.gz) = 5312386
diff --git a/dns/bundy/files/patch-configure.ac b/dns/bundy/files/patch-configure.ac
index 107dbd14e2aa..4a0b5ee3ebc1 100644
--- a/dns/bundy/files/patch-configure.ac
+++ b/dns/bundy/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- ./configure.ac.orig	2014-05-10 18:58:02.000000000 +0200
-+++ ./configure.ac	2014-05-12 22:32:30.000000000 +0200
+--- configure.ac.orig	2014-08-22 06:39:30 UTC
++++ configure.ac
 @@ -110,7 +110,7 @@
  CXXFLAGS_SAVED=$CXXFLAGS
  CFLAGS="$CFLAGS $CXX_LIBTOOL_LDFLAGS"
diff --git a/dns/bundy/pkg-plist b/dns/bundy/pkg-plist
index b995f8bd463f..052d52de0291 100644
--- a/dns/bundy/pkg-plist
+++ b/dns/bundy/pkg-plist
@@ -388,6 +388,10 @@ lib/libbundy-asiolink.a
 lib/libbundy-asiolink.so
 lib/libbundy-asiolink.so.0
 lib/libbundy-asiolink.so.0.1.0
+lib/libbundy-auth.a
+lib/libbundy-auth.so
+lib/libbundy-auth.so.0
+lib/libbundy-auth.so.0.0.0
 lib/libbundy-cc.a
 lib/libbundy-cc.so
 lib/libbundy-cc.so.0
@@ -460,143 +464,139 @@ lib/libbundy-util.a
 lib/libbundy-util.so
 lib/libbundy-util.so.0
 lib/libbundy-util.so.0.0.0
-lib/libbundy-xfr.a
-lib/libbundy-xfr.so
-lib/libbundy-xfr.so.0
-lib/libbundy-xfr.so.0.0.0
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/acl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.a
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.so
 %%PYTHON_SITELIBDIR%%/bundy/acl/acl.a
 %%PYTHON_SITELIBDIR%%/bundy/acl/acl.so
 %%PYTHON_SITELIBDIR%%/bundy/acl/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/socket_cache.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/bundy/component.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/sockcreator.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/socket_cache.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/special_component.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/proto_defs.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/cc/data.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/message.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/proto_defs.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/session.py
 %%PYTHON_SITELIBDIR%%/bundy/config/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/config_data.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/config/ccsession.py
 %%PYTHON_SITELIBDIR%%/bundy/config/cfgmgr.py
 %%PYTHON_SITELIBDIR%%/bundy/config/config_data.py
 %%PYTHON_SITELIBDIR%%/bundy/config/module_spec.py
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.a
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/datasrc.so
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/sqlite3_ds.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/ddns/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/session.py
 %%PYTHON_SITELIBDIR%%/bundy/ddns/zone_config.py
 %%PYTHON_SITELIBDIR%%/bundy/dns/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/log.a
 %%PYTHON_SITELIBDIR%%/bundy/log.so
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cfgmgr_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/cmdctl_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/config_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/dbutil_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/ddns_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/init_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libddns_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libmemmgr_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/libxfrin_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/loadzone_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/memmgr_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/msgq_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/notify_out_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/pycc_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/server_common_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_httpd_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/stats_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/util_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrin_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/xfrout_messages.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/log_messages/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cfgmgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cmdctl_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/config_messages.py
@@ -619,47 +619,47 @@ lib/libbundy-xfr.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/xfrout_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/zonemgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/datasrc_info.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/builder.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/datasrc_info.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/net/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/net/addr.py
 %%PYTHON_SITELIBDIR%%/bundy/net/parse.py
 %%PYTHON_SITELIBDIR%%/bundy/notify/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/notify/notify_out.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/auth_command.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/bundy_server.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/dns_tcp.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/server_common/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/server_common/auth_command.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/bundy_server.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/datasrc_clients_mgr.py
@@ -667,37 +667,37 @@ lib/libbundy-xfr.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/server_common/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/tsig_keyring.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/statistics/counters.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/sysinfo.py
 %%PYTHON_SITELIBDIR%%/bundy/util/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/address_formatter.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/socketserver_mixin.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/util/address_formatter.py
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/util/cio/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.a
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.so
 %%PYTHON_SITELIBDIR%%/bundy/util/file.py
@@ -705,27 +705,27 @@ lib/libbundy-xfr.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/util/socketserver_mixin.py
 %%PYTHON_SITELIBDIR%%/bundy/util/traceback_handler.py
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/__init__.py
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/diff.py
 %%PYTHON_SITELIBDIR%%/bundy_config.py
 %%PYTHON_SITELIBDIR%%/bundyctl/__init__.py
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.cpython-33.pyo
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyo
 %%PYTHON_SITELIBDIR%%/bundyctl/bindcmd.py
 %%PYTHON_SITELIBDIR%%/bundyctl/cmdparse.py
 %%PYTHON_SITELIBDIR%%/bundyctl/command_sets.py
@@ -783,12 +783,12 @@ sbin/bundy
 sbin/bundy-cmdctl-usermgr
 %%DATADIR%%/auth.spec
 %%DATADIR%%/cmdctl.spec
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-33.pyc
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.cpython-33.pyo
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-33.pyc
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.cpython-33.pyo
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-33.pyc
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.cpython-33.pyo
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyo
 %%DATADIR%%/config_plugins/bundylogging.py
 %%DATADIR%%/config_plugins/datasrc.spec
 %%DATADIR%%/config_plugins/datasrc_config_plugin.py
@@ -813,6 +813,14 @@ sbin/bundy-cmdctl-usermgr
 %%DATADIR%%/xfrin.spec
 %%DATADIR%%/xfrout.spec
 %%DATADIR%%/zonemgr.spec
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/bundy-guide.css
+%%PORTDOCS%%%%DOCSDIR%%/bundy-guide.html
+%%PORTDOCS%%%%DOCSDIR%%/bundy-guide.txt
+%%PORTDOCS%%%%DOCSDIR%%/bundy-messages.html
 @dirrmtry %%ETCDIR%%
 @dirrmtry include/bundy/asio/detail/impl
 @dirrmtry include/bundy/asio/detail
@@ -881,5 +889,5 @@ sbin/bundy-cmdctl-usermgr
 @dirrmtry %%DATADIR%%/config_plugins
 @dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@unexec rmdir "/var/bundy/mapped_files" >/dev/null 2>&1 || :
-@unexec rmdir "/var/bundy" >/dev/null 2>&1 || :
+@dirrmtry /var/bundy/mapped_files
+@dirrmtry /var/bundy