 @@ -1,450 +1,450 @@
-<!-- $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
 role="pkg">pkgtools/pkglint</filename>.</para></step>
 <step><para>Then, choose one of the top-level directories as the
 category in which you want to place your package. You can also create a
 directory of your own (maybe called <filename>local</filename>). In that
 category directory, create another directory for your package and change
 into it.</para></step>
 <step><para>Run the program <command>url2pkg</command>, which will ask
 you for a URL. Enter the URL of the distribution file (in most cases a
 <filename>.tar.gz</filename> file) and watch how the basic ingredients
 of your package are created automatically. The distribution file is
 extracted automatically to fill in some details in the
 <filename>Makefile</filename> that would otherwise have to be done
 manually.</para></step>
 <step><para>Examine the extracted files to determine the dependencies of
 your package. Ideally, this is mentioned in some
 <filename>README</filename> file, but things may differ. For each of
 these dependencies, look where it exists in pkgsrc, and if there is a
 file called <filename>buildlink3.mk</filename> in that directory, add a
 line to your package <filename>Makefile</filename> which includes that
 file just before the last line. If the
 <filename>buildlink3.mk</filename> file does not exist, it must be
 created first. The <filename>buildlink3.mk</filename> file makes sure that the package's include files and libraries are provided.</para>
 <para>If you just need binaries from a package, add a
 <varname>DEPENDS</varname> line to the Makefile, which specifies the
 version of the dependency and where it can be found in pkgsrc. This line
 should be placed in the third paragraph. If the dependency is only
 needed for building the package, but not when using it, use
 <varname>BUILD_DEPENDS</varname> instead of <varname>DEPENDS</varname>.
 Your package may then look like this:</para>
 <programlisting>
 [...]
 BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
 DEPENDS+=       screen-[0-9]*:../../misc/screen
 DEPENDS+=       screen>=4.0:../../misc/screen
 [...]
 .include "../../<replaceable>category</replaceable>/<replaceable>package</replaceable>/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 </programlisting>
 </step>
 <step><para>Run <command>pkglint</command> to see what things still need
 to be done to make your package a <quote>good</quote> one. If you don't
 know what pkglint's warnings want to tell you, try <command>pkglint
 --explain</command> or <command>pkglint
 -e</command>, which outputs additional
 explanations.</para></step>
 <step><para>In many cases the package is not yet ready to build. You can
 find instructions for the most common cases in the next section, <xref
 linkend="creating.common"/>. After you have followed the instructions
 over there, you can hopefully continue here.</para></step>
 <step><para>Run <command>bmake clean</command> to clean the working
 directory from the extracted files. Besides these files, a lot of cache
 files and other system information has been saved in the working
 directory, which may become wrong after you edited the
 <filename>Makefile</filename>.</para></step>
 <step><para>Now, run <command>bmake</command> to build the package. For
 the various things that can go wrong in this phase, consult <xref
 linkend="fixes"/>.</para></step>
 <step><para>When the package builds fine, the next step is to install
 the package. Run <command>bmake install</command> and hope that
 everything works.</para></step>
 <step><para>Up to now, the file <filename>PLIST</filename>, which
 contains a list of the files that are installed by the package, is
 nearly empty. Run <command>bmake print-PLIST
 &gt;PLIST</command> to generate a probably correct list. Check
 the file using your preferred text editor to see if the list of
 files looks plausible.</para></step>
 <step><para>Run <command>pkglint</command> again to see if the generated
 <filename>PLIST</filename> contains garbage or not.</para></step>
 <step><para>When you ran <command>bmake install</command>, the package
 has been registered in the database of installed files, but with an
 empty list of files. To fix this, run <command>bmake deinstall</command>
 and <command>bmake install</command> again. Now the package is
 registered with the list of files from
 <filename>PLIST</filename>.</para></step>
 <step><para>Run <command>bmake package</command> to create a binary
 package from the set of installed files.</para></step>
 </procedure>
 <sect1 id="creating.common">
 <title>Common types of packages</title>
 <sect2 id="creating.perl-module">
 <title>Perl modules</title>
 <para>Simple Perl modules are handled automatically by
 <command>url2pkg</command>, including dependencies.</para>
 </sect2>
 <sect2 id="creating.kde-app">
 <title>KDE3 applications</title>
 <para>KDE3 applications should always include
 <filename>meta-pkgs/kde3/kde3.mk</filename>, which contains numerous
 settings that are typical of KDE3 packages.</para>
 </sect2>
 <sect2 id="creating.python-module">
 <title>Python modules and programs</title>
 <para>Python modules and programs packages are easily created using a
 set of predefined variables.</para>
 <para>
 If some Python versions are not supported by the software, set the
 <varname>PYTHON_VERSIONS_INCOMPATIBLE</varname> variable to the Python versions
 that are not supported, e.g.
 <programlisting>
 PYTHON_VERSIONS_INCOMPATIBLE=       27
 </programlisting></para>
 <para>
 If the packaged software is a Python module, include one of
 <filename>../../lang/python/egg.mk</filename>,
 <filename>../../lang/python/distutils.mk</filename>, or
 <filename>../../lang/python/extension.mk</filename>.</para>
 <para>Most Python packages use either <quote>distutils</quote> or
 easy-setup/setuptools (<quote>eggs</quote>).
 if the packaged software is using setuptools, you only need
 to include <quote><filename>../../lang/python/egg.mk</filename></quote>.
 Otherwise, if the software uses <quote>distutils</quote>, include
 <quote><filename>../../lang/python/distutils.mk</filename></quote>.
 so pkgsrc will use this framework.
 <quote>distutils</quote> uses a script called <filename>setup.py</filename>,
 if the <quote>distutils</quote> driver is not called
 <filename>setup.py</filename>, set the <varname>PYSETUP</varname> variable
 to the name of the script.</para>
 <para>Either way, the package directory should be called
 <quote>py-software</quote> and <varname>PKGNAME</varname> should be set to
 <quote>${PYPKGPREFIX}-${DISTNAME}</quote>, e.g.
 <programlisting>
 DISTNAME=   foopymodule-1.2.10
 PKGNAME=    ${PYPKGPREFIX}-${DISTNAME}
 </programlisting></para>
 <para>If it is an application, include
 <quote><filename>../../lang/python/application.mk</filename></quote>.
 In order to correctly set the path to the Python interpreter, use the
 <varname>REPLACE_PYTHON</varname> variable and set it to the list of files
 (paths relative to <varname>WRKSRC</varname>) that must be corrected.
 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>
 <sect3 id="creating.nvu.init">
 <title>The initial package</title>
 <para>Looking at the file <filename>pkgsrc/doc/TODO</filename>, I saw
 that the <quote>nvu</quote> package has not yet been imported into
 pkgsrc. As the description says it has to do with the web, the obvious
 choice for the category is <quote>www</quote>.</para>
 <programlisting>
 &uprompt; mkdir www/nvu
 &uprompt; cd www/nvu
 </programlisting>
 <para>The web site says that the sources are available as a tar file, so
 I fed that URL to the <command>url2pkg</command> program:</para>
 <programlisting>
 &uprompt; url2pkg http://cvs.nvu.com/download/nvu-1.0-sources.tar.bz2
 </programlisting>
 <para>My editor popped up, and I added a <varname>PKGNAME</varname> line
 below the <varname>DISTNAME</varname> line, as the package name should
 not have the word <quote>sources</quote> in it. I also filled in the
 <varname>MAINTAINER</varname>, <varname>HOMEPAGE</varname> and
 <varname>COMMENT</varname> fields. Then the package
 <filename>Makefile</filename> looked like that:</para>
 <programlisting>
 # &#36;NetBSD&#36;
