Update to 2.2.0

* Tested with graphics/blender and games/pingus

Changelog:
* Bugfixes
* More documentation
* Add new features

4 files changed, 43 insertions, 32 deletions

diff --git a/devel/scons/Makefile b/devel/scons/Makefile
index c778184f412..242a54f6094 100644
--- a/devel/scons/Makefile
+++ b/devel/scons/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2012/10/31 11:19:45 asau Exp $
+# $NetBSD: Makefile,v 1.19 2012/12/16 15:06:25 ryoon Exp $
 #
 
 CONFLICTS=		scons-devel-[0-9]*
 
 .include "../../devel/scons/Makefile.common"
 
-SCONS_VERSION=		1.3.1
-PKGREVISION=		2
+SCONS_VERSION=		2.2.0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/scons/Makefile.common b/devel/scons/Makefile.common
index 55392c3c278..9eb458729de 100644
--- a/devel/scons/Makefile.common
+++ b/devel/scons/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/12/13 16:13:09 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/12/16 15:06:25 ryoon Exp $
 #
 # used by devel/scons/Makefile
 
@@ -8,8 +8,8 @@ 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
+COMMENT=		Python-based, open-source build system
+LICENSE=		mit
 
 REPLACE_PYTHON+=	script/scons script/scons-time script/sconsign
 
diff --git a/devel/scons/PLIST b/devel/scons/PLIST
index ea17c459f39..d47fd860111 100644
--- a/devel/scons/PLIST
+++ b/devel/scons/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/04/08 20:21:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/12/16 15:06:25 ryoon Exp $
 bin/scons
 bin/${PKGNAME}
 bin/scons-time
@@ -170,6 +170,9 @@ lib/${PKGNAME}/SCons/Tool/CVS.pyo
 lib/${PKGNAME}/SCons/Tool/FortranCommon.py
 lib/${PKGNAME}/SCons/Tool/FortranCommon.pyc
 lib/${PKGNAME}/SCons/Tool/FortranCommon.pyo
+lib/${PKGNAME}/SCons/Tool/GettextCommon.py
+lib/${PKGNAME}/SCons/Tool/GettextCommon.pyc
+lib/${PKGNAME}/SCons/Tool/GettextCommon.pyo
 lib/${PKGNAME}/SCons/Tool/JavaCommon.py
 lib/${PKGNAME}/SCons/Tool/JavaCommon.pyc
 lib/${PKGNAME}/SCons/Tool/JavaCommon.pyo
@@ -260,6 +263,9 @@ lib/${PKGNAME}/SCons/Tool/dvipdf.pyo
 lib/${PKGNAME}/SCons/Tool/dvips.py
 lib/${PKGNAME}/SCons/Tool/dvips.pyc
 lib/${PKGNAME}/SCons/Tool/dvips.pyo
+lib/${PKGNAME}/SCons/Tool/f03.py
+lib/${PKGNAME}/SCons/Tool/f03.pyc
+lib/${PKGNAME}/SCons/Tool/f03.pyo
 lib/${PKGNAME}/SCons/Tool/f77.py
 lib/${PKGNAME}/SCons/Tool/f77.pyc
 lib/${PKGNAME}/SCons/Tool/f77.pyo
@@ -287,6 +293,9 @@ lib/${PKGNAME}/SCons/Tool/gas.pyo
 lib/${PKGNAME}/SCons/Tool/gcc.py
 lib/${PKGNAME}/SCons/Tool/gcc.pyc
 lib/${PKGNAME}/SCons/Tool/gcc.pyo
+lib/${PKGNAME}/SCons/Tool/gettext.py
+lib/${PKGNAME}/SCons/Tool/gettext.pyc
+lib/${PKGNAME}/SCons/Tool/gettext.pyo
 lib/${PKGNAME}/SCons/Tool/gfortran.py
 lib/${PKGNAME}/SCons/Tool/gfortran.pyc
 lib/${PKGNAME}/SCons/Tool/gfortran.pyo
@@ -365,6 +374,15 @@ lib/${PKGNAME}/SCons/Tool/midl.pyo
 lib/${PKGNAME}/SCons/Tool/mingw.py
 lib/${PKGNAME}/SCons/Tool/mingw.pyc
 lib/${PKGNAME}/SCons/Tool/mingw.pyo
+lib/${PKGNAME}/SCons/Tool/msgfmt.py
+lib/${PKGNAME}/SCons/Tool/msgfmt.pyc
+lib/${PKGNAME}/SCons/Tool/msgfmt.pyo
+lib/${PKGNAME}/SCons/Tool/msginit.py
+lib/${PKGNAME}/SCons/Tool/msginit.pyc
+lib/${PKGNAME}/SCons/Tool/msginit.pyo
+lib/${PKGNAME}/SCons/Tool/msgmerge.py
+lib/${PKGNAME}/SCons/Tool/msgmerge.pyc
+lib/${PKGNAME}/SCons/Tool/msgmerge.pyo
 lib/${PKGNAME}/SCons/Tool/mslib.py
 lib/${PKGNAME}/SCons/Tool/mslib.pyc
 lib/${PKGNAME}/SCons/Tool/mslib.pyo
