Fix-ish the build WITH=PYTHON

Pointy hat to:	mat (for testing a snapshot and commiting another.)
Sponsored by:	Absolight

4 files changed, 50 insertions, 1 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index ab5d707c403a..f459df44ad06 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -130,8 +130,10 @@ GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
-PYTHON_CONFIGURE_WITH=	python
+PYTHON_CONFIGURE_WITH=	python=${PYTHON_CMD}
 PYTHON_USES=	python
+PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply
 
 DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
 DLZ_POSTGRESQL_USES=		pgsql
diff --git a/dns/bind9-devel/files/patch-bin_python_Makefile.in b/dns/bind9-devel/files/patch-bin_python_Makefile.in
new file mode 100644
index 000000000000..a1fd9e8ad46b
--- /dev/null
+++ b/dns/bind9-devel/files/patch-bin_python_Makefile.in
@@ -0,0 +1,10 @@
+--- bin/python/Makefile.in.orig	2016-04-29 05:30:53 UTC
++++ bin/python/Makefile.in
+@@ -58,7 +58,6 @@ install:: ${TARGETS} installdirs
+ 	${INSTALL_SCRIPT} dnssec-keymgr ${DESTDIR}${sbindir}
+ 	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
+ 	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
+-	${INSTALL_DATA} ${srcdir}/dnssec-keymgr.8 ${DESTDIR}${mandir}/man8
+ 
+ clean distclean::
+ 	rm -f ${TARGETS}
diff --git a/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in b/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in
new file mode 100644
index 000000000000..5e204c2b970c
--- /dev/null
+++ b/dns/bind9-devel/files/patch-bin_python_isc_Makefile.in
@@ -0,0 +1,20 @@
+--- bin/python/isc/Makefile.in.orig	2016-04-29 05:30:53 UTC
++++ bin/python/isc/Makefile.in
+@@ -30,7 +30,9 @@ TARGETS =	parsetab.py parsetab.pyc \
+ 
+ @BIND9_MAKE_RULES@
+ 
+-%.pyc: %.py
++.SUFFIXES: .py .pyc
++
++.py.pyc:
+ 	$(PYTHON) -m compileall .
+ 
+ parsetab.py parsetab.pyc: policy.py
+@@ -64,4 +66,4 @@ clean distclean::
+ 	rm -f *.pyc parser.out parsetab.py
+ 
+ distclean::
+-	rm -Rf utils.py
+\ No newline at end of file
++	rm -Rf utils.py
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 11995775900e..b33cfdd53b8c 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -257,6 +257,18 @@ include/pkcs11/cryptoki.h
 include/pkcs11/pkcs11.h
 include/pkcs11/pkcs11f.h
 include/pkcs11/pkcs11t.h
+%%PYTHON%%lib/__init__.py
+%%PYTHON%%lib/__init__.pyc
+%%PYTHON%%lib/dnskey.py
+%%PYTHON%%lib/dnskey.pyc
+%%PYTHON%%lib/eventlist.py
+%%PYTHON%%lib/eventlist.pyc
+%%PYTHON%%lib/keydict.py
+%%PYTHON%%lib/keydict.pyc
+%%PYTHON%%lib/keyevent.py
+%%PYTHON%%lib/keyevent.pyc
+%%PYTHON%%lib/keyzone.py
+%%PYTHON%%lib/keyzone.pyc
 lib/libbind9.a
 lib/libdns.a
 lib/libirs.a
@@ -264,6 +276,10 @@ lib/libisc.a
 lib/libisccc.a
 lib/libisccfg.a
 lib/liblwres.a
+%%PYTHON%%lib/parsetab.py
+%%PYTHON%%lib/parsetab.pyc
+%%PYTHON%%lib/policy.py
+%%PYTHON%%lib/policy.pyc
 man/man1/arpaname.1.gz
 man/man1/bind9-config.1.gz
 man/man1/delv.1.gz
@@ -397,6 +413,7 @@ sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
 sbin/dnssec-keygen
+%%PYTHON%%sbin/dnssec-keymgr
 sbin/dnssec-revoke
 sbin/dnssec-settime
 sbin/dnssec-signzone