CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 30 Jun 2016 18:03:47 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun 30 18:03:46 UTC 2016

Modified Files:
        pkgsrc/chat/py-xmpppy: Makefile
        pkgsrc/doc/guide/files: creating.xml
        pkgsrc/lang/python: versioned_dependencies.mk
        pkgsrc/mail/py-spf: Makefile
        pkgsrc/misc/calibre: Makefile
        pkgsrc/misc/calibre1: Makefile
        pkgsrc/security/sshfp: Makefile

Log Message:
Switch to direct py-dns dependency.

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


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/py-xmpppy/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/doc/guide/files/creating.xml
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/python/versioned_dependencies.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/py-spf/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/misc/calibre1/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/sshfp/Makefile

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

Modified files:

Index: pkgsrc/chat/py-xmpppy/Makefile
diff -u pkgsrc/chat/py-xmpppy/Makefile:1.10 pkgsrc/chat/py-xmpppy/Makefile:1.11
--- pkgsrc/chat/py-xmpppy/Makefile:1.10 Sat Dec  5 21:25:30 2015
+++ pkgsrc/chat/py-xmpppy/Makefile      Thu Jun 30 18:03:46 2016
@@ -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 @@ HOMEPAGE=   http://xmpppy.sourceforge.net/
 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 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/doc/*.css \
                ${DESTDIR}${DOCDIR}
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/doc/guide/files/creating.xml
diff -u pkgsrc/doc/guide/files/creating.xml:1.20 pkgsrc/doc/guide/files/creating.xml:1.21
--- pkgsrc/doc/guide/files/creating.xml:1.20    Tue Jan 12 12:03:39 2016
+++ pkgsrc/doc/guide/files/creating.xml Thu Jun 30 18:03:46 2016
@@ -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 @@ packages that should be depended upon an
 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>

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.23 pkgsrc/lang/python/versioned_dependencies.mk:1.24
--- pkgsrc/lang/python/versioned_dependencies.mk:1.23   Thu Jun 30 17:45:30 2016
+++ pkgsrc/lang/python/versioned_dependencies.mk        Thu Jun 30 18:03:46 2016
@@ -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+=X textproc/py-X2 te
 _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

Index: pkgsrc/mail/py-spf/Makefile
diff -u pkgsrc/mail/py-spf/Makefile:1.7 pkgsrc/mail/py-spf/Makefile:1.8
--- pkgsrc/mail/py-spf/Makefile:1.7     Sun Jun 26 20:10:23 2016
+++ pkgsrc/mail/py-spf/Makefile Thu Jun 30 18:03:46 2016
@@ -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 @@ HOMEPAGE=     https://pypi.python.org/pypi/p
 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"

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.144 pkgsrc/misc/calibre/Makefile:1.145
--- pkgsrc/misc/calibre/Makefile:1.144  Thu Jun 30 17:41:17 2016
+++ pkgsrc/misc/calibre/Makefile        Thu Jun 30 18:03:46 2016
@@ -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+=     xdg-utils>=1.0.2:../../misc/xd
 #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}-netifaces>=0.8:
 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
 

Index: pkgsrc/misc/calibre1/Makefile
diff -u pkgsrc/misc/calibre1/Makefile:1.15 pkgsrc/misc/calibre1/Makefile:1.16
--- pkgsrc/misc/calibre1/Makefile:1.15  Sun May 22 18:20:47 2016
+++ pkgsrc/misc/calibre1/Makefile       Thu Jun 30 18:03:46 2016
@@ -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+=     xdg-utils>=1.0.2:../../misc/xd
 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}-chardet-[0-9]*:
 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.

Index: pkgsrc/security/sshfp/Makefile
diff -u pkgsrc/security/sshfp/Makefile:1.10 pkgsrc/security/sshfp/Makefile:1.11
--- pkgsrc/security/sshfp/Makefile:1.10 Sat May 17 16:10:48 2014
+++ pkgsrc/security/sshfp/Makefile      Thu Jun 30 18:03:46 2016
@@ -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 @@ HOMEPAGE=   http://www.xelerance.com/softw
 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: CVS commit: pkgsrc/fonts/py-fonttools
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/fonts/py-fonttools
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index