@@ -491,6 +509,9 @@ lib/${PKGNAME}/SCons/Tool/tlib.pyo
 lib/${PKGNAME}/SCons/Tool/wix.py
 lib/${PKGNAME}/SCons/Tool/wix.pyc
 lib/${PKGNAME}/SCons/Tool/wix.pyo
+lib/${PKGNAME}/SCons/Tool/xgettext.py
+lib/${PKGNAME}/SCons/Tool/xgettext.pyc
+lib/${PKGNAME}/SCons/Tool/xgettext.pyo
 lib/${PKGNAME}/SCons/Tool/yacc.py
 lib/${PKGNAME}/SCons/Tool/yacc.pyc
 lib/${PKGNAME}/SCons/Tool/yacc.pyo
@@ -527,36 +548,27 @@ lib/${PKGNAME}/SCons/__init__.pyo
 lib/${PKGNAME}/SCons/compat/__init__.py
 lib/${PKGNAME}/SCons/compat/__init__.pyc
 lib/${PKGNAME}/SCons/compat/__init__.pyo
-lib/${PKGNAME}/SCons/compat/_scons_UserString.py
-lib/${PKGNAME}/SCons/compat/_scons_UserString.pyc
-lib/${PKGNAME}/SCons/compat/_scons_UserString.pyo
+lib/${PKGNAME}/SCons/compat/_scons_builtins.py
+lib/${PKGNAME}/SCons/compat/_scons_builtins.pyc
+lib/${PKGNAME}/SCons/compat/_scons_builtins.pyo
+lib/${PKGNAME}/SCons/compat/_scons_collections.py
+lib/${PKGNAME}/SCons/compat/_scons_collections.pyc
+lib/${PKGNAME}/SCons/compat/_scons_collections.pyo
+lib/${PKGNAME}/SCons/compat/_scons_dbm.py
+lib/${PKGNAME}/SCons/compat/_scons_dbm.pyc
+lib/${PKGNAME}/SCons/compat/_scons_dbm.pyo
 lib/${PKGNAME}/SCons/compat/_scons_hashlib.py
 lib/${PKGNAME}/SCons/compat/_scons_hashlib.pyc
 lib/${PKGNAME}/SCons/compat/_scons_hashlib.pyo
-lib/${PKGNAME}/SCons/compat/_scons_itertools.py
-lib/${PKGNAME}/SCons/compat/_scons_itertools.pyc
-lib/${PKGNAME}/SCons/compat/_scons_itertools.pyo
-lib/${PKGNAME}/SCons/compat/_scons_optparse.py
-lib/${PKGNAME}/SCons/compat/_scons_optparse.pyc
-lib/${PKGNAME}/SCons/compat/_scons_optparse.pyo
+lib/${PKGNAME}/SCons/compat/_scons_io.py
+lib/${PKGNAME}/SCons/compat/_scons_io.pyc
+lib/${PKGNAME}/SCons/compat/_scons_io.pyo
 lib/${PKGNAME}/SCons/compat/_scons_sets.py
 lib/${PKGNAME}/SCons/compat/_scons_sets.pyc
 lib/${PKGNAME}/SCons/compat/_scons_sets.pyo
-lib/${PKGNAME}/SCons/compat/_scons_sets15.py
-lib/${PKGNAME}/SCons/compat/_scons_sets15.pyc
-lib/${PKGNAME}/SCons/compat/_scons_sets15.pyo
-lib/${PKGNAME}/SCons/compat/_scons_shlex.py
-lib/${PKGNAME}/SCons/compat/_scons_shlex.pyc
-lib/${PKGNAME}/SCons/compat/_scons_shlex.pyo
 lib/${PKGNAME}/SCons/compat/_scons_subprocess.py
 lib/${PKGNAME}/SCons/compat/_scons_subprocess.pyc
 lib/${PKGNAME}/SCons/compat/_scons_subprocess.pyo
-lib/${PKGNAME}/SCons/compat/_scons_textwrap.py
-lib/${PKGNAME}/SCons/compat/_scons_textwrap.pyc
-lib/${PKGNAME}/SCons/compat/_scons_textwrap.pyo
-lib/${PKGNAME}/SCons/compat/builtins.py
-lib/${PKGNAME}/SCons/compat/builtins.pyc
-lib/${PKGNAME}/SCons/compat/builtins.pyo
 lib/${PKGNAME}/SCons/cpp.py
 lib/${PKGNAME}/SCons/cpp.pyc
 lib/${PKGNAME}/SCons/cpp.pyo
diff --git a/devel/scons/distinfo b/devel/scons/distinfo
index eeb8d8fa238..93150dbb51a 100644
--- a/devel/scons/distinfo
+++ b/devel/scons/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2012/02/02 11:49:55 obache Exp $
+$NetBSD: distinfo,v 1.9 2012/12/16 15:06:25 ryoon Exp $
 
-SHA1 (scons-1.3.1.tar.gz) = 360d4167ea7f92fbdd173776ce1c191b9aa7fa42
-RMD160 (scons-1.3.1.tar.gz) = e4f568afa7c2519dc03d2993c8dfbb247b6b7c21
-Size (scons-1.3.1.tar.gz) = 599550 bytes
+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 (patch-aa) = 20fe8e5e31b7f0f0d5755a51beefffd7504a55ae