From 236ba12816e3e71acc01c96d03ca27f0a09a9e9c Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sun, 22 Apr 2012 09:17:50 +0000
Subject: [PATCH] - update to 2.5.0

---
 devel/py-simplejson/Makefile  | 11 ++------
 devel/py-simplejson/distinfo  | 10 +++----
 devel/py-simplejson/pkg/PLIST | 50 ++++++++++++++---------------------
 3 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile
index 2865e0ee851..b3a6f80bb4a 100644
--- a/devel/py-simplejson/Makefile
+++ b/devel/py-simplejson/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2011/09/16 09:24:56 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2012/04/22 09:17:50 jasper Exp $
 
 COMMENT =		JSON encoder/decoder
 
-MODPY_EGG_VERSION =	2.0.9
+MODPY_EGG_VERSION =	2.5.0
 DISTNAME =		simplejson-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		4
 
 CATEGORIES =		devel
 
@@ -24,14 +23,8 @@ MASTER_SITES =		${MASTER_SITE_PYPI:=s/simplejson/}
 MODULES =		lang/python
 REGRESS_DEPENDS =	devel/py-nose
 
-MODPY_SETUPTOOLS =	Yes
-
 WANTLIB +=		${MODPY_WANTLIB}
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-simplejson
-	cd ${WRKSRC}/docs && pax -rw * ${PREFIX}/share/doc/py-simplejson
-
 do-regress:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests
 
diff --git a/devel/py-simplejson/distinfo b/devel/py-simplejson/distinfo
index e291000e670..1c679760b15 100644
--- a/devel/py-simplejson/distinfo
+++ b/devel/py-simplejson/distinfo
@@ -1,5 +1,5 @@
-MD5 (simplejson-2.0.9.tar.gz) = r15no5yjQIVjQR01fm1eRw==
-RMD160 (simplejson-2.0.9.tar.gz) = gUoLeqEaNhul7aC+k+MFBcRECa0=
-SHA1 (simplejson-2.0.9.tar.gz) = tbJgWa2+Z3sGwpm+0wVX/LDH34w=
-SHA256 (simplejson-2.0.9.tar.gz) = q830YHeL7/SLoT+vW1gQzzgD5cjYcrX8UpImqlbsk+4=
-SIZE (simplejson-2.0.9.tar.gz) = 115443
+MD5 (simplejson-2.5.0.tar.gz) = MWBVYiTj4M2WBcEB6w3juQ==
+RMD160 (simplejson-2.5.0.tar.gz) = XfcYw9uYDxTBS8jPJ3qjKVHH42Q=
+SHA1 (simplejson-2.5.0.tar.gz) = 52p694RfFv05dTmVolSWeGVxFTs=
+SHA256 (simplejson-2.5.0.tar.gz) = K89b7bUyilYzBFp9RnhNM5POlAyUnAkMr111ttMWNGY=
+SIZE (simplejson-2.5.0.tar.gz) = 52834
diff --git a/devel/py-simplejson/pkg/PLIST b/devel/py-simplejson/pkg/PLIST
index 7a1130e636b..13a91a24f22 100644
--- a/devel/py-simplejson/pkg/PLIST
+++ b/devel/py-simplejson/pkg/PLIST
@@ -1,11 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.7 2009/10/11 20:59:37 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.8 2012/04/22 09:17:50 jasper Exp $
 lib/python${MODPY_VERSION}/site-packages/simplejson/
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/simplejson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/simplejson/__init__.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/_speedups.so
@@ -13,13 +8,19 @@ lib/python${MODPY_VERSION}/site-packages/simplejson/decoder.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/decoder.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/encoder.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/encoder.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/ordered_dict.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/ordered_dict.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/scanner.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/scanner.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_bigint_as_string.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_bigint_as_string.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_check_circular.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_check_circular.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_decimal.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_decimal.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_decode.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_decode.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_default.py
@@ -28,12 +29,20 @@ lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_dump.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_dump.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_encode_basestring_ascii.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_encode_basestring_ascii.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_encode_for_html.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_encode_for_html.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_errors.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_errors.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_fail.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_fail.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_float.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_float.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_indent.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_indent.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_item_sort_key.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_item_sort_key.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_namedtuple.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_namedtuple.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_pass1.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_pass1.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_pass2.py
@@ -46,30 +55,11 @@ lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_scanstring.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_scanstring.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_separators.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_separators.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_speedups.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_speedups.pyc
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_tuple.py
+lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_tuple.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_unicode.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tests/test_unicode.pyc
 lib/python${MODPY_VERSION}/site-packages/simplejson/tool.py
 lib/python${MODPY_VERSION}/site-packages/simplejson/tool.pyc
-share/doc/py-simplejson/
-share/doc/py-simplejson/_sources/
-share/doc/py-simplejson/_sources/index.txt
-share/doc/py-simplejson/_static/
-share/doc/py-simplejson/_static/contents.png
-share/doc/py-simplejson/_static/default.css
-share/doc/py-simplejson/_static/doctools.js
-share/doc/py-simplejson/_static/file.png
-share/doc/py-simplejson/_static/interface.js
-share/doc/py-simplejson/_static/jquery.js
-share/doc/py-simplejson/_static/minus.png
-share/doc/py-simplejson/_static/navigation.png
-share/doc/py-simplejson/_static/plus.png
-share/doc/py-simplejson/_static/pygments.css
-share/doc/py-simplejson/_static/rightsidebar.css
-share/doc/py-simplejson/_static/searchtools.js
-share/doc/py-simplejson/_static/sphinxdoc.css
-share/doc/py-simplejson/_static/stickysidebar.css
-share/doc/py-simplejson/_static/traditional.css
-share/doc/py-simplejson/genindex.html
-share/doc/py-simplejson/index.html
-share/doc/py-simplejson/search.html
-share/doc/py-simplejson/searchindex.json