diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/Makefile mod_wsgi3/Makefile --- /usr/ports/www/mod_wsgi3/Makefile 2010-07-15 15:29:46.000000000 -0700 +++ mod_wsgi3/Makefile 2010-07-28 15:29:58.000000000 -0700 @@ -6,7 +6,7 @@ # PORTNAME= mod_wsgi -PORTVERSION= 3.2 +PORTVERSION= 3.3 PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ @@ -17,10 +17,12 @@ MAINTAINER= douglas@douglasthrift.net COMMENT= Python WSGI adapter module for Apache +LICENSE= ASL + MAKE_JOBS_SAFE= yes #LATEST_LINK= mod_wsgi -CONFLICTS= mod_wsgi-2.* +CONFLICTS= ${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.* PROJECTHOST= modwsgi @@ -38,6 +40,14 @@ IGNORE= is unsupported with Python 3.0 .endif +pre-everything:: + @${ECHO_MSG} "======================= ATTENTION! ======================" + @${ECHO_MSG} + @${ECHO_MSG} "If you want to use daemon mode you will need to make sure" + @${ECHO_MSG} "Apache and APR include thread support." + @${ECHO_MSG} + @${ECHO_MSG} "=========================================================" + post-install: @${APXS} -e -a -n "${SHORTMODNAME}" "${APACHEMODDIR}/${MODULENAME}.so" @${CAT} ${PKGMESSAGE} diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/distinfo mod_wsgi3/distinfo --- /usr/ports/www/mod_wsgi3/distinfo 2010-03-10 05:04:10.000000000 -0800 +++ mod_wsgi3/distinfo 2010-07-28 15:02:02.000000000 -0700 @@ -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 -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-mod_wsgi.c mod_wsgi3/files/patch-mod_wsgi.c --- /usr/ports/www/mod_wsgi3/files/patch-mod_wsgi.c 2010-07-15 15:29:46.000000000 -0700 +++ mod_wsgi3/files/patch-mod_wsgi.c 1969-12-31 16:00:00.000000000 -0800 @@ -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; diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/pkg-message.in mod_wsgi3/files/pkg-message.in --- /usr/ports/www/mod_wsgi3/files/pkg-message.in 2008-09-02 14:55:40.000000000 -0700 +++ mod_wsgi3/files/pkg-message.in 2010-07-26 23:34:51.000000000 -0700 @@ -1,5 +1,8 @@ -================================================================================ +============================================================================ -For more information, see http://www.modwsgi.org/. +If you want to use daemon mode you will need to make sure Apache and APR +include thread support. -================================================================================ +For more information, see http://www.modwsgi.org/wiki/InstallationOnFreeBSD. + +============================================================================