 @@ -1,41 +1,40 @@
-# $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}
 PKGREVISION=	3
 CATEGORIES=	chat python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmpppy/}
 MAINTAINER=	schnoebe@NetBSD.org
 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
 EXDIR=		${PREFIX}/share/examples/py-xmpppy
 INSTALLATION_DIRS+=	${DOCDIR} ${EXDIR}
 post-install:
 	${INSTALL_SCRIPT_DIR} ${DESTDIR}${EXDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/examples/*.py \
 		${DESTDIR}${EXDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html \
 		${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png \
 		${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.css \
 		${DESTDIR}${DOCDIR}
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-<!-- $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>
 <para>When you find a package that is not yet in pkgsrc, you
 most likely have a URL from where you can download the source
 code. Starting with this URL, creating a package involves only a
 few steps.</para>
 <procedure>
 <step><para>First, install the packages <filename
 role="pkg">pkgtools/url2pkg</filename> and <filename
 @@ -179,27 +179,27 @@ For example:
 <programlisting>
 REPLACE_PYTHON=   *.py
 </programlisting></para>
 <para>Some Python modules have separate distributions for Python-2.x
 and Python-3.x support. In pkgsrc this is handled by the
 <filename>versioned_dependencies.mk</filename> file. Set
 <varname>PYTHON_VERSIONED_DEPENDENCIES</varname> to the list of
 packages that should be depended upon and include
 <quote><filename>../../lang/python/versioned_dependencies.mk</filename></quote>,
 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>
 </sect2>
 </sect1>
 <sect1 id="creating.examples">
 <title>Examples</title>
 <sect2 id="creating.nvu">
 <title>How the www/nvu package came into pkgsrc</title>

 @@ -1,37 +1,36 @@
-# $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
 # used.
+#
 # === User-settable variables ===
+#
 # PYTHON_VERSIONED_DEPENDENCIES
 #       The Python package which should be added as a dependency.
+#
 #       Possible values: dateutil
 #       Default: (nothing)
+#
 .include "../../lang/python/pyversion.mk"
 _SUPPORTED_PACKAGES=# empty
 _SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
 _SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X
 _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
 _SUPPORTED_PACKAGES+=google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3
 _SUPPORTED_PACKAGES+=jsonlib textproc/py-jsonlib textproc/py-jsonlib3
 _SUPPORTED_PACKAGES+=python-digest www/py-python-digest www/py-python3-digest
 .for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
 _PKG_MATCHED=	no
 pkg:=	${pattern:C/:.*//}
 type:=	${pattern:C/[^:]*//}
 .for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
 .if "${pkg}" == "${name}"

 @@ -1,17 +1,17 @@
-# $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}
 PKGNAME=	${PYPKGPREFIX}-spf-${VERSION}
 CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyspf/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pypi.python.org/pypi/pyspf
 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"

 @@ -1,49 +1,49 @@
-# $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
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
 #DEPENDS+=	help2man>=1.36.4:../../converters/help2man
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 #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
 DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
 ## Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 #DEPENDS+=	${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 #DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
 DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
 # dateutil>=1.4.1
-# dns>=1.6.0
+PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil dns
 EXTRACT_USING=  bsdtar
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config pax
 PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
 PYDISTUTILSPKG=	yes
 PYSETUPOPTARGS=	# empty
 PYSETUPINSTALLARGS=	--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 INSTALLATION_DIRS=	share/applications

 @@ -1,45 +1,46 @@
-# $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
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 DEPENDS+=	help2man>=1.36.4:../../converters/help2man
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 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
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 DEPENDS+=	${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 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.
 QTVERSION=	4.8.5	# from ../../x11/qt4/Makefile.common
 # Including that file to avoid hardcoding the version number won't work,
 # since it will occur in the distinfo anyway.
 QTNAME=		qt-everywhere-opensource-src-${QTVERSION}
 DISTFILES+=	${QTNAME}.tar.gz
 MASTER_SITES+=	http://releases.qt-project.org/qt4/source/
 EXTRACT_USING=  bsdtar
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config pax

 @@ -1,21 +1,20 @@
-# $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
 CATEGORIES=	security net
 MASTER_SITES=	http://www.xelerance.com/software/sshfp/
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	http://www.xelerance.com/software/sshfp/
 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"