- svn mv www/mod_wsgi www/mod_wsgi2 [1]

- update ports to reflect new location
- fix mod_wsgi3 build with python3

PR:		184065 [1]
PR		183353 [2]
Submitted by:	Douglas William Thrift <douglas@douglasthrift.net> (maintainer)

10 files changed, 105 insertions, 5 deletions

diff --git a/www/Makefile b/www/Makefile
index 88a2e907ee39..3c4f1485cc7a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -535,7 +535,7 @@
     SUBDIR += mod_vhs
     SUBDIR += mod_webkit
     SUBDIR += mod_whatkilledus
-    SUBDIR += mod_wsgi
+    SUBDIR += mod_wsgi2
     SUBDIR += mod_wsgi3
     SUBDIR += mod_xml2enc
     SUBDIR += mod_xmlns
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 72044046bb2f..cb1c808abf42 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	linkchecker
 PORTVERSION=	8.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	GHC
 DISTNAME=	LinkChecker-${PORTVERSION}
@@ -86,7 +87,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:${PORTSDIR}/www/py-cssutils
 
 # To run the WSGI Web interface
 .if ${PORT_OPTIONS:MWSGI}
-RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsg>0:${PORTSDIR}/www/mod_wsgi
+RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_wsg>0:${PORTSDIR}/www/mod_wsgi2
 USE_APACHE_RUN=	22
 .endif
 
diff --git a/www/mod_wsgi/Makefile b/www/mod_wsgi2/Makefile
index db7fb2462980..2365dd0c21ec 100644
--- a/www/mod_wsgi/Makefile
+++ b/www/mod_wsgi2/Makefile
@@ -7,14 +7,13 @@ PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Python WSGI adapter module for Apache
 
 LICENSE=	AL2
 
-
-LATEST_LINK=	mod_wsgi2
 CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-3.* ${PKGNAMEPREFIX}mod_wsgi3.* mod_wsgi-3.*
 
 PROJECTHOST=	modwsgi
diff --git a/www/mod_wsgi/distinfo b/www/mod_wsgi2/distinfo
index 9ba00856ed60..9ba00856ed60 100644
--- a/www/mod_wsgi/distinfo
+++ b/www/mod_wsgi2/distinfo
diff --git a/www/mod_wsgi/files/pkg-message.in b/www/mod_wsgi2/files/pkg-message.in
index 5c72392ba9d4..5c72392ba9d4 100644
--- a/www/mod_wsgi/files/pkg-message.in
+++ b/www/mod_wsgi2/files/pkg-message.in
diff --git a/www/mod_wsgi/pkg-descr b/www/mod_wsgi2/pkg-descr
index 626edd10ab45..626edd10ab45 100644
--- a/www/mod_wsgi/pkg-descr
+++ b/www/mod_wsgi2/pkg-descr
diff --git a/www/mod_wsgi/pkg-plist b/www/mod_wsgi2/pkg-plist
index 45d83308c5b6..45d83308c5b6 100644
--- a/www/mod_wsgi/pkg-plist
+++ b/www/mod_wsgi2/pkg-plist
diff --git a/www/mod_wsgi3/Makefile b/www/mod_wsgi3/Makefile
index 1fcaa5907d23..3361a2bf0f5b 100644
--- a/www/mod_wsgi3/Makefile
+++ b/www/mod_wsgi3/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Python WSGI adapter module for Apache
 
 LICENSE=	AL2
 
-CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
+CONFLICTS=	${PKGNAMEPREFIX}mod_wsgi2.* mod_wsgi2.* \
+		${PKGNAMEPREFIX}mod_wsgi-2.* mod_wsgi-2.*
 
 PROJECTHOST=	modwsgi
 