+#
 DISTNAME=       nvu-1.0-sources
 PKGNAME=        nvu-1.0
 CATEGORIES=     www
 MASTER_SITES=   http://cvs.nvu.com/download/
 EXTRACT_SUFX=   .tar.bz2
 MAINTAINER=     rillig@NetBSD.org
 HOMEPAGE=       http://cvs.nvu.com/
 COMMENT=        Web Authoring System
 # url2pkg-marker (please do not remove this line.)
 .include "../../mk/bsd.pkg.mk"
 </programlisting>
 <para>Then, I quit the editor and watched pkgsrc downloading a large
 source archive:</para>
 <programlisting>
 url2pkg> Running "make makesum" ...
 => Required installed package digest>=20010302: digest-20060826 found
 => Fetching nvu-1.0-sources.tar.bz2
 Requesting http://cvs.nvu.com/download/nvu-1.0-sources.tar.bz2
 % |*************************************| 28992 KB  150.77 KB/s00:00 ETA
 29687976 bytes retrieved in 03:12 (150.77 KB/s)
 url2pkg> Running "make extract" ...
 => Required installed package digest>=20010302: digest-20060826 found
 => Checksum SHA1 OK for nvu-1.0-sources.tar.bz2
 => Checksum RMD160 OK for nvu-1.0-sources.tar.bz2
 work.bacc -> /tmp/roland/pkgsrc/www/nvu/work.bacc
 ===> Installing dependencies for nvu-1.0
 ===> Overriding tools for nvu-1.0
 ===> Extracting for nvu-1.0
 url2pkg> Adjusting the Makefile.
 Remember to correct CATEGORIES, HOMEPAGE, COMMENT, and DESCR when you're done!
 Good luck! (See pkgsrc/doc/pkgsrc.txt for some more help :-)
 </programlisting>
 </sect3>
 <sect3 id="creating.nvu.problems">
 <title>Fixing all kinds of problems to make the package work</title>
 <para>Now that the package has been extracted, let's see what's inside
 it. The package has a <filename>README.txt</filename>, but that only
 says something about mozilla, so it's probably useless for seeing what
 dependencies this package has. But since there is a GNU configure script
 in the package, let's hope that it will complain about everything it
 needs.</para>
 <programlisting>
 &uprompt; bmake
 => Required installed package digest>=20010302: digest-20060826 found
 => Checksum SHA1 OK for nvu-1.0-sources.tar.bz2
 => Checksum RMD160 OK for nvu-1.0-sources.tar.bz2
 ===> Patching for nvu-1.0
 ===> Creating toolchain wrappers for nvu-1.0
 ===> Configuring for nvu-1.0
 [...]
 configure: error: Perl 5.004 or higher is required.
 [...]
 WARNING: Please add USE_TOOLS+=perl to the package Makefile.
 [...]
 </programlisting>
 <para>That worked quite well. So I opened the package Makefile in my
 editor, and since it already has a <varname>USE_TOOLS</varname> line, I
 just appended <quote>perl</quote> to it. Since the dependencies of the
 package have changed now, and since a perl wrapper is automatically
 installed in the <quote>tools</quote> phase, I need to build the package
 from scratch.</para>
 <programlisting>
 &uprompt; bmake clean
 ===> Cleaning for nvu-1.0
 &uprompt; bmake
 [...]
 *** /tmp/roland/pkgsrc/www/nvu/work.bacc/.tools/bin/make is not \
 GNU Make.  You will not be able to build Mozilla without GNU Make.
 [...]
 </programlisting>
 <para>So I added <quote>gmake</quote> to the
 <varname>USE_TOOLS</varname> line and tried again (from scratch).</para>
 <programlisting>
 [...]
 checking for GTK - version >= 1.2.0... no
 *** Could not run GTK test program, checking why...
 [...]
 </programlisting>
 <para>Now to the other dependencies. The first question is: Where is the
 GTK package hidden in pkgsrc?</para>
 <programlisting>
 &uprompt; echo ../../*/gtk*
 [many packages ...]
 &uprompt; echo ../../*/gtk
 ../../x11/gtk
 &uprompt; echo ../../*/gtk2
 ../../x11/gtk2
 &uprompt; echo ../../*/gtk2/bui*
 ../../x11/gtk2/buildlink3.mk
 </programlisting>
 <para>The first try was definitely too broad. The second one had exactly
 one result, which is very good. But there is one pitfall with GNOME
 packages. Before GNOME 2 had been released, there were already many
 GNOME 1 packages in pkgsrc. To be able to continue to use these
 packages, the GNOME 2 packages were imported as separate packages, and
 their names usually have a <quote>2</quote> appended. So I checked
 whether this was the case here, and indeed it was.</para>
 <para>Since the GTK2 package has a <filename>buildlink3.mk</filename>
 file, adding the dependency is very easy. I just inserted an
 <literal>.include</literal> line before the last line of the package
 <filename>Makefile</filename>, so that it now looks like this:</para>
 <programlisting>
 [...]
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk
 </programlisting>
 <para>After another <command>bmake clean && bmake</command>, the answer
 was:</para>
 <programlisting>
 [...]
 checking for gtk-config... /home/roland/pkg/bin/gtk-config
 checking for GTK - version >= 1.2.0... no
 *** Could not run GTK test program, checking why...
 *** The test program failed to compile or link. See the file config.log for the
 *** exact error that occured. This usually means GTK was incorrectly installed
 *** or that you have moved GTK since it was installed. In the latter case, you
 *** may want to edit the gtk-config script: /home/roland/pkg/bin/gtk-config
 configure: error: Test for GTK failed.
 [...]
 </programlisting>
 <para>In this particular case, the assumption that <quote>every package
 prefers GNOME 2</quote> had been wrong. The first of the lines above
 told me that this package really wanted to have the GNOME 1 version of
 GTK. If the package had looked for GTK2, it would have looked for
 <command>pkg-config</command> instead of <command>gtk-config</command>.
 So I changed the <literal>x11/gtk2</literal> to
 <literal>x11/gtk</literal> in the package <filename>Makefile</filename>,
 and tried again.</para>
 <programlisting>
 [...]
 cc -o xpidl.o -c -DOSTYPE=\"NetBSD3\" -DOSARCH=\"NetBSD\"  [...]
 In file included from xpidl.c:42:
 xpidl.h:53:24: libIDL/IDL.h: No such file or directory
 In file included from xpidl.c:42:
 xpidl.h:132: error: parse error before "IDL_ns"
 [...]
 </programlisting>
 <para>The package still does not find all of its dependencies. Now the
 question is: Which package provides the
 <filename>libIDL/IDL.h</filename> header file?</para>
 <programlisting>
 &uprompt; echo ../../*/*idl*
 ../../devel/py-idle ../../wip/idled ../../x11/acidlaunch
 &uprompt; echo ../../*/*IDL*
 ../../net/libIDL
 </programlisting>
 <para>Let's take the one from the second try. So I included the
 <filename>../../net/libIDL/buildlink3.mk</filename> file and tried
 again. But the error didn't change. After digging through some of the
 code, I concluded that the build process of the package was broken and
 couldn't have ever worked, but since the Mozilla source tree is quite
 large, I didn't want to fix it. So I added the following to the package
 <filename>Makefile</filename> and tried again:</para>
 <programlisting>
 CPPFLAGS+=              -I${BUILDLINK_PREFIX.libIDL}/include/libIDL-2.0
 BUILDLINK_TRANSFORM+=   -l:IDL:IDL-2
 </programlisting>
 <para>The latter line is needed because the package expects the library
 <filename>libIDL.so</filename>, but only
 <filename>libIDL-2.so</filename> is available. So I told the compiler
 wrapper to rewrite that on the fly.</para>
 <para>The next problem was related to a recent change of the FreeType
 interface. I looked up in <filename role="pkg">www/seamonkey</filename>
 which patch files were relevant for this issue and copied them to the
 <filename>patches</filename> directory. Then I retried, fixed the
 patches so that they applied cleanly and retried again. This time,
 everything worked.</para>
 </sect3>
 <sect3 id="creating.nvu.inst">
 <title>Installing the package</title>
 <programlisting>
 &uprompt; bmake CHECK_FILES=no install
 [...]
 &uprompt; bmake print-PLIST >PLIST
 &uprompt; bmake deinstall
 &uprompt; bmake install
 </programlisting>
 </sect3>
 </sect2>
 </sect1>
 </chapter>

 @@ -1,152 +1,152 @@
