summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz>2016-06-30 18:03:46 +0000
committerwiz <wiz>2016-06-30 18:03:46 +0000
commit4dcdc8cdf8fd8a4212838029caebf4ac35f7c32d (patch)
tree46a2537ab355740bf7afb7863942db4b23fbd17b /misc
parentcc4f275f692a40cd76ab0a86339f2cec5462244a (diff)
downloadpkgsrc-4dcdc8cdf8fd8a4212838029caebf4ac35f7c32d.tar.gz
Switch to direct py-dns dependency.
py-dns now supports all python versions, so versioned_dependencies is not needed any longer.
Diffstat (limited to 'misc')
-rw-r--r--misc/calibre/Makefile6
-rw-r--r--misc/calibre1/Makefile5
2 files changed, 6 insertions, 5 deletions
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index b7900b95e36..31ddf4357ab 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -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/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
@@ -32,8 +33,7 @@ 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 dns
+PYTHON_VERSIONED_DEPENDENCIES= dateutil
EXTRACT_USING= bsdtar
diff --git a/misc/calibre1/Makefile b/misc/calibre1/Makefile
index 3271b7c25d4..eb51975122c 100644
--- a/misc/calibre1/Makefile
+++ b/misc/calibre1/Makefile
@@ -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/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
@@ -29,7 +30,7 @@ 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.