diff --git a/www/mod_wsgi3/files/patch-configure b/www/mod_wsgi3/files/patch-configure
new file mode 100644
index 000000000000..f2724bd46005
--- /dev/null
+++ b/www/mod_wsgi3/files/patch-configure
@@ -0,0 +1,49 @@
+--- configure.orig	Thu Oct 18 21:12:46 2012 +1100
++++ configure		Thu Oct 18 21:14:28 2012 +1100
+@@ -1785,7 +1785,15 @@
+ 
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+-    stdout.write((sysconfig.get_config_var("VERSION")))'`
++    stdout.write(sysconfig.get_config_var("VERSION"))'`
++
++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
++    from distutils import sysconfig; \
++    stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
++
++if test x"${PYTHON_LDVERSION}" = x""; then
++    PYTHON_LDVERSION=${PYTHON_VERSION}
++fi
+ 
+ CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+@@ -1823,12 +1831,28 @@
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
+ 
++if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
++    PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
++fi
++
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+         "${ENABLE_FRAMEWORK}" != "yes"; then
+     LDFLAGS1="-L${PYTHONLIBDIR}"
+     LDFLAGS2="-L${PYTHONCFGDIR}"
+ 
+-    LDLIBS1="-lpython${PYTHON_VERSION}"
++    LDLIBS1="-lpython${PYTHON_LDVERSION}"
++
++    # MacOS X seems to be broken and doesn't use ABIFLAGS suffix
++    # so add a check to try and work out what we need to do.
++
++    if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then
++        LDLIBS1="-lpython${PYTHON_VERSION}"
++    fi
++
++    if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
++        LDLIBS1="-lpython${PYTHON_VERSION}"
++    fi
++
+     LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
+         from distutils import sysconfig; \
+         stdout.write(sysconfig.get_config_var("LIBS"))'`
diff --git a/www/mod_wsgi3/files/patch-configure.ac b/www/mod_wsgi3/files/patch-configure.ac
new file mode 100644
index 000000000000..ce7dfddea333
--- /dev/null
+++ b/www/mod_wsgi3/files/patch-configure.ac
@@ -0,0 +1,50 @@
+--- configure.ac.orig	Thu Oct 18 21:12:46 2012 +1100
++++ configure.ac	Thu Oct 18 21:14:28 2012 +1100
+@@ -75,7 +75,15 @@
+ 
+ PYTHON_VERSION=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+-    stdout.write((sysconfig.get_config_var("VERSION")))'`
++    stdout.write(sysconfig.get_config_var("VERSION"))'`
++
++PYTHON_LDVERSION=`${PYTHON} -c 'from sys import stdout; \
++    from distutils import sysconfig; \
++    stdout.write(sysconfig.get_config_var("LDVERSION") or "")'`
++
++if test x"${PYTHON_LDVERSION}" = x""; then
++    PYTHON_LDVERSION=${PYTHON_VERSION}
++fi
+ 
+ CPPFLAGS1=`${PYTHON} -c 'from sys import stdout; \
+     from distutils import sysconfig; \
+@@ -113,12 +121,28 @@
+     from distutils import sysconfig; \
+     stdout.write(sysconfig.get_config_var("PYTHONFRAMEWORK"))'`
+ 
++if test "${PYTHON_LDVERSION}" != "${PYTHON_VERSION}"; then
++    PYTHONCFGDIR="${PYTHONCFGDIR}-${PYTHON_LDVERSION}"
++fi
++
+ if test "${PYTHONFRAMEWORKDIR}" = "no-framework" -o \
+         "${ENABLE_FRAMEWORK}" != "yes"; then
+     LDFLAGS1="-L${PYTHONLIBDIR}"
+     LDFLAGS2="-L${PYTHONCFGDIR}"
+ 
+-    LDLIBS1="-lpython${PYTHON_VERSION}"
++    LDLIBS1="-lpython${PYTHON_LDVERSION}"
++
++    # MacOS X seems to be broken and doesn't use ABIFLAGS suffix
++    # so add a check to try and work out what we need to do.
++
++    if test -f "${PYTHONLIBDIR}/libpython${PYTHON_VERSION}.a"; then
++        LDLIBS1="-lpython${PYTHON_VERSION}"
++    fi
++
++    if test -f "${PYTHONCFGDIR}/libpython${PYTHON_VERSION}.a"; then
++        LDLIBS1="-lpython${PYTHON_VERSION}"
++    fi
++
+     LDLIBS2=`${PYTHON} -c 'from sys import stdout; \
+         from distutils import sysconfig; \
+         stdout.write(sysconfig.get_config_var("LIBS"))'`
+