| 1 |
douglas |
149 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/Makefile mod_wsgi3/Makefile |
| 2 |
douglas |
331 |
--- /usr/ports/www/mod_wsgi3/Makefile 2010-07-15 15:29:46.000000000 -0700 |
| 3 |
douglas |
335 |
+++ mod_wsgi3/Makefile 2010-07-28 15:29:58.000000000 -0700 |
| 4 |
|
|
@@ -6,7 +6,7 @@ |
| 5 |
|
|
# |
| 6 |
|
|
|
| 7 |
|
|
PORTNAME= mod_wsgi |
| 8 |
|
|
-PORTVERSION= 3.2 |
| 9 |
|
|
+PORTVERSION= 3.3 |
| 10 |
|
|
PORTREVISION= 1 |
| 11 |
|
|
CATEGORIES= www python |
| 12 |
|
|
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ |
| 13 |
douglas |
333 |
@@ -17,10 +17,12 @@ |
| 14 |
douglas |
331 |
MAINTAINER= douglas@douglasthrift.net |
| 15 |
|
|
COMMENT= Python WSGI adapter module for Apache |
| 16 |
douglas |
149 |
|
| 17 |
douglas |
331 |
+LICENSE= ASL |
| 18 |
|
|
+ |
| 19 |
|
|
MAKE_JOBS_SAFE= yes |
| 20 |
|
|
|
| 21 |
|
|
#LATEST_LINK= mod_wsgi |
| 22 |
douglas |
333 |
-CONFLICTS= mod_wsgi-2.* |
| 23 |
douglas |
334 |
+CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.* |
| 24 |
douglas |
333 |
|
| 25 |
|
|
PROJECTHOST= modwsgi |
| 26 |
|
|
|
| 27 |
douglas |
331 |
@@ -38,6 +40,14 @@ |
| 28 |
|
|
IGNORE= is unsupported with Python 3.0 |
| 29 |
|
|
.endif |
| 30 |
|
|
|
| 31 |
|
|
+pre-everything:: |
| 32 |
|
|
+ @${ECHO_MSG} "======================= ATTENTION! ======================" |
| 33 |
|
|
+ @${ECHO_MSG} |
| 34 |
|
|
+ @${ECHO_MSG} "If you want to use daemon mode you will need to make sure" |
| 35 |
|
|
+ @${ECHO_MSG} "Apache and APR include thread support." |
| 36 |
|
|
+ @${ECHO_MSG} |
| 37 |
|
|
+ @${ECHO_MSG} "=========================================================" |
| 38 |
|
|
+ |
| 39 |
|
|
post-install: |
| 40 |
|
|
@${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/${MODULENAME}.so" |
| 41 |
|
|
@${CAT} ${PKGMESSAGE} |
| 42 |
douglas |
335 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/distinfo mod_wsgi3/distinfo |
| 43 |
|
|
--- /usr/ports/www/mod_wsgi3/distinfo 2010-03-10 05:04:10.000000000 -0800 |
| 44 |
|
|
+++ mod_wsgi3/distinfo 2010-07-28 15:02:02.000000000 -0700 |
| 45 |
|
|
@@ -1,3 +1,3 @@ |
| 46 |
|
|
-MD5 (mod_wsgi-3.2.tar.gz) = 7e4f7f443f562f21f61d1bd06defa1d8 |
| 47 |
|
|
-SHA256 (mod_wsgi-3.2.tar.gz) = 0f7394bee6894587df023a382fc35b23913cb4a4faca18394380fe8f921e030a |
| 48 |
|
|
-SIZE (mod_wsgi-3.2.tar.gz) = 116857 |
| 49 |
|
|
+MD5 (mod_wsgi-3.3.tar.gz) = 6172bb2bbabcd0c25867c2bc06f99dbb |
| 50 |
|
|
+SHA256 (mod_wsgi-3.3.tar.gz) = d96e1078990484cfe5579df1e95dc73f009495e9c3f9a066b0983650bd9e3243 |
| 51 |
|
|
+SIZE (mod_wsgi-3.3.tar.gz) = 117930 |
| 52 |
|
|
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-mod_wsgi.c mod_wsgi3/files/patch-mod_wsgi.c |
| 53 |
|
|
--- /usr/ports/www/mod_wsgi3/files/patch-mod_wsgi.c 2010-07-15 15:29:46.000000000 -0700 |
| 54 |
|
|
+++ mod_wsgi3/files/patch-mod_wsgi.c 1969-12-31 16:00:00.000000000 -0800 |
| 55 |
|
|
@@ -1,29 +0,0 @@ |
| 56 |
|
|
---- ./mod_wsgi.c.orig 2010-03-09 01:48:50.000000000 -0800 |
| 57 |
|
|
-+++ ./mod_wsgi.c 2010-07-15 12:31:01.189153878 -0700 |
| 58 |
|
|
-@@ -5648,6 +5648,26 @@ |
| 59 |
|
|
- module = PyImport_ImportModule("atexit"); |
| 60 |
|
|
- Py_XDECREF(module); |
| 61 |
|
|
- |
| 62 |
|
|
-+ /* |
| 63 |
|
|
-+ * In Python 2.6.5 and Python 3.1.2 the shutdown of |
| 64 |
|
|
-+ * threading was moved back into Py_Finalize() for the main |
| 65 |
|
|
-+ * Python interpreter. Because we shutting down threading |
| 66 |
|
|
-+ * ourselves, the second call results in errors being logged |
| 67 |
|
|
-+ * when Py_Finalize() is called and the shutdown function |
| 68 |
|
|
-+ * called a second time. The errors don't indicate any real |
| 69 |
|
|
-+ * problem and the threading module ignores them anyway. |
| 70 |
|
|
-+ * Whether we are using Python with this changed behaviour |
| 71 |
|
|
-+ * can only be checked by looking at run time version. |
| 72 |
|
|
-+ * Rather than try and add a dynamic check, create a fake |
| 73 |
|
|
-+ * 'dummy_threading' module as the presence of that shuts up |
| 74 |
|
|
-+ * the messages. It doesn't matter that the rest of the |
| 75 |
|
|
-+ * shutdown function still runs as everything is already |
| 76 |
|
|
-+ * stopped so doesn't do anything. |
| 77 |
|
|
-+ */ |
| 78 |
|
|
-+ |
| 79 |
|
|
-+ if (!PyImport_AddModule("dummy_threading")) |
| 80 |
|
|
-+ PyErr_Clear(); |
| 81 |
|
|
-+ |
| 82 |
|
|
- Py_Finalize(); |
| 83 |
|
|
- |
| 84 |
|
|
- wsgi_python_initialized = 0; |
| 85 |
douglas |
331 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/pkg-message.in mod_wsgi3/files/pkg-message.in |
| 86 |
|
|
--- /usr/ports/www/mod_wsgi3/files/pkg-message.in 2008-09-02 14:55:40.000000000 -0700 |
| 87 |
douglas |
335 |
+++ mod_wsgi3/files/pkg-message.in 2010-07-26 23:34:51.000000000 -0700 |
| 88 |
douglas |
331 |
@@ -1,5 +1,8 @@ |
| 89 |
|
|
-================================================================================ |
| 90 |
|
|
+============================================================================ |
| 91 |
|
|
|
| 92 |
|
|
-For more information, see http://www.modwsgi.org/. |
| 93 |
|
|
+If you want to use daemon mode you will need to make sure Apache and APR |
| 94 |
|
|
+include thread support. |
| 95 |
|
|
|
| 96 |
|
|
-================================================================================ |
| 97 |
|
|
+For more information, see http://www.modwsgi.org/wiki/InstallationOnFreeBSD. |
| 98 |
|
|
+ |
| 99 |
|
|
+============================================================================ |
