CVS commit: pkgsrc/devel/libftdi1

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Aug 17 09:18:41 UTC 2024

Modified Files:
        pkgsrc/devel/libftdi1: Makefile buildlink3.mk

Log Message:
libftdi1: fix build with Python 3.12

Fix pkglint while here.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/libftdi1/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/libftdi1/buildlink3.mk

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

Modified files:

Index: pkgsrc/devel/libftdi1/Makefile
diff -u pkgsrc/devel/libftdi1/Makefile:1.49 pkgsrc/devel/libftdi1/Makefile:1.50
--- pkgsrc/devel/libftdi1/Makefile:1.49 Fri Dec 29 18:24:41 2023
+++ pkgsrc/devel/libftdi1/Makefile      Sat Aug 17 09:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2023/12/29 18:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.50 2024/08/17 09:18:41 wiz Exp $
 
 DISTNAME=      libftdi1-1.5
 PKGREVISION=   8
@@ -29,12 +29,17 @@ PKGCONFIG_OVERRIDE+=        libftdipp1.pc.in
 
 PLIST_SUBST+=  PYSITELIB=${PYSITELIB}
 
+.include "../../lang/python/pyversion.mk"
+
+.if ${PYTHON_VERSION} > 311
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+.endif
+
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/confuse/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
 .include "../../lang/${PYPACKAGE}/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libftdi1/buildlink3.mk
diff -u pkgsrc/devel/libftdi1/buildlink3.mk:1.5 pkgsrc/devel/libftdi1/buildlink3.mk:1.6
--- pkgsrc/devel/libftdi1/buildlink3.mk:1.5     Mon Aug 14 05:24:11 2023
+++ pkgsrc/devel/libftdi1/buildlink3.mk Sat Aug 17 09:18:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2023/08/14 05:24:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2024/08/17 09:18:41 wiz Exp $
 
 BUILDLINK_TREE+=       libftdi1
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libftdi1
 LIBFTDI1_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libftdi1+=       libftdi1>=1.0
-BUILDLINK_ABI_DEPENDS.libftdi1?=               libftdi1>=1.5nb7
+BUILDLINK_ABI_DEPENDS.libftdi1?=       libftdi1>=1.5nb7
 BUILDLINK_PKGSRCDIR.libftdi1?=         ../../devel/libftdi1
 
 .include "../../devel/libusb1/buildlink3.mk"