Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 24C3F84EF5 for ; Thu, 28 Dec 2023 13:29:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id zNd5nqDBGwXp for ; Thu, 28 Dec 2023 13:29:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7EA0E84E82 for ; Thu, 28 Dec 2023 13:29:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 73C0EFA42; Thu, 28 Dec 2023 13:29:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_17037701663630" MIME-Version: 1.0 Date: Thu, 28 Dec 2023 13:29:26 +0000 From: "Dr. Thomas Orgis" Subject: CVS commit: pkgsrc/devel/py-pybind11 To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: thor@netbsd.org X-Mailer: log_accum Message-Id: <20231228132926.73C0EFA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_17037701663630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: thor Date: Thu Dec 28 13:29:26 UTC 2023 Modified Files: pkgsrc/devel/py-pybind11: Makefile PLIST buildlink3.mk Added Files: pkgsrc/devel/py-pybind11: ALTERNATIVES Log Message: devel/py-pybind11: resolve the self-conflict This renames the pybind11-config script with a versioned suffix as done elsewhere. The buildlink file provides the unsuffixed script for dependents to use. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-pybind11/ALTERNATIVES cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/py-pybind11/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-pybind11/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-pybind11/buildlink3.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_17037701663630 Content-Disposition: inline Content-Length: 2584 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-pybind11/Makefile diff -u pkgsrc/devel/py-pybind11/Makefile:1.17 pkgsrc/devel/py-pybind11/Makefile:1.18 --- pkgsrc/devel/py-pybind11/Makefile:1.17 Mon Jul 17 19:08:10 2023 +++ pkgsrc/devel/py-pybind11/Makefile Thu Dec 28 13:29:26 2023 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2023/07/17 19:08:10 adam Exp $ +# $NetBSD: Makefile,v 1.18 2023/12/28 13:29:26 thor Exp $ DISTNAME= pybind11-2.11.1 +PATCHLEVEL= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=p/pybind11/} @@ -12,7 +13,11 @@ LICENSE= modified-bsd USE_LANGUAGES= # none -PYTHON_SELF_CONFLICT= yes +.include "../../lang/python/pyversion.mk" + +post-install: + cd ${DESTDIR}${PREFIX}/bin && \ + ${MV} pybind11-config pybind11-config-${PYVERSSUFFIX} || ${TRUE} USE_PKG_RESOURCES= yes Index: pkgsrc/devel/py-pybind11/PLIST diff -u pkgsrc/devel/py-pybind11/PLIST:1.7 pkgsrc/devel/py-pybind11/PLIST:1.8 --- pkgsrc/devel/py-pybind11/PLIST:1.7 Mon Jul 17 19:08:10 2023 +++ pkgsrc/devel/py-pybind11/PLIST Thu Dec 28 13:29:26 2023 @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2023/07/17 19:08:10 adam Exp $ -bin/pybind11-config +@comment $NetBSD: PLIST,v 1.8 2023/12/28 13:29:26 thor Exp $ +bin/pybind11-config-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt Index: pkgsrc/devel/py-pybind11/buildlink3.mk diff -u pkgsrc/devel/py-pybind11/buildlink3.mk:1.3 pkgsrc/devel/py-pybind11/buildlink3.mk:1.4 --- pkgsrc/devel/py-pybind11/buildlink3.mk:1.3 Wed Nov 29 10:53:11 2023 +++ pkgsrc/devel/py-pybind11/buildlink3.mk Thu Dec 28 13:29:26 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2023/11/29 10:53:11 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2023/12/28 13:29:26 thor Exp $ BUILDLINK_TREE+= py-pybind11 @@ -10,6 +10,9 @@ PY_PYBIND11_BUILDLINK3_MK:= PYTHON_FOR_BUILD_ONLY?= yes .include "../../lang/python/pyversion.mk" +pre-configure: + ${LN} -sf ${PREFIX}/bin/pybind11-config-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/pybind11-config + BUILDLINK_API_DEPENDS.py-pybind11+= ${PYPKGPREFIX}-pybind11>=2.5.0 BUILDLINK_PKGSRCDIR.py-pybind11?= ../../devel/py-pybind11 BUILDLINK_DEPMETHOD.py-pybind11?= build Added files: Index: pkgsrc/devel/py-pybind11/ALTERNATIVES diff -u /dev/null pkgsrc/devel/py-pybind11/ALTERNATIVES:1.1 --- /dev/null Thu Dec 28 13:29:26 2023 +++ pkgsrc/devel/py-pybind11/ALTERNATIVES Thu Dec 28 13:29:26 2023 @@ -0,0 +1 @@ +bin/pybind11-config @PREFIX@/bin/pybind11-config-@PYVERSSUFFIX@ --_----------=_17037701663630--