summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-09-11 16:41:16 +0000
committerwiz <wiz@pkgsrc.org>2016-09-11 16:41:16 +0000
commitc340d1a06a42f444ca01560ac56747e4fa6c58ac (patch)
tree7d023e2fbf68e83b683c408a7f2e3c666097be95 /print
parent9e447b1d88e923c47e51adff72ec6b20017d842b (diff)
downloadpkgsrc-c340d1a06a42f444ca01560ac56747e4fa6c58ac.tar.gz
py-reportlab supports python-3.x.
Diffstat (limited to 'print')
-rw-r--r--print/hplip/options.mk11
1 files changed, 2 insertions, 9 deletions
diff --git a/print/hplip/options.mk b/print/hplip/options.mk
index 61a3b47ff73..8f4ced0fd81 100644
--- a/print/hplip/options.mk
+++ b/print/hplip/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2016/07/09 13:04:02 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2016/09/11 16:41:16 wiz Exp $
#
# HPLIP dependencies are detailed in the following page:
# http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --enable-dbus-build
EGFILES+= cups/pstotiff.convs cups/pstotiff.types
MAKE_DIRS+= ${PKG_SYSCONFDIR}/cups
DEPENDS+= ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-reportlab
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/py-dbus/buildlink3.mk"
.else
@@ -36,13 +35,7 @@ CONFIGURE_ARGS+= --enable-scan-build
MESSAGE_SRC+= MESSAGE.scan
MESSAGE_SUBST+= EGDIR=${EGDIR}
.include "../../graphics/sane-backends/buildlink3.mk"
-# XXX: a dependency installs py-Pillow, which conflicts
-# .include "../../graphics/py-imaging/buildlink3.mk"
-# DEPENDS+= ${PYPKGPREFIX}-Pillow-[0-9]*:../../print/py-Pillow
-# version depends on if py-reportlab was installed before we called
-# out an imaging library.
-DEPENDS+= {${PYPKGPREFIX}-imaging-[0-9]*,${PYPKGPREFIX}-Pillow-[0-9]*}:../../graphics/py-imaging
-# PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-imaging
+DEPENDS+= {${PYPKGPREFIX}-Pillow-[0-9]*,${PYPKGPREFIX}-imaging-[0-9]*}:../../graphics/py-Pillow
.else
CONFIGURE_ARGS+= --disable-scan-build
.endif