Changes 2.3.0:

This release adds new features, and fixes and improves a number of issues. This will be the last release to support Python versions earlier than 2.7, as we begin to move toward supporting Python 3.

4 files changed, 20 insertions, 28 deletions

diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index 242a54f6094..d1b49ee2443 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile,v 1.19 2012/12/16 15:06:25 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.20 2013/09/01 11:41:42 adam Exp $
 
-CONFLICTS=		scons-devel-[0-9]*
+DISTNAME=	scons-2.3.0
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scons/}
 
-.include "../../devel/scons/Makefile.common"
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.scons.org/
+COMMENT=	Python-based, open-source build system
+LICENSE=	mit
 
-SCONS_VERSION=		2.2.0
+REPLACE_PYTHON+=	script/scons script/scons-time script/sconsign
 
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scons/Makefile.common b/devel/scons/Makefile.common
deleted file mode 100644
index 9eb458729de..00000000000
--- a/devel/scons/Makefile.common
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2012/12/16 15:06:25 ryoon Exp $
-#
-# used by devel/scons/Makefile
-
-DISTNAME=		scons-${SCONS_VERSION}
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scons/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.scons.org/
-COMMENT=		Python-based, open-source build system
-LICENSE=		mit
-
-REPLACE_PYTHON+=	script/scons script/scons-time script/sconsign
-
-.include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
diff --git a/devel/scons/PLIST b/devel/scons/PLIST
index d47fd860111..4edd12b1e20 100644
--- a/devel/scons/PLIST
+++ b/devel/scons/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2012/12/16 15:06:25 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/09/01 11:41:42 adam Exp $
 bin/scons
 bin/${PKGNAME}
 bin/scons-time
 bin/scons-time-${PKGVERSION}
 bin/sconsign
 bin/sconsign-${PKGVERSION}
+lib/${PKGNAME}/${EGG_FILE}
 lib/${PKGNAME}/SCons/Action.py
 lib/${PKGNAME}/SCons/Action.pyc
 lib/${PKGNAME}/SCons/Action.pyo
@@ -458,6 +459,9 @@ lib/${PKGNAME}/SCons/Tool/rpcgen.pyo
 lib/${PKGNAME}/SCons/Tool/rpm.py
 lib/${PKGNAME}/SCons/Tool/rpm.pyc
 lib/${PKGNAME}/SCons/Tool/rpm.pyo
+lib/${PKGNAME}/SCons/Tool/rpmutils.py
+lib/${PKGNAME}/SCons/Tool/rpmutils.pyc
+lib/${PKGNAME}/SCons/Tool/rpmutils.pyo
 lib/${PKGNAME}/SCons/Tool/sgiar.py
 lib/${PKGNAME}/SCons/Tool/sgiar.pyc
 lib/${PKGNAME}/SCons/Tool/sgiar.pyo
@@ -578,7 +582,6 @@ lib/${PKGNAME}/SCons/dblite.pyo
 lib/${PKGNAME}/SCons/exitfuncs.py
 lib/${PKGNAME}/SCons/exitfuncs.pyc
 lib/${PKGNAME}/SCons/exitfuncs.pyo
-lib/${PKGNAME}/${EGG_FILE}
 man/man1/scons-time.1
 man/man1/scons.1
 man/man1/sconsign.1
diff --git a/devel/scons/distinfo b/devel/scons/distinfo
index 93150dbb51a..7cc33a8f610 100644
--- a/devel/scons/distinfo
+++ b/devel/scons/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2012/12/16 15:06:25 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2013/09/01 11:41:42 adam Exp $
 
-SHA1 (scons-2.2.0.tar.gz) = b48b71926f707aa3a802081bfd9b0ef45c3b0fdf
-RMD160 (scons-2.2.0.tar.gz) = fc83225c7c8be4a16c198250fe827729f2f8aabf
-Size (scons-2.2.0.tar.gz) = 591836 bytes
+SHA1 (scons-2.3.0.tar.gz) = 728edf20047a9f8a537107dbff8d8f803fd2d5e3
+RMD160 (scons-2.3.0.tar.gz) = 255f3022306bfb704296e3f15102bb6da517f73e
+Size (scons-2.3.0.tar.gz) = 599514 bytes
 SHA1 (patch-aa) = 20fe8e5e31b7f0f0d5755a51beefffd7504a55ae