Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0A91E1A9239 for ; Sat, 1 Jan 2022 21:46:45 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4FAEE84D67; Sat, 1 Jan 2022 21:46:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8BB9D84D5F for ; Sat, 1 Jan 2022 21:46:43 +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 sy2DxCKum3xp for ; Sat, 1 Jan 2022 21:46:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 084AF84CE3 for ; Sat, 1 Jan 2022 21:46:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F05D2FAEC; Sat, 1 Jan 2022 21:46:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1641073602103270" MIME-Version: 1.0 Date: Sat, 1 Jan 2022 21:46:42 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/devel/scons To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220101214642.F05D2FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1641073602103270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 1 21:46:42 UTC 2022 Modified Files: pkgsrc/devel/scons: Makefile PLIST Log Message: scons: convert to egg.mk Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/scons/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/scons/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1641073602103270 Content-Disposition: inline Content-Length: 2018 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/scons/Makefile diff -u pkgsrc/devel/scons/Makefile:1.48 pkgsrc/devel/scons/Makefile:1.49 --- pkgsrc/devel/scons/Makefile:1.48 Wed Jan 20 23:54:24 2021 +++ pkgsrc/devel/scons/Makefile Sat Jan 1 21:46:42 2022 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.48 2021/01/20 23:54:24 gdt Exp $ +# $NetBSD: Makefile,v 1.49 2022/01/01 21:46:42 wiz Exp $ # 4.1.0 is broken, per reports on gpsd list. Apparently 4.0.1 is ok. DISTNAME= scons-3.1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=s/scons/} @@ -26,5 +27,8 @@ SUBST_FILES.rflag= engine/SCons/Tool/gnu SUBST_SED.rflag= -e 's|-Wl,-rpath=|${COMPILER_RPATH_FLAG}|g' .include "../../lang/python/application.mk" -.include "../../lang/python/distutils.mk" +.include "../../lang/python/egg.mk" + +_PYSETUPTOOLSINSTALLARGS:= ${PYSETUPTOOLSINSTALLARGS:N--single-version-externally-managed} + .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/scons/PLIST diff -u pkgsrc/devel/scons/PLIST:1.19 pkgsrc/devel/scons/PLIST:1.20 --- pkgsrc/devel/scons/PLIST:1.19 Tue Sep 17 08:23:42 2019 +++ pkgsrc/devel/scons/PLIST Sat Jan 1 21:46:42 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2019/09/17 08:23:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2022/01/01 21:46:42 wiz Exp $ bin/scons bin/scons-${PKGVERSION} bin/scons-${PKGVERSION}.bat @@ -9,7 +9,6 @@ bin/scons-time-${PKGVERSION} bin/scons.bat bin/sconsign bin/sconsign-${PKGVERSION} -lib/scons/${EGG_FILE} lib/scons/SCons/Action.py lib/scons/SCons/Action.pyc lib/scons/SCons/Action.pyo @@ -592,6 +591,10 @@ lib/scons/SCons/dblite.pyo lib/scons/SCons/exitfuncs.py lib/scons/SCons/exitfuncs.pyc lib/scons/SCons/exitfuncs.pyo +${PLIST.py3x}lib/scons/${EGG_INFODIR}/PKG-INFO +${PLIST.py3x}lib/scons/${EGG_INFODIR}/SOURCES.txt +${PLIST.py3x}lib/scons/${EGG_INFODIR}/dependency_links.txt +${PLIST.py3x}lib/scons/${EGG_INFODIR}/top_level.txt man/man1/scons-time.1 man/man1/scons.1 man/man1/sconsign.1 --_----------=_1641073602103270--