Update py-simplejson to 2.1.1.

Based on PR#43447 by Wen Heping.
While here, set LICENSE=mit with some cosmetic fixes.

Version 2.1.1 released 2010-03-31

* Change how setup.py imports ez_setup.py to try and workaround old versions
  of setuptools.
  http://code.google.com/p/simplejson/issues/detail?id=75
* Fix compilation on Windows platform (and other platforms with very
  picky compilers)
* Corrected simplejson.__version__ and other minor doc changes.
* Do not fail speedups tests if speedups could not be built.
  http://code.google.com/p/simplejson/issues/detail?id=73

Version 2.1.0 released 2010-03-10

* Decimal serialization officially supported for encoding with
  use_decimal=True. For encoding this encodes Decimal objects and
  for decoding it implies parse_float=Decimal
* Python 2.4 no longer supported (may still work, but no longer tested)
* Decoding performance and memory utilization enhancements
  http://bugs.python.org/issue7451
* JSONEncoderForHTML class for escaping &, <, >
  http://code.google.com/p/simplejson/issues/detail?id=66
* Memoization of object keys during encoding (when using speedups)
* Encoder changed to use PyIter_Next for list iteration to avoid
  potential threading issues
* Encoder changed to use iteritems rather than PyDict_Next in order to
  support dict subclasses that have a well defined ordering
  http://bugs.python.org/issue6105
* indent encoding parameter changed to be a string rather than an integer
  (integer use still supported for backwards compatibility)
  http://code.google.com/p/simplejson/issues/detail?id=56
* Test suite (python setup.py test) now automatically runs with and without
  speedups
  http://code.google.com/p/simplejson/issues/detail?id=55
* Fixed support for older versions of easy_install (e.g. stock Mac OS X config)
  http://code.google.com/p/simplejson/issues/detail?id=54
* Fixed str/unicode mismatches when using ensure_ascii=False
  http://code.google.com/p/simplejson/issues/detail?id=48
* Fixed error message when parsing an array with trailing comma with speedups
  http://code.google.com/p/simplejson/issues/detail?id=46
* Refactor decoder errors to raise JSONDecodeError instead of ValueError
  http://code.google.com/p/simplejson/issues/detail?id=45
* New ordered_pairs_hook feature in decoder which makes it possible to
  preserve key order. http://bugs.python.org/issue5381
* Fixed containerless unicode float decoding (same bug as 2.0.4, oops!)
  http://code.google.com/p/simplejson/issues/detail?id=43
* Share PosInf definition between encoder and decoder
* Minor reformatting to make it easier to backport simplejson changes
  to Python 2.7/3.1 json module

3 files changed, 22 insertions, 12 deletions

diff --git a/converters/py-simplejson/Makefile b/converters/py-simplejson/Makefile
index 93497f493fc..65cb14b55ff 100644
--- a/converters/py-simplejson/Makefile
+++ b/converters/py-simplejson/Makefile
@@ -1,21 +1,19 @@
-# $NetBSD: Makefile,v 1.9 2009/08/20 17:15:21 epg Exp $
+# $NetBSD: Makefile,v 1.10 2010/07/08 12:15:39 obache Exp $
 #
 
-PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
-DISTNAME=	simplejson-2.0.9
-#PKGREVISION=	1
+DISTNAME=	simplejson-2.1.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	converters
 MASTER_SITES=	http://pypi.python.org/packages/source/s/simplejson/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://undefined.org/python/#simplejson
 COMMENT=	Simplejson is a simple, fast, extensible JSON encoder/decoder
+LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LANGUAGES=  c
-
-PYDISTUTILSPKG=         yes
+USE_LANGUAGES=	c
 
 do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} setup.py test -q
diff --git a/converters/py-simplejson/PLIST b/converters/py-simplejson/PLIST
index 5c94fdeb77f..b3aa86c1a06 100644
--- a/converters/py-simplejson/PLIST
+++ b/converters/py-simplejson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/08/20 17:15:21 epg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/07/08 12:15:39 obache Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -14,6 +14,9 @@ ${PYSITELIB}/simplejson/decoder.pyo
 ${PYSITELIB}/simplejson/encoder.py
 ${PYSITELIB}/simplejson/encoder.pyc
 ${PYSITELIB}/simplejson/encoder.pyo
