| 1 |
|
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile |
| 2 |
< |
--- /usr/ports/www/mod_wsgi/Makefile 2008-07-16 16:23:54.000000000 -0700 |
| 3 |
< |
+++ mod_wsgi/Makefile 2008-08-23 14:36:28.012407983 -0700 |
| 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.1 |
| 9 |
< |
+PORTVERSION= 2.3 |
| 8 |
> |
-PORTVERSION= 2.6 |
| 9 |
> |
+PORTVERSION= 2.7 |
| 10 |
|
CATEGORIES= www python |
| 11 |
< |
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} |
| 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 2008-07-16 16:23:54.000000000 -0700 |
| 30 |
< |
+++ mod_wsgi/distinfo 2008-08-23 14:24:58.962894986 -0700 |
| 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.1.tar.gz) = 4e0e8b5a13e0be2fc5b038f1e3e826a2 |
| 33 |
< |
-SHA256 (mod_wsgi-2.1.tar.gz) = 7f1c28f1fbc585de2a15770c990e45b46d184245183775dd31e3a63bd30fc3a0 |
| 34 |
< |
-SIZE (mod_wsgi-2.1.tar.gz) = 96635 |
| 35 |
< |
+MD5 (mod_wsgi-2.3.tar.gz) = c686e1c498dbe5753fe491c3cf61cff4 |
| 36 |
< |
+SHA256 (mod_wsgi-2.3.tar.gz) = 760f03e4d96dd0560717b06448af95bd79e91b59d31930171775a53bb7ec2375 |
| 37 |
< |
+SIZE (mod_wsgi-2.3.tar.gz) = 96872 |
| 38 |
< |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c mod_wsgi/files/patch-mod_wsgi.c |
| 39 |
< |
--- /usr/ports/www/mod_wsgi/files/patch-mod_wsgi.c 2008-07-19 10:50:05.000000000 -0700 |
| 40 |
< |
+++ mod_wsgi/files/patch-mod_wsgi.c 2008-08-23 14:27:52.434479783 -0700 |
| 41 |
< |
@@ -1,20 +1,13 @@ |
| 42 |
< |
---- mod_wsgi.c.orig 2008-06-18 16:35:40.000000000 +0200 |
| 28 |
< |
-+++ mod_wsgi.c 2008-07-19 19:41:18.000000000 +0200 |
| 29 |
< |
-@@ -7771,6 +7771,9 @@ |
| 30 |
< |
- * is restricted, need to truncate display name if too long. |
| 31 |
< |
- */ |
| 32 |
< |
+Index: mod_wsgi.c |
| 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 |
< |
+--- mod_wsgi.c (revision 1007) |
| 45 |
< |
++++ mod_wsgi.c (revision 1008) |
| 46 |
< |
+@@ -245,7 +245,7 @@ |
| 47 |
< |
+ /* Version and module information. */ |
| 48 |
< |
|
| 49 |
< |
-+#ifdef __FreeBSD__ |
| 50 |
< |
-+ setproctitle(display_name); |
| 51 |
< |
-+#else |
| 52 |
< |
- argv0 = (char*)wsgi_server->process->argv[0]; |
| 53 |
< |
+ #define MOD_WSGI_MAJORVERSION_NUMBER 2 |
| 54 |
< |
+-#define MOD_WSGI_MINORVERSION_NUMBER 2 |
| 55 |
< |
++#define MOD_WSGI_MINORVERSION_NUMBER 3 |
| 56 |
< |
+ #define MOD_WSGI_VERSION_STRING "2.3" |
| 57 |
< |
|
| 58 |
< |
- dlen = strlen(argv0); |
| 59 |
< |
-@@ -7782,6 +7785,7 @@ |
| 60 |
< |
- memcpy(argv0, display_name, slen); |
| 61 |
< |
- else |
| 62 |
< |
- memcpy(argv0, display_name, dlen); |
| 63 |
< |
-+#endif |
| 64 |
< |
- } |
| 65 |
< |
- |
| 66 |
< |
- static void wsgi_setup_access(WSGIDaemonProcess *daemon) |
| 67 |
< |
+ #if AP_SERVER_MAJORVERSION_NUMBER < 2 |
| 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}" |
