Update devel/scons
Update to 3.1.2. Will be useful to upgrade MongoDB.
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile12 Jul 2019 20:46:00 - 1.28
+++ Makefile6 Feb 2020 19:59:44 -
@@ -2,7 +2,7 @@
COMMENT= Python-based build system
-VERSION = 2.5.1
+VERSION = 3.1.2
REVISION = 0
DISTNAME= scons-${VERSION}
CATEGORIES=devel
@@ -16,6 +16,7 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scons/}
MODULES= lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo28 Jun 2017 16:26:55 - 1.16
+++ distinfo6 Feb 2020 19:59:44 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
-SIZE (scons-2.5.1.tar.gz) = 620909
+SHA256 (scons-3.1.2.tar.gz) = eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps=
+SIZE (scons-3.1.2.tar.gz) = 668298
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 28 Jun 2017 16:26:55 - 1.11
+++ pkg/PLIST 6 Feb 2020 19:59:44 -
@@ -1,410 +1,428 @@
-@comment $OpenBSD: PLIST,v 1.11 2017/06/28 16:26:55 bcallah Exp $
+@comment $OpenBSD: PLIST,v$
bin/scons
bin/scons-${VERSION}
+bin/scons-${VERSION}.bat
bin/scons-configure-cache
bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
+bin/scons.bat
bin/sconsign
bin/sconsign-${VERSION}
-lib/scons-${VERSION}/
-lib/scons-${VERSION}/SCons/
-lib/scons-${VERSION}/SCons/Action.py
-lib/scons-${VERSION}/SCons/Action.pyc
-lib/scons-${VERSION}/SCons/Builder.py
-lib/scons-${VERSION}/SCons/Builder.pyc
-lib/scons-${VERSION}/SCons/CacheDir.py
-lib/scons-${VERSION}/SCons/CacheDir.pyc
-lib/scons-${VERSION}/SCons/Conftest.py
-lib/scons-${VERSION}/SCons/Conftest.pyc
-lib/scons-${VERSION}/SCons/Debug.py
-lib/scons-${VERSION}/SCons/Debug.pyc
-lib/scons-${VERSION}/SCons/Defaults.py
-lib/scons-${VERSION}/SCons/Defaults.pyc
-lib/scons-${VERSION}/SCons/Environment.py
-lib/scons-${VERSION}/SCons/Environment.pyc
-lib/scons-${VERSION}/SCons/Errors.py
-lib/scons-${VERSION}/SCons/Errors.pyc
-lib/scons-${VERSION}/SCons/Executor.py
-lib/scons-${VERSION}/SCons/Executor.pyc
-lib/scons-${VERSION}/SCons/Job.py
-lib/scons-${VERSION}/SCons/Job.pyc
-lib/scons-${VERSION}/SCons/Memoize.py
-lib/scons-${VERSION}/SCons/Memoize.pyc
-lib/scons-${VERSION}/SCons/Node/
-lib/scons-${VERSION}/SCons/Node/Alias.py
-lib/scons-${VERSION}/SCons/Node/Alias.pyc
-lib/scons-${VERSION}/SCons/Node/FS.py
-lib/scons-${VERSION}/SCons/Node/FS.pyc
-lib/scons-${VERSION}/SCons/Node/Python.py
-lib/scons-${VERSION}/SCons/Node/Python.pyc
-lib/scons-${VERSION}/SCons/Node/__init__.py
-lib/scons-${VERSION}/SCons/Node/__init__.pyc
-lib/scons-${VERSION}/SCons/Options/
-lib/scons-${VERSION}/SCons/Options/BoolOption.py
-lib/scons-${VERSION}/SCons/Options/BoolOption.pyc
-lib/scons-${VERSION}/SCons/Options/EnumOption.py
-lib/scons-${VERSION}/SCons/Options/EnumOption.pyc
-lib/scons-${VERSION}/SCons/Options/ListOption.py
-lib/scons-${VERSION}/SCons/Options/ListOption.pyc
-lib/scons-${VERSION}/SCons/Options/PackageOption.py
-lib/scons-${VERSION}/SCons/Options/PackageOption.pyc
-lib/scons-${VERSION}/SCons/Options/PathOption.py
-lib/scons-${VERSION}/SCons/Options/PathOption.pyc
-lib/scons-${VERSION}/SCons/Options/__init__.py
-lib/scons-${VERSION}/SCons/Options/__init__.pyc
-lib/scons-${VERSION}/SCons/PathList.py
-lib/scons-${VERSION}/SCons/PathList.pyc
-lib/scons-${VERSION}/SCons/Platform/
-lib/scons-${VERSION}/SCons/Platform/__init__.py
-lib/scons-${VERSION}/SCons/Platform/__init__.pyc
-lib/scons-${VERSION}/SCons/Platform/aix.py
-lib/scons-${VERSION}/SCons/Platform/aix.pyc
-lib/scons-${VERSION}/SCons/Platform/cygwin.py
-lib/scons-${VERSION}/SCons/Platform/cygwin.pyc
-lib/scons-${VERSION}/SCons/Platform/darwin.py
-lib/scons-${VERSION}/SCons/Platform/darwin.pyc
-lib/scons-${VERSION}/SCons/Platform/hpux.py
-lib/scons-${VERSION}/SCons/Platform/hpux.pyc
-lib/scons-${VERSION}/SCons/Platform/irix.py
-lib/scons-${VERSION}/SCons/Platform/irix.pyc
-lib/scons-${VERSION}/SCons/Platform/os2.py
-lib/scons-${VERSION}/SCons/Platform/os2.pyc
-lib/scons-${VERSION}/SCons/Platform/posix.py
-lib/scons-${VERSION}/SCons/Platform/posix.pyc
-lib/scons-${VERSION}/SCons/Platform/sunos.py
-lib/scons-${VERSION}/SCons/Platform/sunos.pyc
-lib/scons-${VERSION}/SCons/Platform/win32.py
-lib/scons-${VERSION}/SCons/Platform/win32.pyc
-lib/scons-${VERSION}/SCons/SConf.py
-lib/scons-${VERSION}/SCons/SConf.pyc
-lib/scons-${VERSION}/SCons/SConsign.py
-lib/scons-${VERSION}/SCons/SConsign.pyc
-lib/scons-${VERSIO
UPDATE: devel/scons
Hi,
Here is an update to scons-2.3.1.
Manpages removed because upstream forgot to generate them properly this
release so they are all blank, causing packaging to break.
On i386/amd64, all ports using scons still build.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile9 Oct 2013 11:56:37 - 1.18
+++ Makefile25 Mar 2014 21:58:43 -
@@ -2,8 +2,7 @@
COMMENT= Python-based build system
-VERSION = 2.3.0
-REVISION = 1
+VERSION = 2.3.1
DISTNAME= scons-${VERSION}
CATEGORIES=devel
@@ -22,8 +21,5 @@ NO_TEST= Yes
SUBST_VARS+= VERSION
MODPY_ADJ_FILES += script/scons script/sconsign script/scons-time
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/scons{,ign,-time}.1 ${PREFIX}/man/man1
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo5 Jul 2013 20:09:59 - 1.9
+++ distinfo25 Mar 2014 21:58:43 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.3.0.tar.gz) = lEIGmZnPSyyqlKWIarTCxx3hcY7V6RdsGOK228pGO0s=
-SIZE (scons-2.3.0.tar.gz) = 599514
+SHA256 (scons-2.3.1.tar.gz) = CRq0aPjmCEww866f1Igo44hAIUAc/vS3E9ExYboSAgE=
+SIZE (scons-2.3.1.tar.gz) = 499037
Index: patches/patch-engine_SCons_Tool___init___py
===
RCS file: patches/patch-engine_SCons_Tool___init___py
diff -N patches/patch-engine_SCons_Tool___init___py
--- patches/patch-engine_SCons_Tool___init___py 9 Oct 2013 11:56:38 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-engine_SCons_Tool___init___py,v 1.1 2013/10/09 11:56:38 stsp
Exp $
-https://bitbucket.org/scons/scons/commits/303b85fc931a9630abb10b0c3b1826541fe8aecd
engine/SCons/Tool/__init__.py.orig Sun Mar 3 15:48:39 2013
-+++ engine/SCons/Tool/__init__.py Thu Sep 5 15:40:24 2013
-@@ -257,6 +257,10 @@ def VersionShLibLinkNames(version, libname, env):
- print "VersionShLibLinkNames: linkname = ",linkname
- linknames.append(linkname)
- elif platform == 'posix':
-+if sys.platform.startswith('openbsd'):
-+# OpenBSD uses x.y shared library versioning numbering convention
-+# and doesn't use symlinks to backwards-compatible libraries
-+return []
- # For libfoo.so.x.y.z, linknames libfoo.so libfoo.so.x.y libfoo.so.x
- suffix_re = re.escape(shlib_suffix + '.' + version)
- # First linkname has no version number
-@@ -302,13 +306,17 @@ symlinks for the platform we are on"""
- if version:
- # set the shared library link flags
- if platform == 'posix':
--suffix_re = re.escape(shlib_suffix + '.' + version)
--(major, age, revision) = version.split(".")
--# soname will have only the major version number in it
--soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
--shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
--if Verbose:
--print " soname ",soname,", shlink_flags ",shlink_flags
-+shlink_flags += [ '-Wl,-Bsymbolic' ]
-+if sys.platform.startswith('openbsd'):
-+pass # OpenBSD doesn't usually use SONAME for libraries
-+else:
-+suffix_re = re.escape(shlib_suffix + '.' + version)
-+(major, age, revision) = version.split(".")
-+# soname will have only the major version number in it
-+soname = re.sub(suffix_re, shlib_suffix, libname) + '.' +
major
-+shlink_flags += [ '-Wl,-soname=%s' % soname ]
-+if Verbose:
-+print " soname ",soname,", shlink_flags ",shlink_flags
- elif platform == 'cygwin':
- shlink_flags += [ '-Wl,-Bsymbolic',
- '-Wl,--out-implib,${TARGET.base}.a' ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 5 Jul 2013 20:09:59 - 1.7
+++ pkg/PLIST 25 Mar 2014 21:58:43 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2013/07/05 20:09:59 bentley Exp $
+@comment $OpenBSD$
bin/scons
bin/scons-${VERSION}
bin/scons-time
@@ -176,10 +176,15 @@ lib/scons-${VERSION}/SCons/Tool/cc.py
lib/scons-${VERSION}/SCons/Tool/cc.pyc
lib/scons-${VERSION}/SCons/Tool/cvf.py
lib/scons-${VERSION}/SCons/Tool/cvf.pyc
+lib/scons-${VERSION}/SCons/Tool/cyglink.py
+lib/scons-${VERSION}/SCons/Tool/cyglink.pyc
lib/scons-${VERSION}/SCons/Tool/default.py
lib/scons-${VERSION}/SCons/Tool/default.pyc
lib/scons-${VERSION}/SCons/Tool/dmd.py
lib/scons
UPDATE: devel/scons
Hi,
Here is a minor update to scons-2.3.4. All ports using the scons MODULE
still package.
The post-install target to install manuals is no longer necessary.
ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile10 Jul 2014 05:04:45 - 1.19
+++ Makefile13 Jan 2015 17:27:31 -
@@ -2,7 +2,7 @@
COMMENT= Python-based build system
-VERSION = 2.3.2
+VERSION = 2.3.4
DISTNAME= scons-${VERSION}
CATEGORIES=devel
@@ -21,8 +21,5 @@ NO_TEST= Yes
SUBST_VARS+= VERSION
MODPY_ADJ_FILES += script/scons script/sconsign script/scons-time
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/scons{,ign,-time}.1 ${PREFIX}/man/man1
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo10 Jul 2014 05:04:45 - 1.10
+++ distinfo13 Jan 2015 17:27:31 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.3.2.tar.gz) = +ZMyDF6VFeZWf8znPfCnqICEFL8SI8aRI9Pc8zmkSdQ=
-SIZE (scons-2.3.2.tar.gz) = 621932
+SHA256 (scons-2.3.4.tar.gz) = S1fXIGb+07b/Zafdn3NjPJscCfh1IOmzquhLPkhktEE=
+SIZE (scons-2.3.4.tar.gz) = 621953
Re: Update devel/scons
Le 2020-02-06 21:01, Denis Fondras a écrit :
Update to 3.1.2. Will be useful to upgrade MongoDB.
-@comment $OpenBSD: PLIST,v 1.11 2017/06/28 16:26:55 bcallah Exp $
+@comment $OpenBSD: PLIST,v$
+bin/scons-${VERSION}.bat
+bin/scons.bat
I'm not sure we need those bat files
Re: Update devel/scons
On 2020/02/06 21:01, Denis Fondras wrote: > Update to 3.1.2. Will be useful to upgrade MongoDB. btw, replacing mongodb with a newer version is blocked until ubiquiti get round to fixing unifi, though a newer version could be added separately..
Re: Update devel/scons
On 2020-02-06 3:29 PM, Stuart Henderson wrote: On 2020/02/06 21:01, Denis Fondras wrote: Update to 3.1.2. Will be useful to upgrade MongoDB. btw, replacing mongodb with a newer version is blocked until ubiquiti get round to fixing unifi, though a newer version could be added separately.. Whenever this goes in, can you please drop me as maintainer? Last time I looked into this (years ago now, admittedly), some of its dependents did not build. Hopefully that is no longer the case. ~Brian
Re: Update devel/scons
Stuart Henderson [s...@spacehopper.org] wrote: > On 2020/02/06 21:01, Denis Fondras wrote: > > Update to 3.1.2. Will be useful to upgrade MongoDB. > > btw, replacing mongodb with a newer version is blocked until ubiquiti > get round to fixing unifi, though a newer version could be added separately.. I'm not sure that ubiquiti will ever switch to a newer mongo, more likey to something else considering mongodb's new license.
Re: Update devel/scons
On 2020/02/06 14:05, Chris Cappuccio wrote: > Stuart Henderson [s...@spacehopper.org] wrote: > > On 2020/02/06 21:01, Denis Fondras wrote: > > > Update to 3.1.2. Will be useful to upgrade MongoDB. > > > > btw, replacing mongodb with a newer version is blocked until ubiquiti > > get round to fixing unifi, though a newer version could be added > > separately.. > > I'm not sure that ubiquiti will ever switch to a newer mongo, more likey > to something else considering mongodb's new license. > Wouldn't they just do the same they've done with Java when their license changed (i.e. make people install it themselves)? Or keep on providing the old binaries themselves but not force the no-longer-supported command line flags so it works for distribution packagers.. (Of course I would very much support them switching to something that isn't mongodb...)
Re: Update devel/scons
Stuart Henderson [s...@spacehopper.org] wrote: > > Wouldn't they just do the same they've done with Java when their license > changed (i.e. make people install it themselves)? Or keep on providing the > old binaries themselves but not force the no-longer-supported command line > flags so it works for distribution packagers.. > > (Of course I would very much support them switching to something that > isn't mongodb...) They package the full UniFi controller software in their own products (Cloud Key, UDM) so it needs to be replaced
Re: Update devel/scons
On 2020/02/06 15:53, Chris Cappuccio wrote: > Stuart Henderson [s...@spacehopper.org] wrote: > > > > Wouldn't they just do the same they've done with Java when their license > > changed (i.e. make people install it themselves)? Or keep on providing the > > old binaries themselves but not force the no-longer-supported command line > > flags so it works for distribution packagers.. > > > > (Of course I would very much support them switching to something that > > isn't mongodb...) > > They package the full UniFi controller software in their own products > (Cloud Key, UDM) so it needs to be replaced > I don't think anyone is asking them to update their own distros, just that they don't force command line flags which don't work on newer versions.
Re: Update devel/scons
On Thu, Feb 06, 2020 at 09:16:47PM +0100, Solène Rapenne wrote:
> Le 2020-02-06 21:01, Denis Fondras a écrit :
> > Update to 3.1.2. Will be useful to upgrade MongoDB.
>
> > -@comment $OpenBSD: PLIST,v 1.11 2017/06/28 16:26:55 bcallah Exp $
> > +@comment $OpenBSD: PLIST,v$
>
> > +bin/scons-${VERSION}.bat
> > +bin/scons.bat
>
> I'm not sure we need those bat files
Thanks for checking. Updated diff :
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile12 Jul 2019 20:46:00 - 1.28
+++ Makefile15 Feb 2020 17:48:50 -
@@ -2,7 +2,7 @@
COMMENT= Python-based build system
-VERSION = 2.5.1
+VERSION = 3.1.2
REVISION = 0
DISTNAME= scons-${VERSION}
CATEGORIES=devel
@@ -16,6 +16,7 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scons/}
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo28 Jun 2017 16:26:55 - 1.16
+++ distinfo15 Feb 2020 17:48:50 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
-SIZE (scons-2.5.1.tar.gz) = 620909
+SHA256 (scons-3.1.2.tar.gz) = eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps=
+SIZE (scons-3.1.2.tar.gz) = 668298
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 28 Jun 2017 16:26:55 - 1.11
+++ pkg/PLIST 15 Feb 2020 17:48:50 -
@@ -7,404 +7,420 @@ bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
bin/sconsign-${VERSION}
-lib/scons-${VERSION}/
-lib/scons-${VERSION}/SCons/
-lib/scons-${VERSION}/SCons/Action.py
-lib/scons-${VERSION}/SCons/Action.pyc
-lib/scons-${VERSION}/SCons/Builder.py
-lib/scons-${VERSION}/SCons/Builder.pyc
-lib/scons-${VERSION}/SCons/CacheDir.py
-lib/scons-${VERSION}/SCons/CacheDir.pyc
-lib/scons-${VERSION}/SCons/Conftest.py
-lib/scons-${VERSION}/SCons/Conftest.pyc
-lib/scons-${VERSION}/SCons/Debug.py
-lib/scons-${VERSION}/SCons/Debug.pyc
-lib/scons-${VERSION}/SCons/Defaults.py
-lib/scons-${VERSION}/SCons/Defaults.pyc
-lib/scons-${VERSION}/SCons/Environment.py
-lib/scons-${VERSION}/SCons/Environment.pyc
-lib/scons-${VERSION}/SCons/Errors.py
-lib/scons-${VERSION}/SCons/Errors.pyc
-lib/scons-${VERSION}/SCons/Executor.py
-lib/scons-${VERSION}/SCons/Executor.pyc
-lib/scons-${VERSION}/SCons/Job.py
-lib/scons-${VERSION}/SCons/Job.pyc
-lib/scons-${VERSION}/SCons/Memoize.py
-lib/scons-${VERSION}/SCons/Memoize.pyc
-lib/scons-${VERSION}/SCons/Node/
-lib/scons-${VERSION}/SCons/Node/Alias.py
-lib/scons-${VERSION}/SCons/Node/Alias.pyc
-lib/scons-${VERSION}/SCons/Node/FS.py
-lib/scons-${VERSION}/SCons/Node/FS.pyc
-lib/scons-${VERSION}/SCons/Node/Python.py
-lib/scons-${VERSION}/SCons/Node/Python.pyc
-lib/scons-${VERSION}/SCons/Node/__init__.py
-lib/scons-${VERSION}/SCons/Node/__init__.pyc
-lib/scons-${VERSION}/SCons/Options/
-lib/scons-${VERSION}/SCons/Options/BoolOption.py
-lib/scons-${VERSION}/SCons/Options/BoolOption.pyc
-lib/scons-${VERSION}/SCons/Options/EnumOption.py
-lib/scons-${VERSION}/SCons/Options/EnumOption.pyc
-lib/scons-${VERSION}/SCons/Options/ListOption.py
-lib/scons-${VERSION}/SCons/Options/ListOption.pyc
-lib/scons-${VERSION}/SCons/Options/PackageOption.py
-lib/scons-${VERSION}/SCons/Options/PackageOption.pyc
-lib/scons-${VERSION}/SCons/Options/PathOption.py
-lib/scons-${VERSION}/SCons/Options/PathOption.pyc
-lib/scons-${VERSION}/SCons/Options/__init__.py
-lib/scons-${VERSION}/SCons/Options/__init__.pyc
-lib/scons-${VERSION}/SCons/PathList.py
-lib/scons-${VERSION}/SCons/PathList.pyc
-lib/scons-${VERSION}/SCons/Platform/
-lib/scons-${VERSION}/SCons/Platform/__init__.py
-lib/scons-${VERSION}/SCons/Platform/__init__.pyc
-lib/scons-${VERSION}/SCons/Platform/aix.py
-lib/scons-${VERSION}/SCons/Platform/aix.pyc
-lib/scons-${VERSION}/SCons/Platform/cygwin.py
-lib/scons-${VERSION}/SCons/Platform/cygwin.pyc
-lib/scons-${VERSION}/SCons/Platform/darwin.py
-lib/scons-${VERSION}/SCons/Platform/darwin.pyc
-lib/scons-${VERSION}/SCons/Platform/hpux.py
-lib/scons-${VERSION}/SCons/Platform/hpux.pyc
-lib/scons-${VERSION}/SCons/Platform/irix.py
-lib/scons-${VERSION}/SCons/Platform/irix.pyc
-lib/scons-${VERSION}/SCons/Platform/os2.py
-lib/scons-${VERSION}/SCons/Platform/os2.pyc
-lib/scons-${VERSION}/SCons/Platform/posix.py
-lib/scons-${VERSION}/SCons/Platform/posix.pyc
-lib/scons-${VERSION}/SCons/Platform/sunos.py
-lib/scons-${VERSION}/SCons/Platform/sunos.pyc
-lib/scons-${VERSION}/SCons/Platform/win32.py
-lib/scons-${VERSION}/SCons/Platform/win32.pyc
-lib/scons-${VERSION}/SCons/SConf.py
-lib/scons-${VERSION}/SCons/
UPDATE: devel/scons 2.5.1
Hi,
Here a little update for scons, would be needed for a couple of app in the
near future.
Hope it s useful.
Regards.
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile1 Jun 2017 19:58:04 - 1.25
+++ Makefile12 Jun 2017 20:39:19 -
@@ -2,9 +2,8 @@
COMMENT= Python-based build system
-VERSION = 2.4.1
+VERSION = 2.5.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES=devel
HOMEPAGE= http://www.scons.org/
@@ -19,6 +18,7 @@ MODULES= lang/python
NO_TEST= Yes
SUBST_VARS+= VERSION
+SUBST_VARS+= FULLPKGNAME
MODPY_ADJ_FILES += script/scons script/sconsign script/scons-time
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo1 Dec 2015 08:26:16 - 1.15
+++ distinfo12 Jun 2017 20:39:19 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = j8T0KSjGm8uzPhvpS2RvLHALZZaT+rx3jBktTSL3U6c=
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
+SIZE (scons-2.5.1.tar.gz) = 620909
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 10 Jul 2015 07:06:07 - 1.10
+++ pkg/PLIST 12 Jun 2017 20:39:19 -
@@ -1,418 +1,410 @@
@comment $OpenBSD: PLIST,v 1.10 2015/07/10 07:06:07 jasper Exp $
bin/scons
-bin/scons-${VERSION}
+bin/${FULLPKGNAME}
+bin/scons-configure-cache
+bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
bin/sconsign-${VERSION}
-lib/scons-${VERSION}/
-lib/scons-${VERSION}/SCons/
-lib/scons-${VERSION}/SCons/Action.py
-lib/scons-${VERSION}/SCons/Action.pyc
-lib/scons-${VERSION}/SCons/Builder.py
-lib/scons-${VERSION}/SCons/Builder.pyc
-lib/scons-${VERSION}/SCons/CacheDir.py
-lib/scons-${VERSION}/SCons/CacheDir.pyc
-lib/scons-${VERSION}/SCons/Conftest.py
-lib/scons-${VERSION}/SCons/Conftest.pyc
-lib/scons-${VERSION}/SCons/Debug.py
-lib/scons-${VERSION}/SCons/Debug.pyc
-lib/scons-${VERSION}/SCons/Defaults.py
-lib/scons-${VERSION}/SCons/Defaults.pyc
-lib/scons-${VERSION}/SCons/Environment.py
-lib/scons-${VERSION}/SCons/Environment.pyc
-lib/scons-${VERSION}/SCons/Errors.py
-lib/scons-${VERSION}/SCons/Errors.pyc
-lib/scons-${VERSION}/SCons/Executor.py
-lib/scons-${VERSION}/SCons/Executor.pyc
-lib/scons-${VERSION}/SCons/Job.py
-lib/scons-${VERSION}/SCons/Job.pyc
-lib/scons-${VERSION}/SCons/Memoize.py
-lib/scons-${VERSION}/SCons/Memoize.pyc
-lib/scons-${VERSION}/SCons/Node/
-lib/scons-${VERSION}/SCons/Node/Alias.py
-lib/scons-${VERSION}/SCons/Node/Alias.pyc
-lib/scons-${VERSION}/SCons/Node/FS.py
-lib/scons-${VERSION}/SCons/Node/FS.pyc
-lib/scons-${VERSION}/SCons/Node/Python.py
-lib/scons-${VERSION}/SCons/Node/Python.pyc
-lib/scons-${VERSION}/SCons/Node/__init__.py
-lib/scons-${VERSION}/SCons/Node/__init__.pyc
-lib/scons-${VERSION}/SCons/Options/
-lib/scons-${VERSION}/SCons/Options/BoolOption.py
-lib/scons-${VERSION}/SCons/Options/BoolOption.pyc
-lib/scons-${VERSION}/SCons/Options/EnumOption.py
-lib/scons-${VERSION}/SCons/Options/EnumOption.pyc
-lib/scons-${VERSION}/SCons/Options/ListOption.py
-lib/scons-${VERSION}/SCons/Options/ListOption.pyc
-lib/scons-${VERSION}/SCons/Options/PackageOption.py
-lib/scons-${VERSION}/SCons/Options/PackageOption.pyc
-lib/scons-${VERSION}/SCons/Options/PathOption.py
-lib/scons-${VERSION}/SCons/Options/PathOption.pyc
-lib/scons-${VERSION}/SCons/Options/__init__.py
-lib/scons-${VERSION}/SCons/Options/__init__.pyc
-lib/scons-${VERSION}/SCons/PathList.py
-lib/scons-${VERSION}/SCons/PathList.pyc
-lib/scons-${VERSION}/SCons/Platform/
-lib/scons-${VERSION}/SCons/Platform/__init__.py
-lib/scons-${VERSION}/SCons/Platform/__init__.pyc
-lib/scons-${VERSION}/SCons/Platform/aix.py
-lib/scons-${VERSION}/SCons/Platform/aix.pyc
-lib/scons-${VERSION}/SCons/Platform/cygwin.py
-lib/scons-${VERSION}/SCons/Platform/cygwin.pyc
-lib/scons-${VERSION}/SCons/Platform/darwin.py
-lib/scons-${VERSION}/SCons/Platform/darwin.pyc
-lib/scons-${VERSION}/SCons/Platform/hpux.py
-lib/scons-${VERSION}/SCons/Platform/hpux.pyc
-lib/scons-${VERSION}/SCons/Platform/irix.py
-lib/scons-${VERSION}/SCons/Platform/irix.pyc
-lib/scons-${VERSION}/SCons/Platform/os2.py
-lib/scons-${VERSION}/SCons/Platform/os2.pyc
-lib/scons-${VERSION}/SCons/Platform/posix.py
-lib/scons-${VERSION}/SCons/Platform/posix.pyc
-lib/scons-${VERSION}/SCons/Platform/sunos.py
-lib/scons-${VERSION}/SCons/Platform/sunos.pyc
-lib/scons-${VERSION}/SCons/Platform/win32.py
-lib/scons-${VERSION}/SCons/Platform/win32.pyc
-lib/scons-${VERSION}/SCons/SConf.py
-lib/scons-${VERSION}/SCons/SConf.pyc
-lib/scons-${VERSION}/SCons/SConsign.py
-lib/sco
Re: UPDATE: devel/scons
Hi Anthony,
Anthony J. Bentley wrote on Tue, Jul 01, 2014 at 09:42:57PM -0600:
> Here is an update to scons-2.3.1.
>
> Manpages removed because upstream forgot to generate them properly
> this release so they are all blank, causing packaging to break.
When there is such a major regression in a release, isn't it better
to just skip the update and wait for the next release?
Or if the update is urgently needed, can upstream be poked to release
again? Or if they won't and we still urgently need the update, can
the problem be patched away in the ports tree?
Yours,
Ingo
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/scons/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- Makefile 9 Oct 2013 11:56:37 - 1.18
> +++ Makefile 25 Mar 2014 21:58:43 -
> @@ -2,8 +2,7 @@
>
> COMMENT= Python-based build system
>
> -VERSION =2.3.0
> -REVISION = 1
> +VERSION =2.3.1
> DISTNAME=scons-${VERSION}
> CATEGORIES= devel
>
> @@ -22,8 +21,5 @@ NO_TEST=Yes
> SUBST_VARS+= VERSION
>
> MODPY_ADJ_FILES += script/scons script/sconsign script/scons-time
> -
> -post-install:
> - ${INSTALL_MAN} ${WRKSRC}/scons{,ign,-time}.1 ${PREFIX}/man/man1
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/scons/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- distinfo 5 Jul 2013 20:09:59 - 1.9
> +++ distinfo 25 Mar 2014 21:58:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (scons-2.3.0.tar.gz) = lEIGmZnPSyyqlKWIarTCxx3hcY7V6RdsGOK228pGO0s=
> -SIZE (scons-2.3.0.tar.gz) = 599514
> +SHA256 (scons-2.3.1.tar.gz) = CRq0aPjmCEww866f1Igo44hAIUAc/vS3E9ExYboSAgE=
> +SIZE (scons-2.3.1.tar.gz) = 499037
> Index: patches/patch-engine_SCons_Tool___init___py
> ===
> RCS file: patches/patch-engine_SCons_Tool___init___py
> diff -N patches/patch-engine_SCons_Tool___init___py
> --- patches/patch-engine_SCons_Tool___init___py 9 Oct 2013 11:56:38
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,40 +0,0 @@
> -$OpenBSD: patch-engine_SCons_Tool___init___py,v 1.1 2013/10/09 11:56:38 stsp
> Exp $
> -https://bitbucket.org/scons/scons/commits/303b85fc931a9630abb10b0c3b1826541fe8aecd
> engine/SCons/Tool/__init__.py.orig Sun Mar 3 15:48:39 2013
> -+++ engine/SCons/Tool/__init__.pyThu Sep 5 15:40:24 2013
> -@@ -257,6 +257,10 @@ def VersionShLibLinkNames(version, libname, env):
> - print "VersionShLibLinkNames: linkname = ",linkname
> - linknames.append(linkname)
> - elif platform == 'posix':
> -+if sys.platform.startswith('openbsd'):
> -+# OpenBSD uses x.y shared library versioning numbering
> convention
> -+# and doesn't use symlinks to backwards-compatible libraries
> -+return []
> - # For libfoo.so.x.y.z, linknames libfoo.so libfoo.so.x.y libfoo.so.x
> - suffix_re = re.escape(shlib_suffix + '.' + version)
> - # First linkname has no version number
> -@@ -302,13 +306,17 @@ symlinks for the platform we are on"""
> - if version:
> - # set the shared library link flags
> - if platform == 'posix':
> --suffix_re = re.escape(shlib_suffix + '.' + version)
> --(major, age, revision) = version.split(".")
> --# soname will have only the major version number in it
> --soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
> --shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
> --if Verbose:
> --print " soname ",soname,", shlink_flags ",shlink_flags
> -+shlink_flags += [ '-Wl,-Bsymbolic' ]
> -+if sys.platform.startswith('openbsd'):
> -+pass # OpenBSD doesn't usually use SONAME for libraries
> -+else:
> -+suffix_re = re.escape(shlib_suffix + '.' + version)
> -+(major, age, revision) = version.split(".")
> -+# soname will have only the major version number in it
> -+soname = re.sub(suffix_re, shlib_suffix, libname) + '.' +
> major
> -+shlink_flags += [ '-Wl,-soname=%s' % soname ]
> -+if Verbose:
> -+print " soname ",soname,", shlink_flags ",shlink_flags
> - elif platform == 'cygwin':
> - shlink_flags += [ '-Wl,-Bsymbolic',
> - '-Wl,--out-implib,${TARGET.base}.a' ]
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- pkg/PLIST 5 Jul 2013 20:09:59 - 1.7
> +++ pkg/PLIST 25 Mar 2014 21:58:43 -
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD
Re: UPDATE: devel/scons
On Tue, Jul 1, 2014 at 9:58 PM, Ingo Schwarze wrote:
> Hi Anthony,
>
> Anthony J. Bentley wrote on Tue, Jul 01, 2014 at 09:42:57PM -0600:
>
>> Here is an update to scons-2.3.1.
>>
>> Manpages removed because upstream forgot to generate them properly
>> this release so they are all blank, causing packaging to break.
>
> When there is such a major regression in a release, isn't it better
> to just skip the update and wait for the next release?
You're right. I poked upstream and they made a new release (which they
seemed to be planning to do soon anyway).
Everything depending on scons still builds. ok?
--
Anthony J. Bentley
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile9 Oct 2013 11:56:37 - 1.18
+++ Makefile9 Jul 2014 18:34:55 -
@@ -2,8 +2,7 @@
COMMENT= Python-based build system
-VERSION = 2.3.0
-REVISION = 1
+VERSION = 2.3.2
DISTNAME= scons-${VERSION}
CATEGORIES=devel
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo5 Jul 2013 20:09:59 - 1.9
+++ distinfo9 Jul 2014 18:34:55 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.3.0.tar.gz) = lEIGmZnPSyyqlKWIarTCxx3hcY7V6RdsGOK228pGO0s=
-SIZE (scons-2.3.0.tar.gz) = 599514
+SHA256 (scons-2.3.2.tar.gz) = +ZMyDF6VFeZWf8znPfCnqICEFL8SI8aRI9Pc8zmkSdQ=
+SIZE (scons-2.3.2.tar.gz) = 621932
Index: patches/patch-engine_SCons_Tool___init___py
===
RCS file: patches/patch-engine_SCons_Tool___init___py
diff -N patches/patch-engine_SCons_Tool___init___py
--- patches/patch-engine_SCons_Tool___init___py 9 Oct 2013 11:56:38 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,40 +0,0 @@
-$OpenBSD: patch-engine_SCons_Tool___init___py,v 1.1 2013/10/09 11:56:38 stsp
Exp $
-https://bitbucket.org/scons/scons/commits/303b85fc931a9630abb10b0c3b1826541fe8aecd
engine/SCons/Tool/__init__.py.orig Sun Mar 3 15:48:39 2013
-+++ engine/SCons/Tool/__init__.py Thu Sep 5 15:40:24 2013
-@@ -257,6 +257,10 @@ def VersionShLibLinkNames(version, libname, env):
- print "VersionShLibLinkNames: linkname = ",linkname
- linknames.append(linkname)
- elif platform == 'posix':
-+if sys.platform.startswith('openbsd'):
-+# OpenBSD uses x.y shared library versioning numbering convention
-+# and doesn't use symlinks to backwards-compatible libraries
-+return []
- # For libfoo.so.x.y.z, linknames libfoo.so libfoo.so.x.y libfoo.so.x
- suffix_re = re.escape(shlib_suffix + '.' + version)
- # First linkname has no version number
-@@ -302,13 +306,17 @@ symlinks for the platform we are on"""
- if version:
- # set the shared library link flags
- if platform == 'posix':
--suffix_re = re.escape(shlib_suffix + '.' + version)
--(major, age, revision) = version.split(".")
--# soname will have only the major version number in it
--soname = re.sub(suffix_re, shlib_suffix, libname) + '.' + major
--shlink_flags += [ '-Wl,-Bsymbolic', '-Wl,-soname=%s' % soname ]
--if Verbose:
--print " soname ",soname,", shlink_flags ",shlink_flags
-+shlink_flags += [ '-Wl,-Bsymbolic' ]
-+if sys.platform.startswith('openbsd'):
-+pass # OpenBSD doesn't usually use SONAME for libraries
-+else:
-+suffix_re = re.escape(shlib_suffix + '.' + version)
-+(major, age, revision) = version.split(".")
-+# soname will have only the major version number in it
-+soname = re.sub(suffix_re, shlib_suffix, libname) + '.' +
major
-+shlink_flags += [ '-Wl,-soname=%s' % soname ]
-+if Verbose:
-+print " soname ",soname,", shlink_flags ",shlink_flags
- elif platform == 'cygwin':
- shlink_flags += [ '-Wl,-Bsymbolic',
- '-Wl,--out-implib,${TARGET.base}.a' ]
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- pkg/PLIST 5 Jul 2013 20:09:59 - 1.7
+++ pkg/PLIST 9 Jul 2014 18:34:55 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2013/07/05 20:09:59 bentley Exp $
+@comment $OpenBSD$
bin/scons
bin/scons-${VERSION}
bin/scons-time
@@ -121,6 +121,8 @@ lib/scons-${VERSION}/SCons/Tool/BitKeepe
lib/scons-${VERSION}/SCons/Tool/BitKeeper.pyc
lib/scons-${VERSION}/SCons/Tool/CVS.py
lib/scons-${VERSION}/SCons/Tool/CVS.pyc
+lib/scons-${VERSION}/SCons/Tool/DCommon.py
+lib/scon
UPDATE: devel/scons 0.96.92
PORT: devel/scons
LOCATION: attached
DESCRIPTION: Python-based build system
COMMENT:
Update to 0.96.92
Tested on
i386 -current
Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/devel/scons/Makefile,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 Makefile
--- Makefile23 Oct 2004 12:37:32 - 1.1.1.1
+++ Makefile14 Apr 2006 14:06:30 -
@@ -2,7 +2,8 @@
COMMENT= "Python-based build system"
-DISTNAME= scons-0.96.1
+VERSION= 0.96.92
+DISTNAME= scons-${VERSION}
CATEGORIES=devel
HOMEPAGE= http://www.scons.org/
@@ -20,6 +21,8 @@
MODULES= python
NO_REGRESS=Yes
+
+SUBST_VARS+= VERSION
post-install:
${INSTALL_MAN} ${WRKSRC}/scons.1${PREFIX}/man/man1
Index: distinfo
===
RCS file: /cvs/OpenBSD/ports/devel/scons/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo5 Jan 2005 16:22:42 - 1.2
+++ distinfo14 Apr 2006 14:07:08 -
@@ -1,4 +1,4 @@
-MD5 (scons-0.96.1.tar.gz) = 45b1c346edd8a0970210aeb1e82557c9
-RMD160 (scons-0.96.1.tar.gz) = 3957868c1bd0dcd8138e98b62d84ee83ad654bd4
-SHA1 (scons-0.96.1.tar.gz) = 9ba5c47ffc1fa947b9984700d9a4f4c2368d74aa
-SIZE (scons-0.96.1.tar.gz) = 283576
+MD5 (scons-0.96.92.tar.gz) = 0b6b388cdd640b7f297f37a678c65d5c
+RMD160 (scons-0.96.92.tar.gz) = 75aa04717da98eccabc42180f6eab9ee4b8bd904
+SHA1 (scons-0.96.92.tar.gz) = 17a3f462f4eb37052df17b47e6528d72472092eb
+SIZE (scons-0.96.92.tar.gz) = 372708
Index: pkg/PLIST
===
RCS file: /cvs/OpenBSD/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PLIST
--- pkg/PLIST 23 Oct 2004 12:37:32 - 1.1.1.1
+++ pkg/PLIST 14 Apr 2006 14:09:49 -
@@ -1,273 +1,299 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/23 12:37:32 xsa Exp $
bin/scons
+bin/scons-${VERSION}
bin/sconsign
-lib/scons/
-lib/scons/SCons/
-lib/scons/SCons/Action.py
-lib/scons/SCons/Action.pyc
-lib/scons/SCons/Builder.py
-lib/scons/SCons/Builder.pyc
-lib/scons/SCons/Conftest.py
-lib/scons/SCons/Conftest.pyc
-lib/scons/SCons/Debug.py
-lib/scons/SCons/Debug.pyc
-lib/scons/SCons/Defaults.py
-lib/scons/SCons/Defaults.pyc
-lib/scons/SCons/Environment.py
-lib/scons/SCons/Environment.pyc
-lib/scons/SCons/Errors.py
-lib/scons/SCons/Errors.pyc
-lib/scons/SCons/Executor.py
-lib/scons/SCons/Executor.pyc
-lib/scons/SCons/Job.py
-lib/scons/SCons/Job.pyc
-lib/scons/SCons/Node/
-lib/scons/SCons/Node/Alias.py
-lib/scons/SCons/Node/Alias.pyc
-lib/scons/SCons/Node/FS.py
-lib/scons/SCons/Node/FS.pyc
-lib/scons/SCons/Node/Python.py
-lib/scons/SCons/Node/Python.pyc
-lib/scons/SCons/Node/__init__.py
-lib/scons/SCons/Node/__init__.pyc
-lib/scons/SCons/Optik/
-lib/scons/SCons/Optik/__init__.py
-lib/scons/SCons/Optik/__init__.pyc
-lib/scons/SCons/Optik/errors.py
-lib/scons/SCons/Optik/errors.pyc
-lib/scons/SCons/Optik/option.py
-lib/scons/SCons/Optik/option.pyc
-lib/scons/SCons/Optik/option_parser.py
-lib/scons/SCons/Optik/option_parser.pyc
-lib/scons/SCons/Options/
-lib/scons/SCons/Options/BoolOption.py
-lib/scons/SCons/Options/BoolOption.pyc
-lib/scons/SCons/Options/EnumOption.py
-lib/scons/SCons/Options/EnumOption.pyc
-lib/scons/SCons/Options/ListOption.py
-lib/scons/SCons/Options/ListOption.pyc
-lib/scons/SCons/Options/PackageOption.py
-lib/scons/SCons/Options/PackageOption.pyc
-lib/scons/SCons/Options/PathOption.py
-lib/scons/SCons/Options/PathOption.pyc
-lib/scons/SCons/Options/__init__.py
-lib/scons/SCons/Options/__init__.pyc
-lib/scons/SCons/Platform/
-lib/scons/SCons/Platform/__init__.py
-lib/scons/SCons/Platform/__init__.pyc
-lib/scons/SCons/Platform/aix.py
-lib/scons/SCons/Platform/aix.pyc
-lib/scons/SCons/Platform/cygwin.py
-lib/scons/SCons/Platform/cygwin.pyc
-lib/scons/SCons/Platform/darwin.py
-lib/scons/SCons/Platform/darwin.pyc
-lib/scons/SCons/Platform/hpux.py
-lib/scons/SCons/Platform/hpux.pyc
-lib/scons/SCons/Platform/irix.py
-lib/scons/SCons/Platform/irix.pyc
-lib/scons/SCons/Platform/os2.py
-lib/scons/SCons/Platform/os2.pyc
-lib/scons/SCons/Platform/posix.py
-lib/scons/SCons/Platform/posix.pyc
-lib/scons/SCons/Platform/sunos.py
-lib/scons/SCons/Platform/sunos.pyc
-lib/scons/SCons/Platform/win32.py
-lib/scons/SCons/Platform/win32.pyc
-lib/scons/SCons/SConf.py
-lib/scons/SCons/SConf.pyc
-lib/scons/SCons/SConsign.py
-lib/scons/SCons/SConsign.pyc
-lib/scons/SCons/Scanner/
-lib/scons/SCons/Scanner/C.py
-lib/scons/SCons/Scanner/C.pyc
-lib/scons/SCons/Scanner/D.py
-lib/scons/SCons/Scanner/D.pyc
-lib/scons/SCons/Scanner/Fortran.py
-lib/scons/SCons/Scanner/Fortran.pyc
-lib/scons/SCons/Scanner/IDL.py
-lib/scons/SCons/Scanner/IDL.pyc
-lib/scons/SCons/Scanner/Prog.py
-lib/scons/SCons/Scanner/Prog.pyc
-lib/scons/SCons/Scanner/__init__.py
-lib/scons/SCons/Scanner/__init__.pyc
-lib/scons/SCons/Script/
-lib/scons/SCons/Script/SConscript.py
-lib/scons/SCo
UPDATE: devel/scons 2.4.1 => 2.5.1
Hi ports --
Attached is a diff for devel/scons, bringing it to its latest version.
Changelog is here:
https://bitbucket.org/scons/scons/src/rel_2.5.1/src/CHANGES.txt?at=2.5.1&fileviewer=file-view-default
All its consumers appear happy. I am still waiting for some of the
larger programs to finish building (slow netbook is slow...) but
everything is past the point where I would anticipate build failures
(i.e. they're all running cc and c++ on files right now, not doing the
scons configure dance).
Take maintainer.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 1 Jun 2017 19:58:04 - 1.25
+++ Makefile 7 Jun 2017 02:00:43 -
@@ -2,12 +2,12 @@
COMMENT= Python-based build system
-VERSION = 2.4.1
+VERSION = 2.5.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES= devel
HOMEPAGE= http://www.scons.org/
+MAINTAINER= Brian Callahan
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 1 Dec 2015 08:26:16 - 1.15
+++ distinfo 7 Jun 2017 02:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = j8T0KSjGm8uzPhvpS2RvLHALZZaT+rx3jBktTSL3U6c=
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
+SIZE (scons-2.5.1.tar.gz) = 620909
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 10 Jul 2015 07:06:07 - 1.10
+++ pkg/PLIST 7 Jun 2017 02:00:43 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.10 2015/07/10 07:06:07 jasper Exp $
bin/scons
bin/scons-${VERSION}
+bin/scons-configure-cache
+bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
@@ -95,6 +97,8 @@ lib/scons-${VERSION}/SCons/Scanner/Prog.
lib/scons-${VERSION}/SCons/Scanner/Prog.pyc
lib/scons-${VERSION}/SCons/Scanner/RC.py
lib/scons-${VERSION}/SCons/Scanner/RC.pyc
+lib/scons-${VERSION}/SCons/Scanner/SWIG.py
+lib/scons-${VERSION}/SCons/Scanner/SWIG.pyc
lib/scons-${VERSION}/SCons/Scanner/__init__.py
lib/scons-${VERSION}/SCons/Scanner/__init__.pyc
lib/scons-${VERSION}/SCons/Script/
@@ -392,20 +396,8 @@ lib/scons-${VERSION}/SCons/__init__.pyc
lib/scons-${VERSION}/SCons/compat/
lib/scons-${VERSION}/SCons/compat/__init__.py
lib/scons-${VERSION}/SCons/compat/__init__.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.py
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_collections.py
-lib/scons-${VERSION}/SCons/compat/_scons_collections.pyc
lib/scons-${VERSION}/SCons/compat/_scons_dbm.py
lib/scons-${VERSION}/SCons/compat/_scons_dbm.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.py
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_io.py
-lib/scons-${VERSION}/SCons/compat/_scons_io.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_sets.py
-lib/scons-${VERSION}/SCons/compat/_scons_sets.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.py
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.pyc
lib/scons-${VERSION}/SCons/cpp.py
lib/scons-${VERSION}/SCons/cpp.pyc
lib/scons-${VERSION}/SCons/dblite.py
Re: UPDATE: devel/scons 2.5.1
On 6/12/2017 4:42 PM, David CARLIER wrote:
> Hi,
>
> Here a little update for scons, would be needed for a couple of app in the
> near future.
>
> Hope it s useful.
>
> Regards.
I submitted an update 3 days ago:
http://marc.info/?l=openbsd-ports&m=149701530208032&w=2
Your diff has a lot of PLIST churn in it...
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile1 Jun 2017 19:58:04 - 1.25
+++ Makefile7 Jun 2017 02:00:43 -
@@ -2,12 +2,12 @@
COMMENT= Python-based build system
-VERSION = 2.4.1
+VERSION = 2.5.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES=devel
HOMEPAGE= http://www.scons.org/
+MAINTAINER=Brian Callahan
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo1 Dec 2015 08:26:16 - 1.15
+++ distinfo7 Jun 2017 02:00:43 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = j8T0KSjGm8uzPhvpS2RvLHALZZaT+rx3jBktTSL3U6c=
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
+SIZE (scons-2.5.1.tar.gz) = 620909
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 10 Jul 2015 07:06:07 - 1.10
+++ pkg/PLIST 7 Jun 2017 02:00:43 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.10 2015/07/10 07:06:07 jasper Exp $
bin/scons
bin/scons-${VERSION}
+bin/scons-configure-cache
+bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
@@ -95,6 +97,8 @@ lib/scons-${VERSION}/SCons/Scanner/Prog.
lib/scons-${VERSION}/SCons/Scanner/Prog.pyc
lib/scons-${VERSION}/SCons/Scanner/RC.py
lib/scons-${VERSION}/SCons/Scanner/RC.pyc
+lib/scons-${VERSION}/SCons/Scanner/SWIG.py
+lib/scons-${VERSION}/SCons/Scanner/SWIG.pyc
lib/scons-${VERSION}/SCons/Scanner/__init__.py
lib/scons-${VERSION}/SCons/Scanner/__init__.pyc
lib/scons-${VERSION}/SCons/Script/
@@ -392,20 +396,8 @@ lib/scons-${VERSION}/SCons/__init__.pyc
lib/scons-${VERSION}/SCons/compat/
lib/scons-${VERSION}/SCons/compat/__init__.py
lib/scons-${VERSION}/SCons/compat/__init__.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.py
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_collections.py
-lib/scons-${VERSION}/SCons/compat/_scons_collections.pyc
lib/scons-${VERSION}/SCons/compat/_scons_dbm.py
lib/scons-${VERSION}/SCons/compat/_scons_dbm.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.py
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_io.py
-lib/scons-${VERSION}/SCons/compat/_scons_io.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_sets.py
-lib/scons-${VERSION}/SCons/compat/_scons_sets.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.py
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.pyc
lib/scons-${VERSION}/SCons/cpp.py
lib/scons-${VERSION}/SCons/cpp.pyc
lib/scons-${VERSION}/SCons/dblite.py
Re: UPDATE: devel/scons 2.5.1
I miss yours, sorry then ! On 12 June 2017 at 21:47, Brian Callahan wrote: > > > On 6/12/2017 4:42 PM, David CARLIER wrote: > > Hi, > > > > Here a little update for scons, would be needed for a couple of app in > the > > near future. > > > > Hope it s useful. > > > > Regards. > > I submitted an update 3 days ago: > http://marc.info/?l=openbsd-ports&m=149701530208032&w=2 > > Your diff has a lot of PLIST churn in it... > > ~Brian >
update: devel/scons 1.2.0 -> 2.0.1
This updates scons to 2.0.1. Some projects (ie. gpsd) are starting to require newer versions of scons to build. Current maintainer doesn't use this for much any more. Tested on amd64 with gpsd-current, x11/gaia and games/pingus. -- GDB has a 'break' feature; why doesn't it have 'fix' too? scons.diff.gz Description: GNU Zip compressed data
update devel/scons 4.2.0 -> 4.3.0
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
--- Makefile2 Nov 2021 00:06:13 - 1.34
+++ Makefile1 Mar 2022 22:33:53 -
@@ -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
Index: distinfo
===
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo31 Oct 2021 17:28:02 - 1.19
+++ distinfo1 Mar 2022 22:23:47 -
@@ -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 - 1.14
+++ pkg/PLIST 1 Mar 2022 22:25:27 -
@@ -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-packag
update devel/scons to 4.5.2
4.5.0 and 4.5.1 had a regression that took out almost all ports using
scons in the tree, but it was fixed for 4.5.2.
I've built a few consumers without regressions. It could still use a
trip to a bulk just in case.
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile14 Nov 2022 17:17:01 - 1.41
+++ Makefile22 Mar 2023 18:54:14 -
@@ -1,10 +1,9 @@
COMMENT= Python-based build system
-MODPY_EGG_VERSION= 4.4.0
+MODPY_EGG_VERSION= 4.5.2
DISTNAME= SCons-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES=devel
-REVISION= 1
HOMEPAGE= https://www.scons.org/
Index: distinfo
===
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo21 Aug 2022 08:59:46 - 1.21
+++ distinfo22 Mar 2023 18:54:20 -
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
-SIZE (SCons-4.4.0.tar.gz) = 3096859
+SHA256 (SCons-4.5.2.tar.gz) = gTNgsrzkdrycwSoPOiLUbOUgeWs1JVcgLLB9PkAvVFg=
+SIZE (SCons-4.5.2.tar.gz) = 3194717
Index: patches/patch-setup_cfg
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_cfg
--- patches/patch-setup_cfg 21 Aug 2022 08:59:46 - 1.3
+++ patches/patch-setup_cfg 6 Mar 2023 11:14:18 -
@@ -1,7 +1,7 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -58,7 +58,7 @@ console_scripts =
+@@ -60,7 +60,7 @@ console_scripts =
SCons.Tool.docbook = *.*
[options.data_files]
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 14 Nov 2022 17:17:01 - 1.19
+++ pkg/PLIST 6 Mar 2023 11:21:45 -
@@ -20,7 +20,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/EnvironmentValuesTest.py
lib/python${MODPY_VERSION}/site-packages/SCons/Errors.py
lib/python${MODPY_VERSION}/site-packages/SCons/Executor.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Job.py
lib/python${MODPY_VERSION}/site-packages/SCons/Memoize.py
lib/python${MODPY_VERSION}/site-packages/SCons/Node/
lib/python${MODPY_VERSION}/site-packages/SCons/Node/Alias.py
@@ -133,7 +132,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Subst.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/Job.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/386asm.py
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/DCommon.py
@@ -176,6 +182,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/README.rst
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -377,6 +384,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/${MODPY_PYCACHE}qt.${M
update devel/scons to 4.4.0
here's a diff to update scons to the latest release. I've tested with
godot 3.4.5 (committed yesterday) and godot 3.5 (released today).
I've also build-tested net/serf, games/pingus (that has a very, very
old SConstruct file) and gpsd: everything seems to work fine.
The changelog mentions mostly MSVC and ninja integration stuff which
we don't use. (at the moment at least, building with ninja might be
interesting.)
https://github.com/SCons/scons/releases/tag/4.4.0
There's a note for packaging that says: "Updated setup.cfg to remove
Python 3.5 and add Python 3.10" which I don't think it's an issue but
mentioned anyway.
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile7 Jun 2022 11:38:09 - 1.38
+++ Makefile31 Jul 2022 10:12:23 -
@@ -1,9 +1,8 @@
COMMENT= Python-based build system
-MODPY_EGG_VERSION= 4.3.0
+MODPY_EGG_VERSION= 4.4.0
DISTNAME= SCons-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
-REVISION= 2
CATEGORIES=devel
HOMEPAGE= https://www.scons.org/
Index: distinfo
===
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo2 Mar 2022 17:03:28 - 1.20
+++ distinfo31 Jul 2022 10:12:34 -
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.3.0.tar.gz) = 1HCBWH42dcwWjx9U8NdKabMoovyQ7E/rhfcoZ3QZuHk=
-SIZE (SCons-4.3.0.tar.gz) = 3065950
+SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
+SIZE (SCons-4.4.0.tar.gz) = 3096859
Index: patches/patch-SCons_Tool___init___py
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool___init___py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-SCons_Tool___init___py
--- patches/patch-SCons_Tool___init___py11 Mar 2022 18:53:22 -
1.2
+++ patches/patch-SCons_Tool___init___py31 Jul 2022 10:15:01 -
@@ -1,7 +1,7 @@
Index: SCons/Tool/__init__.py
--- SCons/Tool/__init__.py.orig
+++ SCons/Tool/__init__.py
-@@ -763,9 +763,9 @@ def tool_list(platform, env):
+@@ -757,9 +757,9 @@ def tool_list(platform, env):
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'ilink']
Index: patches/patch-SCons_Tool_gxx_py
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gxx_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-SCons_Tool_gxx_py
--- patches/patch-SCons_Tool_gxx_py 11 Mar 2022 18:53:22 - 1.4
+++ patches/patch-SCons_Tool_gxx_py 31 Jul 2022 10:15:01 -
@@ -1,7 +1,7 @@
Index: SCons/Tool/gxx.py
--- SCons/Tool/gxx.py.orig
+++ SCons/Tool/gxx.py
-@@ -40,7 +40,7 @@ import SCons.Util
+@@ -38,7 +38,7 @@ import SCons.Util
from . import gcc
from . import cxx
Index: patches/patch-setup_cfg
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_cfg
--- patches/patch-setup_cfg 11 Mar 2022 18:53:22 - 1.2
+++ patches/patch-setup_cfg 31 Jul 2022 10:15:01 -
@@ -1,8 +1,8 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -56,7 +56,7 @@ console_scripts =
- scons.tool.docbook = *.*
+@@ -58,7 +58,7 @@ console_scripts =
+ SCons.Tool.docbook = *.*
[options.data_files]
-. = scons.1
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 7 Jun 2022 11:38:09 - 1.17
+++ pkg/PLIST 31 Jul 2022 10:26:46 -
@@ -68,6 +68,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Dir.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Fortran.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/IDL.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Java.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/LaTeX.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Prog.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Python.py
@@ -80,6 +81,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Dir.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Fortran.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}IDL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Java.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}LaTeX.${MODPY_PYC_MAGIC_TAG}p
Re: UPDATE: devel/scons 2.4.1 => 2.5.1
On 06/09/17 09:29, Brian Callahan wrote:
Hi ports --
Attached is a diff for devel/scons, bringing it to its latest version.
Changelog is here:
https://bitbucket.org/scons/scons/src/rel_2.5.1/src/CHANGES.txt?at=2.5.1&fileviewer=file-view-default
All its consumers appear happy. I am still waiting for some of the
larger programs to finish building (slow netbook is slow...) but
everything is past the point where I would anticipate build failures
(i.e. they're all running cc and c++ on files right now, not doing the
scons configure dance).
Take maintainer.
~Brian
New diff with the one patch for scons removed, as we now have m4 -E
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 1 Jun 2017 19:58:04 - 1.25
+++ Makefile 15 Jun 2017 14:02:30 -
@@ -2,12 +2,12 @@
COMMENT= Python-based build system
-VERSION = 2.4.1
+VERSION = 2.5.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES= devel
HOMEPAGE= http://www.scons.org/
+MAINTAINER= Brian Callahan
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 1 Dec 2015 08:26:16 - 1.15
+++ distinfo 15 Jun 2017 14:02:30 -
@@ -1,2 +1,2 @@
-SHA256 (scons-2.4.1.tar.gz) = j8T0KSjGm8uzPhvpS2RvLHALZZaT+rx3jBktTSL3U6c=
-SIZE (scons-2.4.1.tar.gz) = 638990
+SHA256 (scons-2.5.1.tar.gz) = CyUhiue0apZ9tC8qU3IWRbPUKHSmX5VSrRbOJtMPUfI=
+SIZE (scons-2.5.1.tar.gz) = 620909
Index: patches/patch-engine_SCons_Tool_m4_py
===
RCS file: patches/patch-engine_SCons_Tool_m4_py
diff -N patches/patch-engine_SCons_Tool_m4_py
--- patches/patch-engine_SCons_Tool_m4_py 21 Dec 2011 17:41:52 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-engine_SCons_Tool_m4_py,v 1.1 2011/12/21 17:41:52 jasper Exp $
-
-XXX: OpenBSD's m4(1) lacks the -E option (needs to be implemented though).
-
engine/SCons/Tool/m4.py.orig Wed Dec 21 18:39:51 2011
-+++ engine/SCons/Tool/m4.py Wed Dec 21 18:40:07 2011
-@@ -50,7 +50,6 @@ def generate(env):
- # The src_suffix setup is like so: file.c.m4 -> file.c,
- # file.cpp.m4 -> file.cpp etc.
- env['M4'] = 'm4'
--env['M4FLAGS'] = SCons.Util.CLVar('-E')
- env['M4COM'] = 'cd ${SOURCE.rsrcdir} && $M4 $M4FLAGS < ${SOURCE.file} > ${TARGET.abspath}'
-
- def exists(env):
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 10 Jul 2015 07:06:07 - 1.10
+++ pkg/PLIST 15 Jun 2017 14:02:30 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.10 2015/07/10 07:06:07 jasper Exp $
bin/scons
bin/scons-${VERSION}
+bin/scons-configure-cache
+bin/scons-configure-cache-${VERSION}
bin/scons-time
bin/scons-time-${VERSION}
bin/sconsign
@@ -95,6 +97,8 @@ lib/scons-${VERSION}/SCons/Scanner/Prog.
lib/scons-${VERSION}/SCons/Scanner/Prog.pyc
lib/scons-${VERSION}/SCons/Scanner/RC.py
lib/scons-${VERSION}/SCons/Scanner/RC.pyc
+lib/scons-${VERSION}/SCons/Scanner/SWIG.py
+lib/scons-${VERSION}/SCons/Scanner/SWIG.pyc
lib/scons-${VERSION}/SCons/Scanner/__init__.py
lib/scons-${VERSION}/SCons/Scanner/__init__.pyc
lib/scons-${VERSION}/SCons/Script/
@@ -392,20 +396,8 @@ lib/scons-${VERSION}/SCons/__init__.pyc
lib/scons-${VERSION}/SCons/compat/
lib/scons-${VERSION}/SCons/compat/__init__.py
lib/scons-${VERSION}/SCons/compat/__init__.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.py
-lib/scons-${VERSION}/SCons/compat/_scons_builtins.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_collections.py
-lib/scons-${VERSION}/SCons/compat/_scons_collections.pyc
lib/scons-${VERSION}/SCons/compat/_scons_dbm.py
lib/scons-${VERSION}/SCons/compat/_scons_dbm.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.py
-lib/scons-${VERSION}/SCons/compat/_scons_hashlib.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_io.py
-lib/scons-${VERSION}/SCons/compat/_scons_io.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_sets.py
-lib/scons-${VERSION}/SCons/compat/_scons_sets.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.py
-lib/scons-${VERSION}/SCons/compat/_scons_subprocess.pyc
lib/scons-${VERSION}/SCons/cpp.py
lib/scons-${VERSION}/SCons/cpp.pyc
lib/scons-${VERSION}/SCons/dblite.py
Re: update: devel/scons 1.2.0 -> 2.0.1
On Mon, May 30, 2011 at 12:27:10PM -0700, Chris Kuethe wrote: > This updates scons to 2.0.1. Some projects (ie. gpsd) are starting to > require newer versions of scons to build. Current maintainer doesn't > use this for much any more. Tested on amd64 with gpsd-current, > x11/gaia and games/pingus. Portswise, i don't think you need EXTRACT_SUFX=.tar.gz nor MAINTAINER=ports@, since those are the defaults... I'll try to put it in a bulk. Landry
Re: update: devel/scons 1.2.0 -> 2.0.1
On 30/05/11 3:27 PM, Chris Kuethe wrote: This updates scons to 2.0.1. Some projects (ie. gpsd) are starting to require newer versions of scons to build. Current maintainer doesn't use this for much any more. Tested on amd64 with gpsd-current, x11/gaia and games/pingus. What's with gzip'ing such a small diff? This should have been posted with the diff inline. Other than what landry pointed out the rest looks good. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: update: devel/scons 1.2.0 -> 2.0.1
On Mon, May 30, 2011 at 12:35, Landry Breuil wrote:
> On Mon, May 30, 2011 at 12:27:10PM -0700, Chris Kuethe wrote:
>> This updates scons to 2.0.1. Some projects (ie. gpsd) are starting to
>> require newer versions of scons to build. Current maintainer doesn't
>> use this for much any more. Tested on amd64 with gpsd-current,
>> x11/gaia and games/pingus.
>
> Portswise, i don't think you need EXTRACT_SUFX=.tar.gz nor
> MAINTAINER=ports@, since those are the defaults...
noted.
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile18 Oct 2010 17:48:13 - 1.11
+++ Makefile30 May 2011 21:04:34 -
@@ -2,14 +2,11 @@
COMMENT= Python-based build system
-VERSION= 1.2.0
+VERSION= 2.0.1
DISTNAME= scons-${VERSION}
-REVISION = 0
CATEGORIES=devel
HOMEPAGE= http://www.scons.org/
-
-MAINTAINER=Andrew Dalgleish
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo15 Mar 2009 09:04:34 - 1.7
+++ distinfo30 May 2011 21:04:34 -
@@ -1,5 +1,5 @@
-MD5 (scons-1.2.0.tar.gz) = U7aqcoGBFxeldZjjGUQc9w==
-RMD160 (scons-1.2.0.tar.gz) = acH8x8OvVcgB8m/HNw3QGhfcIyc=
-SHA1 (scons-1.2.0.tar.gz) = zWvoaYo4TqKsT1GRzvlPV7L4S7s=
-SHA256 (scons-1.2.0.tar.gz) = KAZFHgKkJ4ney20ICYt5i2uBoKOdjTsvvdP+hOvYokY=
-SIZE (scons-1.2.0.tar.gz) = 568974
+MD5 (scons-2.0.1.tar.gz) = vspki4lM2/hTg//8eVFtGA==
+RMD160 (scons-2.0.1.tar.gz) = wZGhtJ4bkaUSH7XKx8zyg3lHSoo=
+SHA1 (scons-2.0.1.tar.gz) = +Rg/GynLlLSLsxdWCIMSduYLj8U=
+SHA256 (scons-2.0.1.tar.gz) = CoFR2kHEomx3bIT0T3R84D4JPUO+PoOzjBSnarMlZ2I=
+SIZE (scons-2.0.1.tar.gz) = 559293
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 15 Mar 2009 09:04:34 - 1.5
+++ pkg/PLIST 30 May 2011 21:04:34 -
@@ -125,6 +125,21 @@ lib/scons-${VERSION}/SCons/Tool/FortranC
lib/scons-${VERSION}/SCons/Tool/FortranCommon.pyc
lib/scons-${VERSION}/SCons/Tool/JavaCommon.py
lib/scons-${VERSION}/SCons/Tool/JavaCommon.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/
+lib/scons-${VERSION}/SCons/Tool/MSCommon/__init__.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/__init__.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/arch.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/arch.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/common.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/common.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/netframework.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/netframework.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/sdk.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/sdk.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/vc.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/vc.pyc
+lib/scons-${VERSION}/SCons/Tool/MSCommon/vs.py
+lib/scons-${VERSION}/SCons/Tool/MSCommon/vs.pyc
lib/scons-${VERSION}/SCons/Tool/Perforce.py
lib/scons-${VERSION}/SCons/Tool/Perforce.pyc
lib/scons-${VERSION}/SCons/Tool/PharLapCommon.py
@@ -215,6 +230,8 @@ lib/scons-${VERSION}/SCons/Tool/install.
lib/scons-${VERSION}/SCons/Tool/install.pyc
lib/scons-${VERSION}/SCons/Tool/intelc.py
lib/scons-${VERSION}/SCons/Tool/intelc.pyc
+lib/scons-${VERSION}/SCons/Tool/ipkg.py
+lib/scons-${VERSION}/SCons/Tool/ipkg.pyc
lib/scons-${VERSION}/SCons/Tool/jar.py
lib/scons-${VERSION}/SCons/Tool/jar.pyc
lib/scons-${VERSION}/SCons/Tool/javac.py
@@ -241,6 +258,8 @@ lib/scons-${VERSION}/SCons/Tool/mslib.py
lib/scons-${VERSION}/SCons/Tool/mslib.pyc
lib/scons-${VERSION}/SCons/Tool/mslink.py
lib/scons-${VERSION}/SCons/Tool/mslink.pyc
+lib/scons-${VERSION}/SCons/Tool/mssdk.py
+lib/scons-${VERSION}/SCons/Tool/mssdk.pyc
lib/scons-${VERSION}/SCons/Tool/msvc.py
lib/scons-${VERSION}/SCons/Tool/msvc.pyc
lib/scons-${VERSION}/SCons/Tool/msvs.py
@@ -314,6 +333,8 @@ lib/scons-${VERSION}/SCons/Tool/tar.py
lib/scons-${VERSION}/SCons/Tool/tar.pyc
lib/scons-${VERSION}/SCons/Tool/tex.py
lib/scons-${VERSION}/SCons/Tool/tex.pyc
+lib/scons-${VERSION}/SCons/Tool/textfile.py
+lib/scons-${VERSION}/SCons/Tool/textfile.pyc
lib/scons-${VERSION}/SCons/Tool/tlib.py
lib/scons-${VERSION}/SCons/Tool/tlib.pyc
lib/scons-${VERSION}/SCons/Tool/wix.py
@@ -344,26 +365,20 @@ lib/scons-${VERSION}/SCons/__init__.pyc
lib/scons-${VERSION}/SCons/compat/
lib/scons-${VERSION}/SCons/compat/__init__.py
lib/scons-${VERSION}/SCons/compat/__init__.pyc
-lib/scons-${VERSION}/SCons/compat/_scons_UserString.py
-lib/scons-${VERSION}/SCons/compat/_scons_UserString.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_builtins.py
+lib/scons-${VERSION}/SCons/compat/_scons_builtins.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_collections.py
+lib/scons-${VERSION}/SCons/compat/_sco
Re: update: devel/scons 1.2.0 -> 2.0.1
On Mon, May 30, 2011 at 02:05:14PM -0700, Chris Kuethe wrote: > On Mon, May 30, 2011 at 12:35, Landry Breuil wrote: > > On Mon, May 30, 2011 at 12:27:10PM -0700, Chris Kuethe wrote: > >> This updates scons to 2.0.1. Some projects (ie. gpsd) are starting to > >> require newer versions of scons to build. Current maintainer doesn't > >> use this for much any more. Tested on amd64 with gpsd-current, > >> x11/gaia and games/pingus. > > > > Portswise, i don't think you need EXTRACT_SUFX=.tar.gz nor > > MAINTAINER=ports@, since those are the defaults... > > noted. Fwiw, all the scons users in the portstree (hydrogen, gambatte, boswars, pingus, widelands, blender, mapnik, ffmpeg2theora and gaia) were happy with that update in a bulk build. ok for me, though i highly despise scons.. Landry
Re: update devel/scons -- second try
and here's the fixes for the dependencies:
> find /usr/ports/ -type f -name Makefile -exec grep devel/scons {} +
databases/mongodb
Current version doesn't build with python 3 but I'm gonna deal
with this in a separate thread.
emulators/fceux
I've updated it to a newer version that switches to cmake and
waiting for bentley@ to test it. I'm sending the update for
scons anyway to let people test and review the diff in the
meantime :)
net/serf
Upstream switched newer scons and python 3 but has not yet
released anything. The changes are small and are all backports.
Made a `make test' just in case and the outcome is the same: 51
passes and 15 fails.
games/boswars
2to3 changes plus:
- some love for the makefile (only aesthetic changes)
- drop -fexpensive-optimizations: base clang complained that's a
"optimization flag not supported". Should be a no-op.
games/dangerdeep
2to3 needed. Played for a bit, not my favourite genre but seems
to work.
games/dxx-rebirth
can't do runtime testing but builds fine
games/endless-sky
builds and runs fine
games/godot
builds fine (from the master branch too)
games/pingus
2to3 then runs fine.
games/thedarkmod
breaks because of python3. I've talked with thfr@ and he's OK
with marking it as broken; current version is not playable
anyway because fetches data for a newer release that doesn't
work with our version. The latest version switches to cmake
btw.
The attached diff doesn't touch tdm yet thought.
graphics/mapnik
thanks to kirby@ that committed some tweaks the last month now
it builds fine with scons 4 too :)
misc/gpsd
needed a -fPIC but then builds.
Cheers,
Omar Polo
Index: net/serf/Makefile
===
RCS file: /home/cvs/ports/net/serf/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- net/serf/Makefile 3 Feb 2021 22:22:42 - 1.14
+++ net/serf/Makefile 25 Oct 2021 17:50:59 -
@@ -18,11 +18,14 @@ MODULES = devel/scons
LIB_DEPENDS = converters/libiconv \
devel/apr-util
MODSCONS_ENV= CC="${CC}" \
+ CFLAGS="${CFLAGS} -fPIC" \
PREFIX="${PREFIX}" \
DEBUG=0 \
APR=${LOCALBASE}/bin/apr-1-config \
APU=${LOCALBASE}/bin/apu-1-config
TEST_TARGET = check
+
+FIX_CRLF_FILES = build/check.py
# XXX scons doesn't support x.y library versioning scheme, only x.y.z
post-patch:
Index: net/serf/patches/patch-SConstruct
===
RCS file: net/serf/patches/patch-SConstruct
diff -N net/serf/patches/patch-SConstruct
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/serf/patches/patch-SConstruct 25 Oct 2021 17:53:19 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: SConstruct
+--- SConstruct.orig
SConstruct
+@@ -166,7 +166,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+ 'SERF_MINOR_VERSION ([0-9]+).*'
+ 'SERF_PATCH_VERSION ([0-9]+)',
+- env.File('serf.h').get_contents(),
++ env.File('serf.h').get_contents().decode('utf-8'),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
+@@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
Index: net/serf/patches/patch-build_check_py
===
RCS file: net/serf/patches/patch-build_check_py
diff -N net/serf/patches/patch-build_check_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/serf/patches/patch-build_check_py 25 Oct 2021 17:52:47 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Index: build/check.py
+--- build/check.py.orig
build/check.py
+@@ -52,16 +52,16 @@ if __name__ == '__main__':
+
+ # Find test responses and run them one by one
+ for case in glob.glob(testdir + "/testcases/*.response"):
+-print "== Testing %s ==" % (case)
++print("== Testing %s ==" % (case))
+ try:
+ subprocess.check_call([SERF_RESPONSE_EXE, case])
+-except subprocess.CalledProcessError:
+- print "ERROR: test case %s failed" % (case)
++except subprocess.CalledProcessError as x:
++ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd,
x.returncode))
+ sys.exit(1)
+
+- print "== Running the unit tests =="
++ print("== Running the unit tests ==")
+ try:
+ subprocess.check_call(TEST_ALL_EXE)
+
Re: update devel/scons -- second try
I discussed with Omar off-list that it may be worth tackling this in
chunks. He suggested starting with games/boswars and games/pingus that
compile with current scons.
On Tue, Oct 26, 2021 at 05:51:45PM +0200, Omar Polo wrote:
[...]
> games/boswars
>
> 2to3 changes plus:
>
> - some love for the makefile (only aesthetic changes)
> - drop -fexpensive-optimizations: base clang complained that's a
> "optimization flag not supported". Should be a no-op.
>
[...]
> games/pingus
>
> 2to3 then runs fine.
Both ports are without maintainer; I built both with current scons and
tested quick runtime without problems. I think it may be best to bump
REVISION even with the changes applying mainly to the build system.
Here is the diff for just the 2 ports with my ok.
Index: boswars/Makefile
===
RCS file: /cvs/ports/games/boswars/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- boswars/Makefile17 Oct 2021 12:19:12 - 1.27
+++ boswars/Makefile28 Oct 2021 02:36:48 -
@@ -7,15 +7,15 @@ DISTNAME= boswars-${V}-src
PKGNAME= boswars-${V}
CATEGORIES=games x11
MASTER_SITES= http://www.boswars.org/dist/releases/
-REVISION= 2
+REVISION= 3
HOMEPAGE= http://www.boswars.org/
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL X11 c m ogg png pthread ${COMPILER_LIBCXX} theora vorbis
z
-WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} GL SDL X11 c m ogg png theora vorbis z
+WANTLIB += ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
@@ -34,8 +34,11 @@ LIB_DEPENDS= devel/sdl \
NO_TEST= Yes
-DATA_DIR= campaigns graphics intro languages maps patches scripts sounds
units
+DATA_DIR= campaigns graphics intro languages maps patches \
+ scripts sounds units
+# the shipped images are considered broken by newer libpng: use opting
+# to fix them
pre-configure:
@${SUBST_CMD} ${WRKSRC}/SConstruct \
${WRKSRC}/engine/include/stratagus.h
@@ -50,7 +53,8 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/build/boswars-release \
${PREFIX}/bin/boswars
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/boswars/html
- ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py}
${PREFIX}/share/doc/boswars/html/scripts
+ ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py} \
+ ${PREFIX}/share/doc/boswars/html/scripts
.for i in ${DATA_DIR}
cp -R ${WRKSRC}/${i} ${PREFIX}/share/boswars
.endfor
Index: boswars/patches/patch-SConstruct
===
RCS file: /cvs/ports/games/boswars/patches/patch-SConstruct,v
retrieving revision 1.7
diff -u -p -r1.7 patch-SConstruct
--- boswars/patches/patch-SConstruct24 Sep 2013 04:53:18 - 1.7
+++ boswars/patches/patch-SConstruct28 Oct 2021 02:36:48 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
SConstruct.origSun Jun 2 08:41:11 2013
-+++ SConstruct Sat Sep 14 21:46:08 2013
+Index: SConstruct
+--- SConstruct.orig
SConstruct
@@ -32,12 +32,12 @@ SConsignFile()
def DefineOptions(filename, args):
@@ -27,6 +28,15 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
Help(opts.GenerateHelpText(env))
mingw = env.Clone()
optionsChanged = True
+@@ -122,7 +125,7 @@ def ParseConfig(env, command, function=None):
+ flags['LINKFLAGS'].append(arg)
+ else:
+ flags['CCFLAGS'].append(arg)
+-apply(env.Append, (), flags)
++env.Append(*(), **flags)
+ return static_libs
+
+ if function is None:
@@ -144,6 +147,10 @@ def CheckOpenGL(env, conf):
'LIBS': ['GL'],
'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
@@ -47,7 +57,18 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
glconfig = opengl.get(platform, {})
for key in glconfig:
if key != 'LIBS':
-@@ -178,7 +187,7 @@ def CheckLuaLib(env, conf):
+@@ -168,17 +177,12 @@ def CheckOpenGL(env, conf):
+ return True
+
+ def CheckLuaLib(env, conf):
+- if not 'USE_WIN32' in env['CPPDEFINES']:
+- if env.WhereIs('pkg-config'):
+-for packagename in ['lua5.1', 'lua51', 'lua']:
+- exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' +
packagename)
+- if exitcode == 0:
+- break
++ env.ParseConfig('pkg-config --cflags --libs lua51')
+ if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
return 1
if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
return 1
@@ -56,7 +77,7 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
return 0
# make sure we have lualib which is included in lua 5.1
if conf.CheckFunc('luaopen_base'):
-@@ -189,13 +198,13 @@ def AutoConfigure(env):
+@@ -189,30 +193,30 @@ def AutoConfigure(env):
conf = Configure(env)
## check for required libs ##
@@ -64,
Re: update devel/scons -- second try
Thomas Frohwein writes:
> I discussed with Omar off-list that it may be worth tackling this in
> chunks. He suggested starting with games/boswars and games/pingus that
> compile with current scons.
>
> On Tue, Oct 26, 2021 at 05:51:45PM +0200, Omar Polo wrote:
> [...]
>> games/boswars
>>
>> 2to3 changes plus:
>>
>> - some love for the makefile (only aesthetic changes)
>> - drop -fexpensive-optimizations: base clang complained that's a
>>"optimization flag not supported". Should be a no-op.
>>
> [...]
>> games/pingus
>>
>> 2to3 then runs fine.
>
> Both ports are without maintainer; I built both with current scons and
> tested quick runtime without problems. I think it may be best to bump
> REVISION even with the changes applying mainly to the build system.
the content of the packages should be the same because the removal of
-fexpensive-optimizations should be a noop on clang (11 at least), but I
agree: let's stay on the safe side and bump the REVISION.
> Here is the diff for just the 2 ports with my ok.
thanks :)
games/dangerdeep also could be committed before the scons update.
The following diff only changes BuildDir to VariantDir (builddir was
deprecated in scons 2 if not even before and removed with 3.x or 4.x)
and fixes the indentation (python3 is picky wrt mixing spaces and tabs.)
The port runs fine and is without a MAINTAINER. I've not bumped the
REVISION this time.
Cheers,
Omar Polo
P.S.: with these three in, the diff for scons 4 is significantly
smaller, thanks again! I should have splitted them from the
start.
Index: patches/patch-SConstruct
===
RCS file: /home/cvs/ports/games/dangerdeep/patches/patch-SConstruct,v
retrieving revision 1.2
diff -u -p -r1.2 patch-SConstruct
--- patches/patch-SConstruct12 Jan 2018 20:13:31 - 1.2
+++ patches/patch-SConstruct21 Oct 2021 09:12:50 -
@@ -1,6 +1,143 @@
$OpenBSD: patch-SConstruct,v 1.2 2018/01/12 20:13:31 kili Exp $
SConstruct.origSat May 8 03:41:20 2010
-+++ SConstruct Sat Jun 1 11:12:50 2013
+Index: SConstruct
+--- SConstruct.orig
SConstruct
+@@ -49,7 +49,7 @@ if (env.GetOption('clean') or conf == '0'):
+
+ if sys.platform == 'win32':
+ checkconf = False
+- print "Compiling for Win32 Environment"
++ print("Compiling for Win32 Environment")
+ env = Environment(ENV = os.environ)
+
+ env.Append(CPPDEFINES = ['WIN32','NOMINMAX','DEBUG'])
+@@ -68,7 +68,7 @@ if sys.platform == 'win32':
+ build_dir = 'win32'
+
+ elif sys.platform == 'darwin':
+- print "Compiling for MacOSX"
++ print("Compiling for MacOSX")
+ env = Environment(ENV = os.environ)
+ env.Append(CPPPATH =
['/System/Library/Frameworks/AGL.framework/Headers',
'/System/Library/Frameworks/OpenGL.framework/Headers','/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include'
, './Mac'])
+ libpath = ['/System/Library/Frameworks/OpenGL.framework/Libraries',
'/usr/local/lib', '/usr/lib']
+@@ -79,11 +79,11 @@ elif sys.platform == 'darwin':
+ datadir = './data' # use slashes as separator always. C/C++ want
it so.
+ build_dir = 'macosx'
+ osspecificsrc = Split("""Mac/SDLMain.m""")
+-if (debug == 1):
+-env.Append(CCFLAGS = '-g')
+-env.Append(CPPDEFINES = ['DEBUG'])
++ if (debug == 1):
++ env.Append(CCFLAGS = '-g')
++ env.Append(CPPDEFINES = ['DEBUG'])
+ elif (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or
(sys.platform == 'freebsd7'):
+- print "Compiling for FreeBSD Environment"
++ print("Compiling for FreeBSD Environment")
+ env = Environment(ENV = os.environ)
+ LOCALBASE = os.environ['LOCALBASE']
+ X11BASE = os.environ['X11BASE']
+@@ -99,45 +99,45 @@ elif (sys.platform == 'freebsd5') or (sys.platform ==
+ cpuinfol = cpuinfof.readlines()
+ mmxsupported = False
+ ssesupported = False
+-for i in cpuinfol:
++ for i in cpuinfol:
+ if i == '1\n':
+ mmxsupported = True
+ ssesupported = True
+ if (usex86sse == 0) and (mmxsupported and ssesupported):
+- usex86sse = 1
+- if usex86sse >= 1:
++ usex86sse = 1
++ if usex86sse >= 1:
+ env.Append(CCFLAGS = '-msse')
+- env.Append(CPPDEFINES = ['USE_SSE'])
+- osspecificsrc += []
+- print 'Using x86 SSE/MMX optimizations.'
++ env.Append(CPPDEFINES = ['USE_SSE'])
++ osspecificsrc += []
++ print('Using x86 SSE/MMX optimizations.')
+
+-env.Replace(CCFLAGS = os.environ['CFLAGS'])
++ env.Replace(CCFLAGS = os.environ['CFLAGS'])
+ if (debug == 1):
+ env.Append(CCFLAGS = '-g')
+
Re: update devel/scons -- second try
On 2021/10/28 12:00, Omar Polo wrote: > > Thomas Frohwein writes: > > > I discussed with Omar off-list that it may be worth tackling this in > > chunks. He suggested starting with games/boswars and games/pingus that > > compile with current scons. > > > > On Tue, Oct 26, 2021 at 05:51:45PM +0200, Omar Polo wrote: > > [...] > >> games/boswars > >> > >>2to3 changes plus: > >> > >>- some love for the makefile (only aesthetic changes) > >>- drop -fexpensive-optimizations: base clang complained that's a > >> "optimization flag not supported". Should be a no-op. > >> > > [...] > >> games/pingus > >> > >>2to3 then runs fine. Maybe just run 2to3 in the port rather than adding a 2to3-generated patch? (If more changes are needed on top of 2to3's output, running 2to3 in pre-patch lets you do that without having the whole lot in patches).
Re: update devel/scons -- second try
On Thu, October 28, 2021 05:39, Thomas Frohwein wrote:
> I discussed with Omar off-list that it may be worth tackling this in
> chunks. He suggested starting with games/boswars and games/pingus that
> compile with current scons.
>
> On Tue, Oct 26, 2021 at 05:51:45PM +0200, Omar Polo wrote:
> [...]
>> games/boswars
>>
>> 2to3 changes plus:
>>
>> - some love for the makefile (only aesthetic changes)
>> - drop -fexpensive-optimizations: base clang complained that's a
>>"optimization flag not supported". Should be a no-op.
>>
> [...]
>> games/pingus
>>
>> 2to3 then runs fine.
>
> Both ports are without maintainer; I built both with current scons and
> tested quick runtime without problems. I think it may be best to bump
> REVISION even with the changes applying mainly to the build system.
Hi,
OK kirby@
> Here is the diff for just the 2 ports with my ok.
>
> Index: boswars/Makefile
> ===
> RCS file: /cvs/ports/games/boswars/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- boswars/Makefile 17 Oct 2021 12:19:12 - 1.27
> +++ boswars/Makefile 28 Oct 2021 02:36:48 -
> @@ -7,15 +7,15 @@ DISTNAME= boswars-${V}-src
> PKGNAME= boswars-${V}
> CATEGORIES= games x11
> MASTER_SITES=http://www.boswars.org/dist/releases/
> -REVISION=2
> +REVISION=3
>
> HOMEPAGE=http://www.boswars.org/
>
> # GPLv2
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += GL SDL X11 c m ogg png pthread ${COMPILER_LIBCXX} theora vorbis
> z
> -WANTLIB += ${MODLUA_WANTLIB}
> +WANTLIB += ${COMPILER_LIBCXX} GL SDL X11 c m ogg png theora vorbis z
> +WANTLIB += ${MODLUA_WANTLIB}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> @@ -34,8 +34,11 @@ LIB_DEPENDS= devel/sdl \
>
> NO_TEST= Yes
>
> -DATA_DIR=campaigns graphics intro languages maps patches scripts sounds
> units
> +DATA_DIR=campaigns graphics intro languages maps patches \
> + scripts sounds units
>
> +# the shipped images are considered broken by newer libpng: use opting
> +# to fix them
> pre-configure:
> @${SUBST_CMD} ${WRKSRC}/SConstruct \
> ${WRKSRC}/engine/include/stratagus.h
> @@ -50,7 +53,8 @@ do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/build/boswars-release \
> ${PREFIX}/bin/boswars
> ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/boswars/html
> - ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py}
> ${PREFIX}/share/doc/boswars/html/scripts
> + ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py} \
> + ${PREFIX}/share/doc/boswars/html/scripts
> .for i in ${DATA_DIR}
> cp -R ${WRKSRC}/${i} ${PREFIX}/share/boswars
> .endfor
> Index: boswars/patches/patch-SConstruct
> ===
> RCS file: /cvs/ports/games/boswars/patches/patch-SConstruct,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-SConstruct
> --- boswars/patches/patch-SConstruct 24 Sep 2013 04:53:18 - 1.7
> +++ boswars/patches/patch-SConstruct 28 Oct 2021 02:36:48 -
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
> SConstruct.orig Sun Jun 2 08:41:11 2013
> -+++ SConstruct Sat Sep 14 21:46:08 2013
> +Index: SConstruct
> +--- SConstruct.orig
> SConstruct
> @@ -32,12 +32,12 @@ SConsignFile()
>
> def DefineOptions(filename, args):
> @@ -27,6 +28,15 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
> Help(opts.GenerateHelpText(env))
> mingw = env.Clone()
> optionsChanged = True
> +@@ -122,7 +125,7 @@ def ParseConfig(env, command, function=None):
> + flags['LINKFLAGS'].append(arg)
> + else:
> + flags['CCFLAGS'].append(arg)
> +-apply(env.Append, (), flags)
> ++env.Append(*(), **flags)
> + return static_libs
> +
> + if function is None:
> @@ -144,6 +147,10 @@ def CheckOpenGL(env, conf):
> 'LIBS': ['GL'],
> 'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
> @@ -47,7 +57,18 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
>glconfig = opengl.get(platform, {})
> for key in glconfig:
> if key != 'LIBS':
> -@@ -178,7 +187,7 @@ def CheckLuaLib(env, conf):
> +@@ -168,17 +177,12 @@ def CheckOpenGL(env, conf):
> + return True
> +
> + def CheckLuaLib(env, conf):
> +- if not 'USE_WIN32' in env['CPPDEFINES']:
> +- if env.WhereIs('pkg-config'):
> +-for packagename in ['lua5.1', 'lua51', 'lua']:
> +- exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' +
> packagename)
> +- if exitcode == 0:
> +- break
> ++ env.ParseConfig('pkg-config --cflags --libs lua51')
> + if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
> return 1
> if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
> return 1
> @@ -56,7 +77,7 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
> return 0
> # make su
Re: update devel/scons -- second try
Stuart Henderson writes:
> On 2021/10/28 12:00, Omar Polo wrote:
>>
>> Thomas Frohwein writes:
>>
>> > I discussed with Omar off-list that it may be worth tackling this in
>> > chunks. He suggested starting with games/boswars and games/pingus that
>> > compile with current scons.
>> >
>> > On Tue, Oct 26, 2021 at 05:51:45PM +0200, Omar Polo wrote:
>> > [...]
>> >> games/boswars
>> >>
>> >> 2to3 changes plus:
>> >>
>> >> - some love for the makefile (only aesthetic changes)
>> >> - drop -fexpensive-optimizations: base clang complained that's a
>> >> "optimization flag not supported". Should be a no-op.
>> >>
>> > [...]
>> >> games/pingus
>> >>
>> >> 2to3 then runs fine.
>
> Maybe just run 2to3 in the port rather than adding a 2to3-generated
> patch? (If more changes are needed on top of 2to3's output, running 2to3
> in pre-patch lets you do that without having the whole lot in patches).
I like the idea. Diff below does that for boswars and pingus (to apply
from /usr/ports/games.) It reduces the churn and for pingus patching is
not even needed anymore.
The drawback is that for 2to3 I have to add a BDEP on python3.8 on those
two ports, but we can remove that after the scons 4 update eventually.
Index: boswars/Makefile
===
RCS file: /home/cvs/ports/games/boswars/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- boswars/Makefile17 Oct 2021 12:19:12 - 1.27
+++ boswars/Makefile28 Oct 2021 13:29:07 -
@@ -7,15 +7,15 @@ DISTNAME= boswars-${V}-src
PKGNAME= boswars-${V}
CATEGORIES=games x11
MASTER_SITES= http://www.boswars.org/dist/releases/
-REVISION= 2
+REVISION= 3
HOMEPAGE= http://www.boswars.org/
# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB += GL SDL X11 c m ogg png pthread ${COMPILER_LIBCXX} theora vorbis
z
-WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} GL SDL X11 c m ogg png theora vorbis z
+WANTLIB += ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
@@ -25,7 +25,8 @@ MODSCONS_FLAGS= CPPPATH="${LOCALBASE}/in
opengl=1
BUILD_DEPENDS= devel/sdl-image \
- graphics/optipng
+ graphics/optipng \
+ lang/python/3.8
LIB_DEPENDS= devel/sdl \
multimedia/libtheora \
audio/libvorbis \
@@ -34,8 +35,14 @@ LIB_DEPENDS= devel/sdl \
NO_TEST= Yes
-DATA_DIR= campaigns graphics intro languages maps patches scripts sounds
units
+DATA_DIR= campaigns graphics intro languages maps patches \
+ scripts sounds units
+pre-patch:
+ 2to3 -w ${WRKSRC}/SConstruct
+
+# the shipped images are considered broken by newer libpng: use opting
+# to fix them
pre-configure:
@${SUBST_CMD} ${WRKSRC}/SConstruct \
${WRKSRC}/engine/include/stratagus.h
@@ -50,7 +57,8 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/build/boswars-release \
${PREFIX}/bin/boswars
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/boswars/html
- ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py}
${PREFIX}/share/doc/boswars/html/scripts
+ ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py} \
+ ${PREFIX}/share/doc/boswars/html/scripts
.for i in ${DATA_DIR}
cp -R ${WRKSRC}/${i} ${PREFIX}/share/boswars
.endfor
Index: boswars/patches/patch-SConstruct
===
RCS file: /home/cvs/ports/games/boswars/patches/patch-SConstruct,v
retrieving revision 1.7
diff -u -p -r1.7 patch-SConstruct
--- boswars/patches/patch-SConstruct24 Sep 2013 04:53:18 - 1.7
+++ boswars/patches/patch-SConstruct28 Oct 2021 13:27:16 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
SConstruct.origSun Jun 2 08:41:11 2013
-+++ SConstruct Sat Sep 14 21:46:08 2013
+Index: SConstruct
+--- SConstruct.orig
SConstruct
@@ -32,12 +32,12 @@ SConsignFile()
def DefineOptions(filename, args):
@@ -47,7 +48,18 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
glconfig = opengl.get(platform, {})
for key in glconfig:
if key != 'LIBS':
-@@ -178,7 +187,7 @@ def CheckLuaLib(env, conf):
+@@ -168,17 +177,12 @@ def CheckOpenGL(env, conf):
+ return True
+
+ def CheckLuaLib(env, conf):
+- if not 'USE_WIN32' in env['CPPDEFINES']:
+- if env.WhereIs('pkg-config'):
+-for packagename in ['lua5.1', 'lua51', 'lua']:
+- exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' +
packagename)
+- if exitcode == 0:
+- break
++ env.ParseConfig('pkg-config --cflags --libs lua51')
+ if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
return 1
if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
return 1
@@ -56,25 +68,25 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
return 0
# make sure we
Re: update devel/scons -- second try
Omar Polo writes: > Hello ports@, > > motivated by the fact that godot 4.0 will require scons 3+, I tried to > update devel/scons to a newer release. The update involves a switch > from python 2 to 3 and some failure in ports. > > The patch below address only scons, a follow-up email will include fixes > for the dependant ports (except for databases/mongodb that gets its own > thread.) > > One curious thing is that now some ports needs an additional -fPIC that > was previously added by scons. I grepped the sources for a while but > didn't noticed anything relevant. I've been able to successfully build > dummy shared libraries using a simple SConstruct and it works so I've no > idea what's happening in devel/serf and misc/gpsd. > > Some highlights regarding the patch itself: > > - the installation path changed, hence the enormous plist diff > - switched HOMEPAGE to https while there > - MODPY_ADJ_FILES doesn't seem to be needed anymore > - bcallah@ asked to be dropped as maintainer (several times apparently) > > > Cheers, > > Omar Polo I left by accident a `gas' instead of `as'. It didn't break anything because nothing in ports uses scons to compile assembly. I've also ran the tests (from the github repo, somehow they're not present in the sourceforge tarball): 15 tests fails and 193 are skipped of 1224 tests, which seems good. Looking at the failures I noted a discrepancy between the documentation and the behaviour: the documentation says that on OpenBSD the produced libraries have a X.Y naming scheme, while scons always produces X.Y.Z named files... The SharedLibrary code was rewritten recently and they forgot this case. It also installs more files now, for example misc/gpsd built with scons 4 installs lib/libgps.so (symlink to libgps.so.22.0) lib/libpgs.so.22(symlink to libgps.so.22.0) lib/libgps.so.22.0 I have to go back reading SharedLibrary.py & co. The scons update is not yet ready as I hoped. Sorry for the noise. Omar Polo
Re: update devel/scons to 4.5.2
On 2023/04/01 09:05:40 +0200, Omar Polo wrote:
> 4.5.0 and 4.5.1 had a regression that took out almost all ports using
> scons in the tree, but it was fixed for 4.5.2.
>
> I've built a few consumers without regressions. It could still use a
> trip to a bulk just in case.
>
> ok?
phessler@ (thanks!) put this in an aarch64 bulk: games/dxx-rebirth
(+cc thfr@), the only failure due to the scons update, needs the
backport of a few upstream commit, but then it builds fine.
I'd like to commit this in a few days, provided nobody objects.
Index: devel/scons/Makefile
===
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- devel/scons/Makefile14 Nov 2022 17:17:01 - 1.41
+++ devel/scons/Makefile22 Mar 2023 18:54:14 -
@@ -1,10 +1,9 @@
COMMENT= Python-based build system
-MODPY_EGG_VERSION= 4.4.0
+MODPY_EGG_VERSION= 4.5.2
DISTNAME= SCons-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
CATEGORIES=devel
-REVISION= 1
HOMEPAGE= https://www.scons.org/
Index: devel/scons/distinfo
===
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- devel/scons/distinfo21 Aug 2022 08:59:46 - 1.21
+++ devel/scons/distinfo22 Mar 2023 18:54:20 -
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
-SIZE (SCons-4.4.0.tar.gz) = 3096859
+SHA256 (SCons-4.5.2.tar.gz) = gTNgsrzkdrycwSoPOiLUbOUgeWs1JVcgLLB9PkAvVFg=
+SIZE (SCons-4.5.2.tar.gz) = 3194717
Index: devel/scons/patches/patch-setup_cfg
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
retrieving revision 1.3
diff -u -p -r1.3 patch-setup_cfg
--- devel/scons/patches/patch-setup_cfg 21 Aug 2022 08:59:46 - 1.3
+++ devel/scons/patches/patch-setup_cfg 6 Mar 2023 11:14:18 -
@@ -1,7 +1,7 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -58,7 +58,7 @@ console_scripts =
+@@ -60,7 +60,7 @@ console_scripts =
SCons.Tool.docbook = *.*
[options.data_files]
Index: devel/scons/pkg/PLIST
===
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- devel/scons/pkg/PLIST 14 Nov 2022 17:17:01 - 1.19
+++ devel/scons/pkg/PLIST 6 Mar 2023 11:21:45 -
@@ -20,7 +20,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/EnvironmentValuesTest.py
lib/python${MODPY_VERSION}/site-packages/SCons/Errors.py
lib/python${MODPY_VERSION}/site-packages/SCons/Executor.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Job.py
lib/python${MODPY_VERSION}/site-packages/SCons/Memoize.py
lib/python${MODPY_VERSION}/site-packages/SCons/Node/
lib/python${MODPY_VERSION}/site-packages/SCons/Node/Alias.py
@@ -133,7 +132,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Subst.py
-lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/Job.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/386asm.py
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/DCommon.py
@@ -176,6 +182,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/README.rst
lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/
Re: update devel/scons to 4.5.2
On Fri, Apr 07, 2023 at 05:57:34PM +0200, Omar Polo wrote:
> On 2023/04/01 09:05:40 +0200, Omar Polo wrote:
> > 4.5.0 and 4.5.1 had a regression that took out almost all ports using
> > scons in the tree, but it was fixed for 4.5.2.
> >
> > I've built a few consumers without regressions. It could still use a
> > trip to a bulk just in case.
> >
> > ok?
>
> phessler@ (thanks!) put this in an aarch64 bulk: games/dxx-rebirth
> (+cc thfr@), the only failure due to the scons update, needs the
> backport of a few upstream commit, but then it builds fine.
>
> I'd like to commit this in a few days, provided nobody objects.
ok thfr@ for the dxx-rebirth part
>
> Index: devel/scons/Makefile
> ===
> RCS file: /home/cvs/ports/devel/scons/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- devel/scons/Makefile 14 Nov 2022 17:17:01 - 1.41
> +++ devel/scons/Makefile 22 Mar 2023 18:54:14 -
> @@ -1,10 +1,9 @@
> COMMENT= Python-based build system
>
> -MODPY_EGG_VERSION= 4.4.0
> +MODPY_EGG_VERSION= 4.5.2
> DISTNAME=SCons-${MODPY_EGG_VERSION}
> PKGNAME= ${DISTNAME:L}
> CATEGORIES= devel
> -REVISION=1
>
> HOMEPAGE=https://www.scons.org/
>
> Index: devel/scons/distinfo
> ===
> RCS file: /home/cvs/ports/devel/scons/distinfo,v
> retrieving revision 1.21
> diff -u -p -r1.21 distinfo
> --- devel/scons/distinfo 21 Aug 2022 08:59:46 - 1.21
> +++ devel/scons/distinfo 22 Mar 2023 18:54:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
> -SIZE (SCons-4.4.0.tar.gz) = 3096859
> +SHA256 (SCons-4.5.2.tar.gz) = gTNgsrzkdrycwSoPOiLUbOUgeWs1JVcgLLB9PkAvVFg=
> +SIZE (SCons-4.5.2.tar.gz) = 3194717
> Index: devel/scons/patches/patch-setup_cfg
> ===
> RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-setup_cfg
> --- devel/scons/patches/patch-setup_cfg 21 Aug 2022 08:59:46 -
> 1.3
> +++ devel/scons/patches/patch-setup_cfg 6 Mar 2023 11:14:18 -
> @@ -1,7 +1,7 @@
> Index: setup.cfg
> --- setup.cfg.orig
> +++ setup.cfg
> -@@ -58,7 +58,7 @@ console_scripts =
> +@@ -60,7 +60,7 @@ console_scripts =
> SCons.Tool.docbook = *.*
>
> [options.data_files]
> Index: devel/scons/pkg/PLIST
> ===
> RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
> retrieving revision 1.19
> diff -u -p -r1.19 PLIST
> --- devel/scons/pkg/PLIST 14 Nov 2022 17:17:01 - 1.19
> +++ devel/scons/pkg/PLIST 6 Mar 2023 11:21:45 -
> @@ -20,7 +20,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/SCons/EnvironmentValuesTest.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Errors.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Executor.py
> -lib/python${MODPY_VERSION}/site-packages/SCons/Job.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Memoize.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Node/
> lib/python${MODPY_VERSION}/site-packages/SCons/Node/Alias.py
> @@ -133,7 +132,14 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Script/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/SCons/Subst.py
> -lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/Job.py
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}Job.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/SCons/Taskmaster/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/386asm.py
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/DCommon.py
> @@ -176,6 +182,7 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}WinSDK.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/SCons/Tool/MSCommon/MSVC/${MODPY_PYCACHE}__init__.${MODPY_PYC_M
Re: update devel/scons to 4.4.0
On 2022/08/06 10:03:02 +0200, Omar Polo wrote:
> here's a diff to update scons to the latest release. I've tested with
> godot 3.4.5 (committed yesterday) and godot 3.5 (released today).
> I've also build-tested net/serf, games/pingus (that has a very, very
> old SConstruct file) and gpsd: everything seems to work fine.
>
> The changelog mentions mostly MSVC and ninja integration stuff which
> we don't use. (at the moment at least, building with ninja might be
> interesting.)
>
> https://github.com/SCons/scons/releases/tag/4.4.0
>
> There's a note for packaging that says: "Updated setup.cfg to remove
> Python 3.5 and add Python 3.10" which I don't think it's an issue but
> mentioned anyway.
>
> ok?
ping :)
Index: Makefile
===
RCS file: /home/cvs/ports/devel/scons/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile7 Jun 2022 11:38:09 - 1.38
+++ Makefile31 Jul 2022 10:12:23 -
@@ -1,9 +1,8 @@
COMMENT= Python-based build system
-MODPY_EGG_VERSION= 4.3.0
+MODPY_EGG_VERSION= 4.4.0
DISTNAME= SCons-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:L}
-REVISION= 2
CATEGORIES=devel
HOMEPAGE= https://www.scons.org/
Index: distinfo
===
RCS file: /home/cvs/ports/devel/scons/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo2 Mar 2022 17:03:28 - 1.20
+++ distinfo31 Jul 2022 10:12:34 -
@@ -1,2 +1,2 @@
-SHA256 (SCons-4.3.0.tar.gz) = 1HCBWH42dcwWjx9U8NdKabMoovyQ7E/rhfcoZ3QZuHk=
-SIZE (SCons-4.3.0.tar.gz) = 3065950
+SHA256 (SCons-4.4.0.tar.gz) = dwPE6dIgC0hUoxgAwdvUWH4fqG519YeVx0C8+n7Kfqo=
+SIZE (SCons-4.4.0.tar.gz) = 3096859
Index: patches/patch-SCons_Tool___init___py
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool___init___py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-SCons_Tool___init___py
--- patches/patch-SCons_Tool___init___py11 Mar 2022 18:53:22 -
1.2
+++ patches/patch-SCons_Tool___init___py31 Jul 2022 10:15:01 -
@@ -1,7 +1,7 @@
Index: SCons/Tool/__init__.py
--- SCons/Tool/__init__.py.orig
+++ SCons/Tool/__init__.py
-@@ -763,9 +763,9 @@ def tool_list(platform, env):
+@@ -757,9 +757,9 @@ def tool_list(platform, env):
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'ilink']
Index: patches/patch-SCons_Tool_gxx_py
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-SCons_Tool_gxx_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-SCons_Tool_gxx_py
--- patches/patch-SCons_Tool_gxx_py 11 Mar 2022 18:53:22 - 1.4
+++ patches/patch-SCons_Tool_gxx_py 31 Jul 2022 10:15:01 -
@@ -1,7 +1,7 @@
Index: SCons/Tool/gxx.py
--- SCons/Tool/gxx.py.orig
+++ SCons/Tool/gxx.py
-@@ -40,7 +40,7 @@ import SCons.Util
+@@ -38,7 +38,7 @@ import SCons.Util
from . import gcc
from . import cxx
Index: patches/patch-setup_cfg
===
RCS file: /home/cvs/ports/devel/scons/patches/patch-setup_cfg,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_cfg
--- patches/patch-setup_cfg 11 Mar 2022 18:53:22 - 1.2
+++ patches/patch-setup_cfg 31 Jul 2022 10:15:01 -
@@ -1,8 +1,8 @@
Index: setup.cfg
--- setup.cfg.orig
+++ setup.cfg
-@@ -56,7 +56,7 @@ console_scripts =
- scons.tool.docbook = *.*
+@@ -58,7 +58,7 @@ console_scripts =
+ SCons.Tool.docbook = *.*
[options.data_files]
-. = scons.1
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 7 Jun 2022 11:38:09 - 1.17
+++ pkg/PLIST 31 Jul 2022 10:26:46 -
@@ -68,6 +68,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Dir.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Fortran.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/IDL.py
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Java.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/LaTeX.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Prog.py
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/Python.py
@@ -80,6 +81,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Dir.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Fortran.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}IDL.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/SCons/Scanner/${MODPY_PYCACHE}Java.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${M
