| 1 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/Makefile mod_wsgi3/Makefile |
| 2 |
--- /usr/ports/www/mod_wsgi3/Makefile 2013-09-20 16:36:50.000000000 -0700 |
| 3 |
+++ mod_wsgi3/Makefile 2013-10-28 11:19:42.000000000 -0700 |
| 4 |
@@ -2,7 +2,7 @@ |
| 5 |
|
| 6 |
PORTNAME= mod_wsgi |
| 7 |
PORTVERSION= 3.4 |
| 8 |
-PORTREVISION= 1 |
| 9 |
+PORTREVISION= 2 |
| 10 |
CATEGORIES= www python |
| 11 |
MASTER_SITES= GOOGLE_CODE |
| 12 |
PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} |
| 13 |
@@ -25,7 +25,6 @@ |
| 14 |
|
| 15 |
SUB_FILES= pkg-message |
| 16 |
|
| 17 |
-NO_STAGE= yes |
| 18 |
.include <bsd.port.pre.mk> |
| 19 |
|
| 20 |
.if ${PYTHON_REL} >= 300 && ${PYTHON_REL} < 310 |
| 21 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-configure mod_wsgi3/files/patch-configure |
| 22 |
--- /usr/ports/www/mod_wsgi3/files/patch-configure 1969-12-31 16:00:00.000000000 -0800 |
| 23 |
+++ mod_wsgi3/files/patch-configure 2013-10-28 11:17:45.644919745 -0700 |
| 24 |
@@ -0,0 +1,49 @@ |
| 25 |
+--- configure.orig Thu Oct 18 21:12:46 2012 +1100 |
| 26 |
++++ configure Thu Oct 18 21:14:28 2012 +1100 |
| 27 |
+@@ -1785,7 +1785,15 @@ |
| 28 |
+ |
| 29 |
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ |
| 30 |
+ from distutils import sysconfig; \ |
| 31 |
+- stdout.write((sysconfig.get_config_var("VERSION")))'` |
| 32 |
++ stdout.write(sysconfig.get_config_var("VERSION"))'` |
| 33 |
++ |
| 34 |
++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ |
| 35 |
++ from distutils import sysconfig; \ |
| 36 |
++ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` |
| 37 |
++ |
| 38 |
++if test x"${PYTHON_LDVERSION}" = x""; then |
| 39 |
++ PYTHON_LDVERSION=${PYTHON_VERSION} |
| 40 |
++fi |
| 41 |
+ |
| 42 |
+ CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ |
| 43 |
+ from distutils import sysconfig; \ |
| 44 |
+@@ -1823,12 +1831,28 @@ |
| 45 |
+ from distutils import sysconfig; \ |
| 46 |
+ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` |
| 47 |
+ |
| 48 |
++if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then |
| 49 |
++ PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" |
| 50 |
++fi |
| 51 |
++ |
| 52 |
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ |
| 53 |
+ "${ENABLE_FRAMEWORK}" != "yes"; then |
| 54 |
+ LDFLAGS1="-L${PYTHONLIBDIR}" |
| 55 |
+ LDFLAGS2="-L${PYTHONCFGDIR}" |
| 56 |
+ |
| 57 |
+- LDLIBS1="-lpython${PYTHON_VERSION}" |
| 58 |
++ LDLIBS1="-lpython${PYTHON_LDVERSION}" |
| 59 |
++ |
| 60 |
++ # MacOS X seems to be broken and doesn't use ABIFLAGS suffix |
| 61 |
++ # so add a check to try and work out what we need to do. |
| 62 |
++ |
| 63 |
++ if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then |
| 64 |
++ LDLIBS1="-lpython${PYTHON_VERSION}" |
| 65 |
++ fi |
| 66 |
++ |
| 67 |
++ if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then |
| 68 |
++ LDLIBS1="-lpython${PYTHON_VERSION}" |
| 69 |
++ fi |
| 70 |
++ |
| 71 |
+ LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ |
| 72 |
+ from distutils import sysconfig; \ |
| 73 |
+ stdout.write(sysconfig.get_config_var("LIBS"))'` |
| 74 |
diff -Nrux .svn -x work /usr/ports/www/mod_wsgi3/files/patch-configure.ac mod_wsgi3/files/patch-configure.ac |
| 75 |
--- /usr/ports/www/mod_wsgi3/files/patch-configure.ac 1969-12-31 16:00:00.000000000 -0800 |
| 76 |
+++ mod_wsgi3/files/patch-configure.ac 2013-10-28 11:17:45.654936940 -0700 |
| 77 |
@@ -0,0 +1,50 @@ |
| 78 |
+--- configure.ac.orig Thu Oct 18 21:12:46 2012 +1100 |
| 79 |
++++ configure.ac Thu Oct 18 21:14:28 2012 +1100 |
| 80 |
+@@ -75,7 +75,15 @@ |
| 81 |
+ |
| 82 |
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \ |
| 83 |
+ from distutils import sysconfig; \ |
| 84 |
+- stdout.write((sysconfig.get_config_var("VERSION")))'` |
| 85 |
++ stdout.write(sysconfig.get_config_var("VERSION"))'` |
| 86 |
++ |
| 87 |
++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \ |
| 88 |
++ from distutils import sysconfig; \ |
| 89 |
++ stdout.write(sysconfig.get_config_var("LDVERSION") or "")'` |
| 90 |
++ |
| 91 |
++if test x"${PYTHON_LDVERSION}" = x""; then |
| 92 |
++ PYTHON_LDVERSION=${PYTHON_VERSION} |
| 93 |
++fi |
| 94 |
+ |
| 95 |
+ CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \ |
| 96 |
+ from distutils import sysconfig; \ |
| 97 |
+@@ -113,12 +121,28 @@ |
| 98 |
+ from distutils import sysconfig; \ |
| 99 |
+ stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'` |
| 100 |
+ |
| 101 |
++if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then |
| 102 |
++ PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}" |
| 103 |
++fi |
| 104 |
++ |
| 105 |
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \ |
| 106 |
+ "${ENABLE_FRAMEWORK}" != "yes"; then |
| 107 |
+ LDFLAGS1="-L${PYTHONLIBDIR}" |
| 108 |
+ LDFLAGS2="-L${PYTHONCFGDIR}" |
| 109 |
+ |
| 110 |
+- LDLIBS1="-lpython${PYTHON_VERSION}" |
| 111 |
++ LDLIBS1="-lpython${PYTHON_LDVERSION}" |
| 112 |
++ |
| 113 |
++ # MacOS X seems to be broken and doesn't use ABIFLAGS suffix |
| 114 |
++ # so add a check to try and work out what we need to do. |
| 115 |
++ |
| 116 |
++ if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then |
| 117 |
++ LDLIBS1="-lpython${PYTHON_VERSION}" |
| 118 |
++ fi |
| 119 |
++ |
| 120 |
++ if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then |
| 121 |
++ LDLIBS1="-lpython${PYTHON_VERSION}" |
| 122 |
++ fi |
| 123 |
++ |
| 124 |
+ LDLIBS2=`${PYTHON} -c 'from sys import stdout; \ |
| 125 |
+ from distutils import sysconfig; \ |
| 126 |
+ stdout.write(sysconfig.get_config_var("LIBS"))'` |
| 127 |
+ |