+${PYSITELIB}/simplejson/ordered_dict.py
+${PYSITELIB}/simplejson/ordered_dict.pyc
+${PYSITELIB}/simplejson/ordered_dict.pyo
 ${PYSITELIB}/simplejson/scanner.py
 ${PYSITELIB}/simplejson/scanner.pyc
 ${PYSITELIB}/simplejson/scanner.pyo
@@ -23,6 +26,9 @@ ${PYSITELIB}/simplejson/tests/__init__.pyo
 ${PYSITELIB}/simplejson/tests/test_check_circular.py
 ${PYSITELIB}/simplejson/tests/test_check_circular.pyc
 ${PYSITELIB}/simplejson/tests/test_check_circular.pyo
+${PYSITELIB}/simplejson/tests/test_decimal.py
+${PYSITELIB}/simplejson/tests/test_decimal.pyc
+${PYSITELIB}/simplejson/tests/test_decimal.pyo
 ${PYSITELIB}/simplejson/tests/test_decode.py
 ${PYSITELIB}/simplejson/tests/test_decode.pyc
 ${PYSITELIB}/simplejson/tests/test_decode.pyo
@@ -35,6 +41,9 @@ ${PYSITELIB}/simplejson/tests/test_dump.pyo
 ${PYSITELIB}/simplejson/tests/test_encode_basestring_ascii.py
 ${PYSITELIB}/simplejson/tests/test_encode_basestring_ascii.pyc
 ${PYSITELIB}/simplejson/tests/test_encode_basestring_ascii.pyo
+${PYSITELIB}/simplejson/tests/test_encode_for_html.py
+${PYSITELIB}/simplejson/tests/test_encode_for_html.pyc
+${PYSITELIB}/simplejson/tests/test_encode_for_html.pyo
 ${PYSITELIB}/simplejson/tests/test_fail.py
 ${PYSITELIB}/simplejson/tests/test_fail.pyc
 ${PYSITELIB}/simplejson/tests/test_fail.pyo
@@ -62,6 +71,9 @@ ${PYSITELIB}/simplejson/tests/test_scanstring.pyo
 ${PYSITELIB}/simplejson/tests/test_separators.py
 ${PYSITELIB}/simplejson/tests/test_separators.pyc
 ${PYSITELIB}/simplejson/tests/test_separators.pyo
+${PYSITELIB}/simplejson/tests/test_speedups.py
+${PYSITELIB}/simplejson/tests/test_speedups.pyc
+${PYSITELIB}/simplejson/tests/test_speedups.pyo
 ${PYSITELIB}/simplejson/tests/test_unicode.py
 ${PYSITELIB}/simplejson/tests/test_unicode.pyc
 ${PYSITELIB}/simplejson/tests/test_unicode.pyo
diff --git a/converters/py-simplejson/distinfo b/converters/py-simplejson/distinfo
index cf162afca64..fa4df28762b 100644
--- a/converters/py-simplejson/distinfo
+++ b/converters/py-simplejson/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/08/20 17:15:21 epg Exp $
+$NetBSD: distinfo,v 1.3 2010/07/08 12:15:39 obache Exp $
 
-SHA1 (simplejson-2.0.9.tar.gz) = b5b26059adbe677b06c299bed30557fcb0c7df8c
-RMD160 (simplejson-2.0.9.tar.gz) = 814a0b7aa11a361ba5eda0be93e30505c44409ad
-Size (simplejson-2.0.9.tar.gz) = 115443 bytes
+SHA1 (simplejson-2.1.1.tar.gz) = 106fe3481c9a3a9488cbe7d212eca7671837783f
+RMD160 (simplejson-2.1.1.tar.gz) = 7cb7b2b5052bf09ae5010d6d96cba28ebd490aac
+Size (simplejson-2.1.1.tar.gz) = 131203 bytes