Hello ports,
Please find attached a patch to update scons to the latest release, the
changelog is available at:
https://github.com/SCons/scons/releases/tag/4.3.0
I had to change the master sites to pypi because the tarball for 4.3.0
is not available on sourceforge and the github-generated one doesn't
have the manpage in it.
The tests are still disabled because the pypi tarball doesn't ship
those. I've ran the regress suite manually from a git checkout and it's
even better than with the current version: out of 1234 tests 8 failed
and 203 were skipped (either because they're specific to other OSes or
because I didn't had some tools -- dlang, fortran, ... -- installed.)
The failing tests are:
test/Configure/option--config.py
test/LINK/applelink.py (hardcodes gcc)
test/Rpcgen/live.py
test/TEX/biblatex.py
test/TEX/biblatex_plain.py
test/long-lines/live.py
test/packaging/guess-package-name.py
test/packaging/tar/xz_packaging.py
This time the situation with the consumers is good:
- devel/arm-compute-library: aarch64 only, untested
- devel/serf: packages fine
- games/boswars: packages fine
- games/dangerdeep: packages fine
- games/dxx-rebirth: packages fine
- games/endless-sky: packages fine
- games/godot: packages fine
- games/pingus: packages fine
- graphics/mapnik: packages fine
- misc/gpsd: packages fine
(note that database/mongodb and games/thedarkmod are still using scons
2.3 so I haven't try to build those.)
There's a bit of churn in the makefile due to the removal of the RCS tag
and because I've reorganized the MODPY_* variables to be closer and
aligned, apologies.
OK?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile 2 Nov 2021 00:06:13 -0000 1.34
+++ Makefile 1 Mar 2022 22:33:53 -0000
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.34 2021/11/02 00:06:13 sthen Exp $
-
COMMENT= Python-based build system
-VERSION= 4.2.0
-DISTNAME= scons-${VERSION}
-REVISION= 0
+MODPY_EGG_VERSION= 4.3.0
+DISTNAME= SCons-${MODPY_EGG_VERSION}
+PKGNAME= ${DISTNAME:L}
CATEGORIES= devel
HOMEPAGE= https://www.scons.org/
@@ -12,16 +10,10 @@ HOMEPAGE= https://www.scons.org/
# MIT
PERMIT_PACKAGE= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scons/}
-
-MODULES= lang/python
-
-MODPY_SETUPTOOLS = Yes
-
-WRKDIST= ${WRKDIR}/SCons-${VERSION}
+MODULES= lang/python
+MODPY_PI= Yes
+MODPY_SETUPTOOLS= Yes
NO_TEST= Yes
-
-SUBST_VARS+= VERSION
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 31 Oct 2021 17:28:02 -0000 1.19
+++ distinfo 1 Mar 2022 22:23:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (scons-4.2.0.tar.gz) = aRiTtj84rRQpX1EEZh1Vy3OOxlFEIcYmEyM1HCVDKwo=
-SIZE (scons-4.2.0.tar.gz) = 3043008
+SHA256 (SCons-4.3.0.tar.gz) = 1HCBWH42dcwWjx9U8NdKabMoovyQ7E/rhfcoZ3QZuHk=
+SIZE (SCons-4.3.0.tar.gz) = 3065950
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 31 Oct 2021 17:28:02 -0000 1.14
+++ pkg/PLIST 1 Mar 2022 22:25:27 -0000
@@ -1,16 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.14 2021/10/31 17:28:02 sthen Exp $
bin/scons
bin/scons-configure-cache
bin/sconsign
lib/python${MODPY_VERSION}/site-packages/SCons/
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/SCons-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/SCons-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/SCons/Action.py
lib/python${MODPY_VERSION}/site-packages/SCons/Builder.py
lib/python${MODPY_VERSION}/site-packages/SCons/CacheDir.py
@@ -267,6 +266,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-35.pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-36.pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-37.pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.cpython-38.pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/docbook/docbook-xsl-1.76.1/.CatalogManager.properties.example
