diff options
| -rw-r--r-- | www/mod_wsgi/Makefile | 7 | ||||
| -rw-r--r-- | www/mod_wsgi/distinfo | 6 | ||||
| -rw-r--r-- | www/mod_wsgi/files/patch-configure | 28 | ||||
| -rw-r--r-- | www/mod_wsgi3/Makefile | 7 | ||||
| -rw-r--r-- | www/mod_wsgi3/distinfo | 6 | ||||
| -rw-r--r-- | www/mod_wsgi3/files/patch-configure | 28 |
6 files changed, 72 insertions, 10 deletions
diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi/Makefile index 9b2fedde7453..3c5e4f5f00c8 100644 --- a/www/mod_wsgi/Makefile +++ b/www/mod_wsgi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_wsgi -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://apt.douglasthrift.net/files/${PORTNAME}/ \ @@ -17,10 +17,13 @@ COMMENT= Python WSGI adapter module for Apache MAKE_JOBS_SAFE= yes +LATEST_LINK= mod_wsgi +CONFLICTS= mod_wsgi-3.* + PROJECTHOST= modwsgi USE_APACHE= 1.3+ -USE_PYTHON= 2.3+ +USE_PYTHON= 2.5-2.6 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" diff --git a/www/mod_wsgi/distinfo b/www/mod_wsgi/distinfo index e84b2c736c0a..5e455dbe4eea 100644 --- a/www/mod_wsgi/distinfo +++ b/www/mod_wsgi/distinfo @@ -1,3 +1,3 @@ -MD5 (mod_wsgi-2.6.tar.gz) = c313cd7a662024866ce3376cb5a76cf6 -SHA256 (mod_wsgi-2.6.tar.gz) = 70ca565528bdb29d1f0903e39827288dca5bff7ffccf090957dd4ed02b51e497 -SIZE (mod_wsgi-2.6.tar.gz) = 99955 +MD5 (mod_wsgi-2.7.tar.gz) = 60f3bf145eb804286b5fbf4e730a7ed1 +SHA256 (mod_wsgi-2.7.tar.gz) = 5596b3968d4c90d667309f08f966e6f05b1bfae36b082783009af580aa5fa44b +SIZE (mod_wsgi-2.7.tar.gz) = 99956 diff --git a/www/mod_wsgi/files/patch-configure b/www/mod_wsgi/files/patch-configure new file mode 100644 index 000000000000..e76b9b05e1d5 --- /dev/null +++ b/www/mod_wsgi/files/patch-configure @@ -0,0 +1,28 @@ +Index: configure +=================================================================== +--- configure (revision 1487) ++++ configure (working copy) +@@ -1851,16 +1851,22 @@ + fi + + CFLAGS1="" ++for arg in ${CFLAGS} ++do ++ CFLAGS1="${CFLAGS1} -Wc,$arg" ++done ++ ++CFLAGS2="" + if test -x /usr/bin/lipo; then + LDFLAGS3="" + ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'` + for ARCH in $ARCHITECTURES; do +- CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'" ++ CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'" + LDFLAGS3="${LDFLAGS3} -arch ${ARCH}" + done + fi + +-CFLAGS="${CFLAGS} ${CFLAGS1}" ++CFLAGS="${CFLAGS1} ${CFLAGS2}" + LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}" + LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}" diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile index 9b2fedde7453..3c5e4f5f00c8 100644 --- a/www/mod_wsgi3/Makefile +++ b/www/mod_wsgi3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mod_wsgi -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ http://apt.douglasthrift.net/files/${PORTNAME}/ \ @@ -17,10 +17,13 @@ COMMENT= Python WSGI adapter module for Apache MAKE_JOBS_SAFE= yes +LATEST_LINK= mod_wsgi +CONFLICTS= mod_wsgi-3.* + PROJECTHOST= modwsgi USE_APACHE= 1.3+ -USE_PYTHON= 2.3+ +USE_PYTHON= 2.5-2.6 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" diff --git a/www/mod_wsgi3/distinfo b/www/mod_wsgi3/distinfo index e84b2c736c0a..5e455dbe4eea 100644 --- a/www/mod_wsgi3/distinfo +++ b/www/mod_wsgi3/distinfo @@ -1,3 +1,3 @@ -MD5 (mod_wsgi-2.6.tar.gz) = c313cd7a662024866ce3376cb5a76cf6 -SHA256 (mod_wsgi-2.6.tar.gz) = 70ca565528bdb29d1f0903e39827288dca5bff7ffccf090957dd4ed02b51e497 -SIZE (mod_wsgi-2.6.tar.gz) = 99955 +MD5 (mod_wsgi-2.7.tar.gz) = 60f3bf145eb804286b5fbf4e730a7ed1 +SHA256 (mod_wsgi-2.7.tar.gz) = 5596b3968d4c90d667309f08f966e6f05b1bfae36b082783009af580aa5fa44b +SIZE (mod_wsgi-2.7.tar.gz) = 99956 diff --git a/www/mod_wsgi3/files/patch-configure b/www/mod_wsgi3/files/patch-configure new file mode 100644 index 000000000000..e76b9b05e1d5 --- /dev/null +++ b/www/mod_wsgi3/files/patch-configure @@ -0,0 +1,28 @@ +Index: configure +=================================================================== +--- configure (revision 1487) ++++ configure (working copy) +@@ -1851,16 +1851,22 @@ + fi + + CFLAGS1="" ++for arg in ${CFLAGS} ++do ++ CFLAGS1="${CFLAGS1} -Wc,$arg" ++done ++ ++CFLAGS2="" + if test -x /usr/bin/lipo; then + LDFLAGS3="" + ARCHITECTURES=`/usr/bin/lipo -info $HTTPD | sed -e 's/.*://'` + for ARCH in $ARCHITECTURES; do +- CFLAGS1="${CFLAGS1} -Wc,'-arch ${ARCH}'" ++ CFLAGS2="${CFLAGS2} -Wc,'-arch ${ARCH}'" + LDFLAGS3="${LDFLAGS3} -arch ${ARCH}" + done + fi + +-CFLAGS="${CFLAGS} ${CFLAGS1}" ++CFLAGS="${CFLAGS1} ${CFLAGS2}" + LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}" + LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}" |