CVS commit: pkgsrc/print/hplip

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 11 16:41:16 UTC 2016

Modified Files:
        pkgsrc/print/hplip: options.mk

Log Message:
py-reportlab supports python-3.x.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/hplip/options.mk

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

Modified files:

Index: pkgsrc/print/hplip/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.11 pkgsrc/print/hplip/options.mk:1.12
--- pkgsrc/print/hplip/options.mk:1.11  Sat Jul  9 13:04:02 2016
+++ pkgsrc/print/hplip/options.mk       Sun Sep 11 16:41:16 2016
@@ -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