- Actually apply the 3.3 update in ports/148982

PR:             ports/148982

3 files changed, 4 insertions, 34 deletions

diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index 6d8867fedf8a..e4f1ee76eafe 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_wsgi
-PORTVERSION=	3.2
-PORTREVISION=	1
+PORTVERSION=	3.3
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		http://apt.douglasthrift.net/files/${PORTNAME}/ \
diff --git a/www/mod_wsgi3/distinfo b/www/mod_wsgi3/distinfo
index adc8bf45b59d..80b4d07cc9bb 100644
--- a/www/mod_wsgi3/distinfo
+++ b/www/mod_wsgi3/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_wsgi-3.2.tar.gz) = 7e4f7f443f562f21f61d1bd06defa1d8
-SHA256 (mod_wsgi-3.2.tar.gz) = 0f7394bee6894587df023a382fc35b23913cb4a4faca18394380fe8f921e030a
-SIZE (mod_wsgi-3.2.tar.gz) = 116857
+MD5 (mod_wsgi-3.3.tar.gz) = 6172bb2bbabcd0c25867c2bc06f99dbb
+SHA256 (mod_wsgi-3.3.tar.gz) = d96e1078990484cfe5579df1e95dc73f009495e9c3f9a066b0983650bd9e3243
+SIZE (mod_wsgi-3.3.tar.gz) = 117930
diff --git a/www/mod_wsgi3/files/patch-mod_wsgi.c b/www/mod_wsgi3/files/patch-mod_wsgi.c
index d9c9992bbe99..e69de29bb2d1 100644
--- a/www/mod_wsgi3/files/patch-mod_wsgi.c
+++ b/www/mod_wsgi3/files/patch-mod_wsgi.c
@@ -1,29 +0,0 @@
---- ./mod_wsgi.c.orig	2010-03-09 01:48:50.000000000 -0800
-+++ ./mod_wsgi.c	2010-07-15 12:31:01.189153878 -0700
-@@ -5648,6 +5648,26 @@
-     module = PyImport_ImportModule("atexit");
-     Py_XDECREF(module);
- 
-+    /*
-+     * In Python 2.6.5 and Python 3.1.2 the shutdown of
-+     * threading was moved back into Py_Finalize() for the main
-+     * Python interpreter. Because we shutting down threading
-+     * ourselves, the second call results in errors being logged
-+     * when Py_Finalize() is called and the shutdown function
-+     * called a second time. The errors don't indicate any real
-+     * problem and the threading module ignores them anyway.
-+     * Whether we are using Python with this changed behaviour
-+     * can only be checked by looking at run time version.
-+     * Rather than try and add a dynamic check, create a fake
-+     * 'dummy_threading' module as the presence of that shuts up
-+     * the messages. It doesn't matter that the rest of the
-+     * shutdown function still runs as everything is already
-+     * stopped so doesn't do anything.
-+     */
-+
-+    if (!PyImport_AddModule("dummy_threading"))
-+        PyErr_Clear();
-+
-     Py_Finalize();
- 
-     wsgi_python_initialized = 0;