| 1 |
douglas |
29 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi/Makefile mod_wsgi/Makefile |
| 2 |
douglas |
142 |
--- /usr/ports/www/mod_wsgi/Makefile 2009-11-21 02:51:19.000000000 -0800 |
| 3 |
douglas |
144 |
+++ mod_wsgi/Makefile 2009-11-23 00:47:08.000000000 -0800 |
| 4 |
douglas |
142 |
@@ -6,7 +6,7 @@ |
| 5 |
|
|
# |
| 6 |
|
|
|
| 7 |
|
|
PORTNAME= mod_wsgi |
| 8 |
|
|
-PORTVERSION= 2.6 |
| 9 |
|
|
+PORTVERSION= 2.7 |
| 10 |
douglas |
29 |
CATEGORIES= www python |
| 11 |
douglas |
140 |
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ |
| 12 |
douglas |
142 |
http://apt.douglasthrift.net/files/${PORTNAME}/ \ |
| 13 |
|
|
@@ -17,10 +17,13 @@ |
| 14 |
douglas |
29 |
|
| 15 |
douglas |
142 |
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 |
douglas |
144 |
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}" |
