various packages: use plain py-dns dependency.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Jun 30 20:01:54 2016 +0200
Changeset:	083c9a9f522bdc48569a2602bba05d2b5e286644

Modified Files:
	py-dns-clientsubnetoption/Makefile
	py-jabber-yahoo-transport/Makefile
	spade/Makefile
	trac-plugins-spamfilter/Makefile

Log Message:
various packages: use plain py-dns dependency.

The package now supports all python versions, so
versioned_dependencies is not needed any longer.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=083c9a9f522bdc48569a2602bba05d2b5e286644

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-dns-clientsubnetoption/Makefile | 2 +-
 py-jabber-yahoo-transport/Makefile | 3 +--
 spade/Makefile                     | 3 +--
 trac-plugins-spamfilter/Makefile   | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diffs:
diff --git a/py-dns-clientsubnetoption/Makefile b/py-dns-clientsubnetoption/Makefile
index 9af625f..f917db4 100644
--- a/py-dns-clientsubnetoption/Makefile
+++ b/py-dns-clientsubnetoption/Makefile
@@ -14,7 +14,7 @@ LICENSE=	modified-bsd
 # note the LICENSE document is missing part of final sentence
 # I reported this to them.
 
-PYTHON_VERSIONED_DEPENDENCIES+=	dns
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 EGG_NAME=	clientsubnetoption-${PKGVERSION_NOREV}
 
 .include "../../lang/python/egg.mk"
diff --git a/py-jabber-yahoo-transport/Makefile b/py-jabber-yahoo-transport/Makefile
index 6a1866d..9ce2fe1 100644
--- a/py-jabber-yahoo-transport/Makefile
+++ b/py-jabber-yahoo-transport/Makefile
@@ -16,10 +16,10 @@ LICENSE=		gnu-gpl-v2
 # do that..)
 #
 # DEPENDS+=	jabberd-[0-9]*:../../chat/jabberd2
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
 DEPENDS+=	${PYPKGPREFIX}-xmpppy>=0.4.1:../../chat/py-xmpppy
 
-PYTHON_VERSIONED_DEPENDENCIES=	dns
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-xmpppy
 
 # Fifth paragraph - all build definitions that describe things used by
@@ -81,6 +81,5 @@ SUBST_SED.paths+=	-e 's,@JABBER_LOGDIR@,${JABBER_LOGDIR},g'
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@JABBER_PIDDIR@,${JABBER_PIDDIR},g'
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/spade/Makefile b/spade/Makefile
index 06720d7..46d02f9 100644
--- a/spade/Makefile
+++ b/spade/Makefile
@@ -10,6 +10,7 @@ HOMEPAGE=	http://code.google.com/p/spade2/
 COMMENT=	SPADE is an agent platform based on the XMPP/Jabber technology
 LICENSE=	gnu-lgpl-v2.1
 
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-gmpy>=1.01:../../math/py-gmpy
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto
@@ -20,7 +21,6 @@ DEPENDS+=	jython>=2.5.1:../../wip/jython
 WRKSRC=	${WRKDIR}/spade
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONED_DEPENDENCIES=	dns
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-m2crypto, py-twisted
 
@@ -45,5 +45,4 @@ do-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/trac-plugins-spamfilter/Makefile b/trac-plugins-spamfilter/Makefile
index 1763c4d..7f42360 100644
--- a/trac-plugins-spamfilter/Makefile
+++ b/trac-plugins-spamfilter/Makefile
@@ -12,8 +12,7 @@ HOMEPAGE=	http://trac.edgewall.org/wiki/SpamFilter
 COMMENT=	Spam Filter plugin for Trac
 
 DEPENDS+=	trac>=0.12:../../www/trac
-
-PYTHON_VERSIONED_DEPENDENCIES=	dns
+DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 0.3.2dev/9935
 
@@ -30,7 +29,6 @@ PRIVILEGED_STAGES+=	clean
 post-extract:
 	find ${WRKSRC} -type d -name .svn -print | xargs rm -r
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../wip/mk/svn-package.mk"
 .include "../../mk/bsd.pkg.mk"