pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/print/hplip



Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 27 14:00:09 UTC 2025

Modified Files:
        pkgsrc/print/hplip: Makefile

Log Message:
hplip: fix build with Python 3.12+


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/print/hplip/Makefile

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.117 pkgsrc/print/hplip/Makefile:1.118
--- pkgsrc/print/hplip/Makefile:1.117   Thu Nov 14 22:21:24 2024
+++ pkgsrc/print/hplip/Makefile Mon Jan 27 14:00:09 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2024/11/14 22:21:24 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2025/01/27 14:00:09 wiz Exp $
 
 DISTNAME=      hplip-3.19.12
 PKGREVISION=   30
@@ -46,8 +46,6 @@ 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}
@@ -175,6 +173,13 @@ post-install:
        ${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/share/hplip
        ${LN} -s ../../../share/hplip/ppd ${DESTDIR}${PREFIX}/share/cups/model/hplip-ppds
 
+.include "../../lang/python/pyversion.mk"
+
+# needs distutils
+.if ${PYTHON_VERSION} > 311
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+.endif
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/jpeg.buildlink3.mk"



Home | Main Index | Thread Index | Old Index