[pkgsrc/trunk]: pkgsrc Switch to direct py-dns dependency.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Switch to direct py-dns dependency.
From: wiz <wiz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 05:35:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d91398da6077
branches:  trunk
changeset: 349161:d91398da6077
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jun 30 18:03:46 2016 +0000

description:
Switch to direct py-dns dependency.

py-dns now supports all python versions, so versioned_dependencies
is not needed any longer.

diffstat:

 chat/py-xmpppy/Makefile               |  5 ++---
 doc/guide/files/creating.xml          |  4 ++--
 lang/python/versioned_dependencies.mk |  3 +--
 mail/py-spf/Makefile                  |  4 ++--
 misc/calibre/Makefile                 |  6 +++---
 misc/calibre1/Makefile                |  5 +++--
 security/sshfp/Makefile               |  5 ++---
 7 files changed, 15 insertions(+), 17 deletions(-)

diffs (159 lines):

diff -r b21607e674e5 -r d91398da6077 chat/py-xmpppy/Makefile
--- a/chat/py-xmpppy/Makefile   Thu Jun 30 17:56:35 2016 +0000
+++ b/chat/py-xmpppy/Makefile   Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/12/05 21:25:30 adam Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/30 18:03:46 wiz Exp $
 
 DISTNAME=      xmpppy-0.5.0rc1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,12 @@
 COMMENT=       XMPP (Jabber) library for Python
 LICENSE=       gnu-gpl-v2
 
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
 
 USE_LANGUAGES= # none
 
 PYDISTUTILSPKG=                yes
-PYTHON_VERSIONED_DEPENDENCIES= dns
 PYTHON_VERSIONS_INCOMPATIBLE=  33 34 35 # not yet ported as of 0.5.0rc1
 
 DOCDIR=                ${PREFIX}/share/doc/py-xmpppy
@@ -36,6 +36,5 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
                ${DESTDIR}${DOCDIR}
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b21607e674e5 -r d91398da6077 doc/guide/files/creating.xml
--- a/doc/guide/files/creating.xml      Thu Jun 30 17:56:35 2016 +0000
+++ b/doc/guide/files/creating.xml      Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: creating.xml,v 1.20 2016/01/12 12:03:39 wiz Exp $ -->
+<!-- $NetBSD: creating.xml,v 1.21 2016/06/30 18:03:46 wiz Exp $ -->
 
 <chapter id="creating">
 <title>Creating a new pkgsrc package from scratch</title>
@@ -189,7 +189,7 @@
 then the pkgsrc infrastructure will depend on the appropriate package
 version. For example:
 <programlisting>
-PYTHON_VERSIONED_DEPENDENCIES=dateutil dns
+PYTHON_VERSIONED_DEPENDENCIES=dateutil
 </programlisting>
 Look inside <filename>versioned_dependencies.mk</filename> for a list
 of supported packages.</para>
diff -r b21607e674e5 -r d91398da6077 lang/python/versioned_dependencies.mk
--- a/lang/python/versioned_dependencies.mk     Thu Jun 30 17:56:35 2016 +0000
+++ b/lang/python/versioned_dependencies.mk     Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.23 2016/06/30 17:45:30 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.24 2016/06/30 18:03:46 wiz Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -21,7 +21,6 @@
 _SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
 _SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil
 _SUPPORTED_PACKAGES+=dialog devel/py-dialog2 devel/py-dialog
-_SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns
 _SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3
 _SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3
 _SUPPORTED_PACKAGES+=gobject devel/py-gobject devel/py-gobject3
diff -r b21607e674e5 -r d91398da6077 mail/py-spf/Makefile
--- a/mail/py-spf/Makefile      Thu Jun 30 17:56:35 2016 +0000
+++ b/mail/py-spf/Makefile      Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/26 20:10:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/06/30 18:03:46 wiz Exp $
 
 VERSION=       2.0.8
 DISTNAME=      pyspf-${VERSION}
@@ -11,7 +11,7 @@
 COMMENT=       Python implementation of the RFC 4408 SPF protocol
 LICENSE=       python-software-foundation
 
-PYTHON_VERSIONED_DEPENDENCIES+=        dns
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b21607e674e5 -r d91398da6077 misc/calibre/Makefile
--- a/misc/calibre/Makefile     Thu Jun 30 17:56:35 2016 +0000
+++ b/misc/calibre/Makefile     Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2016/06/30 17:41:17 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2016/06/30 18:03:46 wiz Exp $
 
 DISTNAME=      calibre-2.60.0
 CATEGORIES=    misc
@@ -19,6 +19,7 @@
 #DEPENDS+=     poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=      ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=      ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
@@ -32,8 +33,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
 
 # dateutil>=1.4.1
-# dns>=1.6.0
-PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
 
 EXTRACT_USING=  bsdtar
 
diff -r b21607e674e5 -r d91398da6077 misc/calibre1/Makefile
--- a/misc/calibre1/Makefile    Thu Jun 30 17:56:35 2016 +0000
+++ b/misc/calibre1/Makefile    Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/05/22 18:20:47 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/30 18:03:46 wiz Exp $
 
 DISTNAME=      calibre-1.48.0
 PKGREVISION=   17
@@ -18,6 +18,7 @@
 DEPENDS+=      poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=      ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=      ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
@@ -29,7 +30,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
 DEPENDS+=      ${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
 
-PYTHON_VERSIONED_DEPENDENCIES= dateutil dns
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
 
 # We also need the distfile for qt4-libs to extract some private header files
 # If QTVERSION changes, the distinfo file needs to be updated too.
diff -r b21607e674e5 -r d91398da6077 security/sshfp/Makefile
--- a/security/sshfp/Makefile   Thu Jun 30 17:56:35 2016 +0000
+++ b/security/sshfp/Makefile   Thu Jun 30 18:03:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:48 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/30 18:03:46 wiz Exp $
 
 DISTNAME=      sshfp-1.1.3
 PKGREVISION=   4
@@ -10,12 +10,11 @@
 COMMENT=       Print ssh host key fingerprint resource records
 LICENSE=       gnu-gpl-v2
 
-PYTHON_VERSIONED_DEPENDENCIES= dns
+DEPENDS+=      ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 
 MANCOMPRESSED=                 yes
 NO_BUILD=                      yes
 REPLACE_PYTHON=                sshfp
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Added net/py-dnsdiag version 1.5.0
Next by Date: [pkgsrc/trunk]: pkgsrc/fonts/py-fonttools Add ALTERNATIVES file for py-fontto...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Added net/py-dnsdiag version 1.5.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/fonts/py-fonttools Add ALTERNATIVES file for py-fontto...
Indexes:
Home | Main Index | Thread Index | Old Index