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
--- Makefile 9 Oct 2013 11:56:37 -0000 1.18
+++ Makefile 25 Mar 2014 21:58:43 -0000
@@ -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 <bsd.port.mk>
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 -0000 1.9
+++ distinfo 25 Mar 2014 21:58:43 -0000
@@ -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 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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 -0000 1.7
+++ pkg/PLIST 25 Mar 2014 21:58:43 -0000
@@ -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-${VERSION}/SCons/Tool/dmd.pyc
+lib/scons-${VERSION}/SCons/Tool/docbook/
+lib/scons-${VERSION}/SCons/Tool/docbook/__init__.py
+lib/scons-${VERSION}/SCons/Tool/docbook/__init__.pyc
lib/scons-${VERSION}/SCons/Tool/dvi.py
lib/scons-${VERSION}/SCons/Tool/dvi.pyc
lib/scons-${VERSION}/SCons/Tool/dvipdf.py
@@ -402,6 +407,3 @@ lib/scons-${VERSION}/SCons/dblite.pyc
lib/scons-${VERSION}/SCons/exitfuncs.py
lib/scons-${VERSION}/SCons/exitfuncs.pyc
lib/scons-${VERSION}/scons-${VERSION}-py${MODPY_VERSION}.egg-info
-@man man/man1/scons-time.1
-@man man/man1/scons.1
-@man man/man1/sconsign.1