-# $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
 INSTALLATION_DIRS=	share/icons
 INSTALLATION_DIRS=	share/calibre/recipes
 FIX_PYTHON_PATHS+=	*.py
 FIX_PYTHON_PATHS+=	recipes/*.recipe
 FIX_PYTHON_PATHS+=	*/*.py
 FIX_PYTHON_PATHS+=	*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*/*/*.py
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt5/bin/qmake',"
 SUBST_MESSAGE.prefix=	Fixing path to QMAKE
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	setup/build_environment.py
 # This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
 SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	${FIX_PYTHON_PATHS}
 REPLACE_BASH+=		resources/calibre-portable.sh
 # These ones are for replacing python[0-9*] with PYTHONBIN
 REPLACE_PYTHON+=	recipes/animal_politico.recipe
 REPLACE_PYTHON+=	recipes/respekt_magazine.recipe
 REPLACE_PYTHON+=	recipes/respekt_web.recipe
 REPLACE_PYTHON+=	recipes/kompiutierra.recipe
 REPLACE_PYTHON+=	recipes/trouw.recipe
 REPLACE_PYTHON+=	src/calibre/ebooks/markdown/extensions/*.py
 REPLACE_PYTHON+=	src/calibre/ebooks/metadata/odt.py
 REPLACE_PYTHON+=	src/calibre/utils/*.py
 REPLACE_PYTHON+=	src/odf/*.py
 MAKE_ENV+=		FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
 MAKE_ENV+=		FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
 MAKE_ENV+=		PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
 MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 MAKE_ENV+=		SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 #MAKE_ENV+=		WITH_USB=no
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 pre-configure:
 	cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
 # Turn off x bits on non-executable files.
 post-extract:
 	find  ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
 	find  ${WRKSRC}/resources/images/mimetypes  -name '*.png' -exec chmod a-x \{} \;
 	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
 	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 # not sure why libheadless installed into wrong directory
 # side effect of patch-setup_extensions.py?
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
 	    ${DESTDIR}${PREFIX}/share/calibre/recipes
 	cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
 	    COPYRIGHT INSTALL LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 	cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
 	${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
 .include "../../lang/python/application.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.40
 .include "../../devel/chmlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=1.1.5
 .include "../../devel/libmtp/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 _PYSETUPTOOLSINSTALLARGS=	# empty
 # Get rid of --root=${DESTDIR}, use our own version from above instead.
 # because the setup.py is not the standard one and behaves differently.
 _PYSETUPINSTALLARGS=	${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
 #.include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.8.2
 .include "../../print/podofo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.20.2
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-qt5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-qt5+=	${PYPKGPREFIX}-qt5>=5.4
 .include "../../x11/py-qt5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,160 +1,161 @@
-# $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
 PYTHON_VERSIONS_ACCEPTED=	27
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-mechanize, py-beautifulsoup, py-imaging, py-netifaces
 PYDISTUTILSPKG=	yes
 PYSETUPOPTARGS=	# empty
 PYSETUPINSTALLARGS=	--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 WRKSRC=		${WRKDIR}/calibre
 INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS=	share/icons
 INSTALLATION_DIRS=	share/calibre/recipes
 FIX_PYTHON_PATHS+=	*.py
 FIX_PYTHON_PATHS+=	recipes/*.recipe
 FIX_PYTHON_PATHS+=	*/*.py
 FIX_PYTHON_PATHS+=	*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*/*.py
 FIX_PYTHON_PATHS+=	*/*/*/*/*/*/*.py
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
 SUBST_MESSAGE.prefix=	Fixing path to QMAKE
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	setup/build_environment.py
 # This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
 SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	${FIX_PYTHON_PATHS}
 # These ones are for replacing python[0-9*] with PYTHONBIN
 REPLACE_PYTHON+=	recipes/animal_politico.recipe
 REPLACE_PYTHON+=	recipes/respekt_magazine.recipe
 REPLACE_PYTHON+=	recipes/respekt_web.recipe
 REPLACE_PYTHON+=	recipes/kompiutierra.recipe
 REPLACE_PYTHON+=	recipes/trouw.recipe
 REPLACE_PYTHON+=	src/calibre/ebooks/markdown/extensions/*.py
 REPLACE_PYTHON+=	src/calibre/ebooks/metadata/odt.py
 REPLACE_PYTHON+=	src/calibre/utils/*.py
 REPLACE_PYTHON+=	src/odf/*.py
 MAKE_ENV+=		FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
 MAKE_ENV+=		FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
 MAKE_ENV+=		PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
 MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 #MAKE_ENV+=		WITH_USB=no
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 pre-configure:
 	cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
 # Turn off x bits on non-executable files.
 post-extract:
 	find  ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
 	find  ${WRKSRC}/resources/images/mimetypes  -name '*.png' -exec chmod a-x \{} \;
 	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
 	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 # Get access to (some of) the Qt4 private header files (for qt_hack).
 post-wrapper:
 	cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
 	    ln -s ../../../../${QTNAME}/include/QtGui/private .
 	cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
 	    ln -s ../../../../${QTNAME}/include/QtCore/private .
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
 	    ${DESTDIR}${PREFIX}/share/calibre/recipes
 	cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
 	    COPYRIGHT INSTALL LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 .include "../../lang/python/application.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/chmlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=6.5.9
 .include "../../graphics/ImageMagick/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.6
 .include "../../graphics/py-imaging/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 _PYSETUPTOOLSINSTALLARGS=	# empty
 # Get rid of --root=${DESTDIR}, use our own version from above instead.
 # because the setup.py is not the standard one and behaves differently.
 _PYSETUPINSTALLARGS=	${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
 #.include "../../lang/python/extension.mk"
 .include "../../print/podofo/buildlink3.mk"
 # ??? BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.8.2
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler-qt4+=	poppler-qt4>=0.12.0
 .include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-qt4+=	${PYPKGPREFIX}-qt4>=4.7.0
 .include "../../x11/py-qt4/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.7.0
 .include "../../x11/qt4-tools/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-qdbus+=	qt4-qdbus>=4.7.0
 .include "../../x11/qt4-qdbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -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,56 +1,55 @@
-# $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}"
 _PKG_MATCHED=	yes
 .if ${PYPKGPREFIX} == "py27"
 dir:=	${py2dir}
 .else
 dir:=	${py3dir}
 .endif
 .if "${type}" == ":link"
 .include "../../${dir}/buildlink3.mk"
 .elif "${type}" == ":build"
 BUILD_DEPENDS:=	${BUILD_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
 .else
 DEPENDS:=	${DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
 .endif
 .endif
 .endfor
 .if ${_PKG_MATCHED} == "no"
 PKG_FAIL_REASON+=	"${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES"
 .endif
 .endfor

 @@ -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,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"