CVS commit: pkgsrc/print/hplip

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 30 11:36:31 UTC 2024

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

Log Message:
hplip: limit to Python 3


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.22 -r1.23 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/Makefile
diff -u pkgsrc/print/hplip/Makefile:1.111 pkgsrc/print/hplip/Makefile:1.112
--- pkgsrc/print/hplip/Makefile:1.111   Sun Nov 12 13:23:18 2023
+++ pkgsrc/print/hplip/Makefile Tue Apr 30 11:36:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2023/11/12 13:23:18 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2024/04/30 11:36:31 wiz Exp $
 
 DISTNAME=      hplip-3.19.12
 PKGREVISION=   25
@@ -46,6 +46,8 @@ CONFIGURE_ARGS+=      --enable-foomatic-rip-h
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 EGFILES=               hp/hplip.conf
 
+PYTHON_VERSIONS_INCOMPATIBLE+= 27
+
 INSTALL_MAKE_FLAGS+=   ${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 INSTALL_MAKE_FLAGS+=   localstatedir=${EGDIR}

Index: pkgsrc/print/hplip/options.mk
diff -u pkgsrc/print/hplip/options.mk:1.22 pkgsrc/print/hplip/options.mk:1.23
--- pkgsrc/print/hplip/options.mk:1.22  Sat Nov  4 14:22:03 2023
+++ pkgsrc/print/hplip/options.mk       Tue Apr 30 11:36:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2023/11/04 14:22:03 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2024/04/30 11:36:31 wiz Exp $
 #
 # HPLIP dependencies are detailed in the following page:
 # http://hplipopensource.com/hplip-web/install/manual/distros/other.html
@@ -50,8 +50,7 @@ PLIST_SRC+=           PLIST.scan
 CONFIGURE_ARGS+=       --enable-scan-build
 MESSAGE_SRC+=          MESSAGE.scan
 MESSAGE_SUBST+=                EGDIR=${EGDIR}
-PYTHON_VERSIONED_DEPENDENCIES= Pillow
-.include "../../lang/python/versioned_dependencies.mk"
+DEPENDS+=      ${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 .include "../../graphics/sane-backends/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-scan-build