| 1 |
< |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c mod_wsgi/files/patch-mod_wsgi.c |
| 2 |
< |
--- /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c Wed Dec 31 16:00:00 1969 |
| 3 |
< |
+++ mod_wsgi/files/patch-mod_wsgi.c Tue Jul 15 13:12:53 2008 |
| 4 |
< |
@@ -0,0 +1,33 @@ |
| 5 |
< |
+--- mod_wsgi.c.orig Tue Jul 15 13:01:00 2008 |
| 6 |
< |
++++ mod_wsgi.c Tue Jul 15 13:07:19 2008 |
| 7 |
< |
+@@ -7749,10 +7749,12 @@ |
| 8 |
< |
+ { |
| 9 |
< |
+ const char *display_name = NULL; |
| 10 |
< |
+ |
| 11 |
< |
++#ifndef __FreeBSD__ |
| 12 |
< |
+ int slen = 0; |
| 13 |
< |
+ int dlen = 0; |
| 14 |
< |
+ |
| 15 |
< |
+ char *argv0 = NULL; |
| 16 |
< |
++#endif |
| 17 |
< |
+ |
| 18 |
< |
+ display_name = daemon->group->display_name; |
| 19 |
< |
+ |
| 20 |
< |
+@@ -7771,6 +7773,9 @@ |
| 21 |
< |
+ * is restricted, need to truncate display name if too long. |
| 22 |
< |
+ */ |
| 23 |
< |
+ |
| 24 |
< |
++#ifdef __FreeBSD__ |
| 25 |
< |
++ setproctitle("%s", display_name); |
| 26 |
< |
++#else |
| 27 |
< |
+ argv0 = (char*)wsgi_server->process->argv[0]; |
| 28 |
< |
+ |
| 29 |
< |
+ dlen = strlen(argv0); |
| 30 |
< |
+@@ -7782,6 +7787,7 @@ |
| 31 |
< |
+ memcpy(argv0, display_name, slen); |
| 32 |
< |
+ else |
| 33 |
< |
+ memcpy(argv0, display_name, dlen); |
| 34 |
< |
++#endif |
| 35 |
< |
+ } |
| 36 |
< |
+ |
| 37 |
< |
+ static void wsgi_setup_access(WSGIDaemonProcess *daemon) |
| 1 |
> |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile |
| 2 |
> |
--- /usr/ports/www/mod_wsgi/Makefile 2009-11-21 02:51:19.000000000 -0800 |
| 3 |
> |
+++ mod_wsgi/Makefile 2009-11-23 00:47:08.000000000 -0800 |
| 4 |
> |
@@ -6,7 +6,7 @@ |
| 5 |
> |
# |
| 6 |
> |
|
| 7 |
> |
PORTNAME= mod_wsgi |
| 8 |
> |
-PORTVERSION= 2.6 |
| 9 |
> |
+PORTVERSION= 2.7 |
| 10 |
> |
CATEGORIES= www python |
| 11 |
> |
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ |
| 12 |
> |
http://apt.douglasthrift.net/files/${PORTNAME}/ \ |
| 13 |
> |
@@ -17,10 +17,13 @@ |
| 14 |
> |
|
| 15 |
> |
MAKE_JOBS_SAFE= yes |
| 16 |
> |
|
| 17 |
> |
+LATEST_LINK= mod_wsgi |
| 18 |
> |
+CONFLICTS= mod_wsgi-3.* |
| 19 |
> |
+ |
| 20 |
> |
PROJECTHOST= modwsgi |
| 21 |
> |
|
| 22 |
> |
USE_APACHE= 1.3+ |
| 23 |
> |
-USE_PYTHON= 2.3+ |
| 24 |
> |
+USE_PYTHON= 2.3-2.6 |
| 25 |
> |
|
| 26 |
> |
GNU_CONFIGURE= yes |
| 27 |
> |
CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" |
| 28 |
> |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/distinfo mod_wsgi/distinfo |
| 29 |
> |
--- /usr/ports/www/mod_wsgi/distinfo 2009-10-11 05:19:17.000000000 -0700 |
| 30 |
> |
+++ mod_wsgi/distinfo 2009-11-21 04:50:56.000000000 -0800 |
| 31 |
> |
@@ -1,3 +1,3 @@ |
| 32 |
> |
-MD5 (mod_wsgi-2.6.tar.gz) = c313cd7a662024866ce3376cb5a76cf6 |
| 33 |
> |
-SHA256 (mod_wsgi-2.6.tar.gz) = 70ca565528bdb29d1f0903e39827288dca5bff7ffccf090957dd4ed02b51e497 |
| 34 |
> |
-SIZE (mod_wsgi-2.6.tar.gz) = 99955 |
| 35 |
> |
+MD5 (mod_wsgi-2.7.tar.gz) = 60f3bf145eb804286b5fbf4e730a7ed1 |
| 36 |
> |
+SHA256 (mod_wsgi-2.7.tar.gz) = 5596b3968d4c90d667309f08f966e6f05b1bfae36b082783009af580aa5fa44b |
| 37 |
> |
+SIZE (mod_wsgi-2.7.tar.gz) = 99956 |
| 38 |
> |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-configure mod_wsgi/files/patch-configure |
| 39 |
> |
--- /usr/ports/www/mod_wsgi/files/patch-configure 1969-12-31 16:00:00.000000000 -0800 |
| 40 |
> |
+++ mod_wsgi/files/patch-configure 2009-11-23 00:40:04.000000000 -0800 |
| 41 |
> |
@@ -0,0 +1,28 @@ |
| 42 |
> |
+Index: configure |
| 43 |
> |
+=================================================================== |
| 44 |
> |
+--- configure (revision 1487) |
| 45 |
> |
++++ configure (working copy) |
| 46 |
> |
+@@ -1851,16 +1851,22 @@ |
| 47 |
> |
+ fi |
| 48 |
> |
+ |
| 49 |
> |
+ CFLAGS1="" |
| 50 |
> |
++for arg in ${CFLAGS} |
| 51 |
> |
++do |
| 52 |
> |
++ CFLAGS1="${CFLAGS1} -Wc,$arg" |
| 53 |
> |
++done |
| 54 |
> |
++ |
| 55 |
> |
++CFLAGS2="" |
| 56 |
> |
+ if test -x /usr/bin/lipo; then |
| 57 |
> |
+ LDFLAGS3="" |
| 58 |
> |
+ ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'` |
| 59 |
> |
+ for ARCH in $ARCHITECTURES; do |
| 60 |
> |
+- CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'" |
| 61 |
> |
++ CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'" |
| 62 |
> |
+ LDFLAGS3="${LDFLAGS3} -arch ${ARCH}" |
| 63 |
> |
+ done |
| 64 |
> |
+ fi |
| 65 |
> |
+ |
| 66 |
> |
+-CFLAGS="${CFLAGS} ${CFLAGS1}" |
| 67 |
> |
++CFLAGS="${CFLAGS1} ${CFLAGS2}" |
| 68 |
> |
+ LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}" |
| 69 |
> |
+ LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}" |
