- Update to 3.2.8 [1]

- Add a workaround to build on Apache 2.2 [2]

Requested by:	Tim Diggins <tim@soda.co.uk> [1]
Submitted by:	Peter Czanik <pczanik@fang.fa.gau.hu> [2]

4 files changed, 31 insertions, 15 deletions

diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index afdec29ccf39..b366fcd0cf02 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mod_python
-PORTVERSION=	3.1.4
-PORTREVISION=	1
+PORTVERSION=	3.2.8
 CATEGORIES=	www python
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 MASTER_SITE_SUBDIR=	modpython
@@ -16,22 +15,17 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Apache module that embeds the Python interpreter within the server
 
-WITH_APACHE2=	yes
-USE_APACHE=	yes
+USE_APACHE=	2.0+
 USE_PYTHON=	2.3+
 
 LATEST_LINK=	mod_python3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
+CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}" \
+		--without-flex
 MAKE_ENV=	EXPR_COMPAT=yes
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${REINPLACE_CMD} -e 's,LONG_LONG,long long,g' ${WRKSRC}/src/requestobject.c
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_python3/distinfo b/www/mod_python3/distinfo
index 92395ede0610..4128b06a0332 100644
--- a/www/mod_python3/distinfo
+++ b/www/mod_python3/distinfo
@@ -1,3 +1,3 @@
-MD5 (mod_python-3.1.4.tgz) = 607175958137b06bcda91110414c82a1
-SHA256 (mod_python-3.1.4.tgz) = f8e1925a0ade1adf4b5528e892eb347b013100d6c30b0e43209143b427c976a5
-SIZE (mod_python-3.1.4.tgz) = 308510
+MD5 (mod_python-3.2.8.tgz) = d03452979a6a334f73cc2b95b39db331
+SHA256 (mod_python-3.2.8.tgz) = 414c0a8b149381f9f1c2e3f045269f64fcd96beab12a6720dfedf34154095813
+SIZE (mod_python-3.2.8.tgz) = 353131
diff --git a/www/mod_python3/files/patch-src_include_mod_python.h.in b/www/mod_python3/files/patch-src_include_mod_python.h.in
new file mode 100644
index 000000000000..68d2d97fceaa
--- /dev/null
+++ b/www/mod_python3/files/patch-src_include_mod_python.h.in
@@ -0,0 +1,13 @@
+--- src/include/mod_python.h.in.orig	Fri Mar 24 20:30:57 2006
++++ src/include/mod_python.h.in	Fri Mar 24 20:31:35 2006
+@@ -117,6 +117,10 @@
+ #define LONG_LONG PY_LONG_LONG
+ #endif
+ 
++#ifndef APR_STATUS_IS_SUCCESS
++#define APR_STATUS_IS_SUCCESS(s) ((s) == APR_SUCCESS )
++#endif
++
+ /* structure to hold interpreter data */
+ typedef struct {
+     PyInterpreterState *istate;
diff --git a/www/mod_python3/pkg-plist b/www/mod_python3/pkg-plist
index 63f42994e49d..fa8e3c7b8890 100644
--- a/www/mod_python3/pkg-plist
+++ b/www/mod_python3/pkg-plist
@@ -1,4 +1,4 @@
-libexec/apache2/mod_python.so
+%%APACHEMODDIR%%/mod_python.so
 @exec %D/sbin/apxs -e -a -n python %f
 @unexec %D/sbin/apxs -e -A -n python %f
 %%PYTHON_SITELIBDIR%%/mod_python/Cookie.py
@@ -14,6 +14,9 @@ libexec/apache2/mod_python.so
 %%PYTHON_SITELIBDIR%%/mod_python/apache.py
 %%PYTHON_SITELIBDIR%%/mod_python/apache.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/apache.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/cache.py
+%%PYTHON_SITELIBDIR%%/mod_python/cache.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/cache.pyo
 %%PYTHON_SITELIBDIR%%/mod_python/cgihandler.py
 %%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyo
@@ -23,6 +26,12 @@ libexec/apache2/mod_python.so
 %%PYTHON_SITELIBDIR%%/mod_python/publisher.py
 %%PYTHON_SITELIBDIR%%/mod_python/publisher.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/publisher.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/python22.py
+%%PYTHON_SITELIBDIR%%/mod_python/python22.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/python22.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/testhandler.py
+%%PYTHON_SITELIBDIR%%/mod_python/testhandler.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/testhandler.pyo
 %%PYTHON_SITELIBDIR%%/mod_python/util.py
 %%PYTHON_SITELIBDIR%%/mod_python/util.pyc
 %%PYTHON_SITELIBDIR%%/mod_python/util.pyo