CVS commit: pkgsrc/devel/scons

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

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.

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