Fix packaging with python 3.5 and also installs stripped shared

libraries.

PR:		207761
Submitted by:	rm
Sponsored by:	Absolight

2 files changed, 102 insertions, 91 deletions

diff --git a/dns/bundy/Makefile b/dns/bundy/Makefile
index 3369a64c52b6..5bf76558f847 100644
--- a/dns/bundy/Makefile
+++ b/dns/bundy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bundy
 PORTVERSION=	0.20160125
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	LOCAL/mat/bundy GH
 
@@ -41,6 +41,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var	\
 		--without-werror \
 		--enable-install-configurations
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
@@ -50,4 +51,14 @@ 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
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
+PLIST_SUB+=	PYOEXTENSION=${PYOEXTENSION}
+
+.include <bsd.port.post.mk>
diff --git a/dns/bundy/pkg-plist b/dns/bundy/pkg-plist
index 21bd71c7863a..9471b064cf27 100644
--- a/dns/bundy/pkg-plist
+++ b/dns/bundy/pkg-plist
@@ -465,15 +465,15 @@ lib/libbundy-util.so
 lib/libbundy-util.so.0
 lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/__pycache__/bundy_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/acl/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/acl/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.a
 %%PYTHON_SITELIBDIR%%/bundy/acl/_dns.so
 %%PYTHON_SITELIBDIR%%/bundy/acl/acl.a
@@ -481,32 +481,32 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/acl/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/sockcreator.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/socket_cache.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/bundy/__pycache__/special_component.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/message.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/proto_defs.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/cc/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/cc/data.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/logger.py
 %%PYTHON_SITELIBDIR%%/bundy/cc/message.py
@@ -514,89 +514,89 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/cc/session.py
 %%PYTHON_SITELIBDIR%%/bundy/config/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/ccsession.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/cfgmgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/config_data.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/config/__pycache__/module_spec.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/datasrc/__pycache__/sqlite3_ds.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/session.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/ddns/__pycache__/zone_config.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/dns/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/log.a
 %%PYTHON_SITELIBDIR%%/bundy/log.so
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/__init__.py
 %%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__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/cfgmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/cmdctl_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/config_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/dbutil_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/ddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/init_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/libddns_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/libmemmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/libxfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/loadzone_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/memmgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/msgq_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/notify_out_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/pycc_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/server_common_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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_httpd_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/stats_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/util_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/xfrin_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/xfrout_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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/__pycache__/zonemgr_messages.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cfgmgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/cmdctl_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/config_messages.py
@@ -620,46 +620,46 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/log_messages/zonemgr_messages.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/builder.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/datasrc_info.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/memmgr/__pycache__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/addr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/net/__pycache__/parse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/net/addr.py
 %%PYTHON_SITELIBDIR%%/bundy/net/parse.py
 %%PYTHON_SITELIBDIR%%/bundy/notify/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/notify/__pycache__/notify_out.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/notify/notify_out.py
 %%PYTHON_SITELIBDIR%%/bundy/server_common/__init__.py
 %%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__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/auth_command.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/bundy_server.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/datasrc_clients_mgr.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/dns_tcp.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/logger.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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/__pycache__/tsig_keyring.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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
@@ -668,36 +668,36 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/server_common/tsig_keyring.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/counters.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/statistics/__pycache__/dns.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/statistics/counters.py
 %%PYTHON_SITELIBDIR%%/bundy/statistics/dns.py
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/sysinfo/__pycache__/sysinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/sysinfo/sysinfo.py
 %%PYTHON_SITELIBDIR%%/bundy/util/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/address_formatter.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/file.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/process.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%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__/socketserver_mixin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/util/__pycache__/traceback_handler.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/address_formatter.py
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/__init__.py
 %%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/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.a
 %%PYTHON_SITELIBDIR%%/bundy/util/cio/socketsession.so
 %%PYTHON_SITELIBDIR%%/bundy/util/file.py
@@ -706,26 +706,26 @@ lib/libbundy-util.so.0.0.0
 %%PYTHON_SITELIBDIR%%/bundy/util/traceback_handler.py
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/__init__.py
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundy/xfrin/__pycache__/diff.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundy/xfrin/diff.py
 %%PYTHON_SITELIBDIR%%/bundy_config.py
 %%PYTHON_SITELIBDIR%%/bundyctl/__init__.py
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/__init__.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/bindcmd.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/cmdparse.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/command_sets.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/exception.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/moduleinfo.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.pyo
+%%PYTHON_SITELIBDIR%%/bundyctl/__pycache__/mycollections.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/bundyctl/bindcmd.py
 %%PYTHON_SITELIBDIR%%/bundyctl/cmdparse.py
 %%PYTHON_SITELIBDIR%%/bundyctl/command_sets.py
@@ -784,11 +784,11 @@ sbin/bundy-cmdctl-usermgr
 %%DATADIR%%/auth.spec
 %%DATADIR%%/cmdctl.spec
 %%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/config_plugins/__pycache__/bundylogging.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/config_plugins/__pycache__/datasrc_config_plugin.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/config_plugins/__pycache__/tsig_keys.%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/config_plugins/bundylogging.py
 %%DATADIR%%/config_plugins/datasrc.spec
 %%DATADIR%%/config_plugins/datasrc_config_plugin.py