9 files changed, 29 insertions, 120 deletions

diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index dd217311cd59..ca776a6eee61 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -1,64 +1,36 @@
 # New ports collection makefile for:	mod_python
 # Date created:				28 August 2000
-# Whom:					Hye-Shik Chang <perky@python.or.kr>
+# Whom:					Hye-Shik Chang
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mod_python
-PORTVERSION=	2.7.8
+PORTVERSION=	3.0.1
 CATEGORIES=	www python
-MASTER_SITES=	http://www.modpython.org/dist/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
-DIST_SUBDIR=	python
+MASTER_SITES=	http://www.apache.org/dist/httpd/%SUBDIR%/ \
+		http://apache.mirrorcentral.com/dist/httpd/%SUBDIR%/ \
+		http://apache.missouri.edu/dist/httpd/%SUBDIR%/ \
+		http://ftp.epix.net/apache/dist/httpd/%SUBDIR%/ \
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/%SUBDIR%/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/%SUBDIR%/
+MASTER_SITE_SUBDIR=	modpython
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	perky@FreeBSD.org
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${LOCALBASE}/include/apache2/httpd.h:${PORTSDIR}/www/apache2
 
-NO_PACKAGE=	"Requires Python without threads support"
 USE_PYTHON=	yes
 
-.include <bsd.port.pre.mk>
-
 APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-apxs=${APXS}
-CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
-PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
-
-STRIP_CMD?=	strip
-
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build option:"
-	@${ECHO} ""
-	@${ECHO} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
-	@${ECHO} ""
-
-pre-patch:
-.if defined(WANT_EAPI)
-	cd ${WRKSRC} && ${PATCH} -p2 -s < ${PATCHDIR}/optpatch-WANT_EAPI
-.endif
-
-post-configure:
-	@${SH} ${PKGREQ}.threads ${PYTHON_CMD}
-.if defined(OPTIONAL_LIBS)
-	${SED} 's/^\(LIBS=.*\)/\1 ${OPTIONAL_LIBS}/' ${WRKSRC}/src/Makefile \
-		> ${WRKSRC}/src/Makefile.tmp && \
-		${MV} -f ${WRKSRC}/src/Makefile.tmp ${WRKSRC}/src/Makefile
-.endif
-
-post-build:
-.if !defined(DONT_STRIP) && exists(${STRIP_CMD})
-	${STRIP_CMD} ${WRKSRC}/src/mod_python.so
-.endif
+CONFIGURE_ARGS+=--with-apxs="${APXS}" --with-python="${PYTHON_CMD}"
+MAKE_ENV=	EXPR_COMPAT=yes
 
 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 141270246d43..a59dddcb2814 100644
--- a/www/mod_python3/distinfo
+++ b/www/mod_python3/distinfo
@@ -1 +1 @@
-MD5 (python/mod_python-2.7.8.tgz) = 4d5bee8317bfb45a3bb09f02b435e917
+MD5 (mod_python-3.0.1.tgz) = 41e587e2347449d60ed4ea02ffbc8a14
diff --git a/www/mod_python3/files/optpatch-WANT_EAPI b/www/mod_python3/files/optpatch-WANT_EAPI
deleted file mode 100644
index c98727f2a389..000000000000
--- a/www/mod_python3/files/optpatch-WANT_EAPI
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/mod_python-2.7.3/src/Makefile.in.orig	Wed May 16 19:20:23 2001
-+++ work/mod_python-2.7.3/src/Makefile.in	Wed May 16 19:20:52 2001
-@@ -52,7 +52,7 @@
- INCLUDES=@INCLUDES@
- LIBS=@LIBS@
- LDFLAGS=@LDFLAGS@
--OPT=
-+OPT=-DEAPI
- CFLAGS=$(OPT) $(INCLUDES) 
- srcdir=.
- 
diff --git a/www/mod_python3/files/patch-Makefile.in b/www/mod_python3/files/patch-Makefile.in
deleted file mode 100644
index de15a6bb574c..000000000000
--- a/www/mod_python3/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Wed Dec 27 13:49:54 2000
-+++ Makefile.in	Wed Dec 27 13:52:28 2000
-@@ -82,13 +82,10 @@
- 	@echo
- 	@echo "Performing DSO installation."
- 	@echo
--	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+	/usr/local/sbin/apxs -i -a src/mod_python.so
- 	@$(MAKE) install_py_lib
- 	@echo
--	@echo "Now don't forget to edit your main config and add"
--	@echo "    LoadModule python_module $(LIBEXECDIR)/mod_python.so"
--	@echo "and if your configuration uses ClearModuleList, then also"
--	@echo "    AddModule mod_python.c"
-+	@echo "  ## Apache has to be restarted."
- 	@echo
- 
- install_static:	static
diff --git a/www/mod_python3/files/patch-configure b/www/mod_python3/files/patch-configure
deleted file mode 100644
index 510df67f1b04..000000000000
--- a/www/mod_python3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed May 16 19:13:31 2001
-+++ configure	Wed May 16 19:14:11 2001
-@@ -1324,7 +1324,7 @@
- # check if python is compiled with threads
- echo $ac_n "checking whether Python is compiled with thread support""... $ac_c" 1>&6
- echo "configure:1327: checking whether Python is compiled with thread support" >&5
--PyTHREADS=`$PYTHON_BIN -c "import sys; print \"thread\" in sys.builtin_module_names"`
-+PyTHREADS="0"
- if test "$PyTHREADS" = "1"; then
-   echo "$ac_t""yes" 1>&6
-   echo
diff --git a/www/mod_python3/pkg-comment b/www/mod_python3/pkg-comment
index 29297814bfad..e6b626600bd5 100644
--- a/www/mod_python3/pkg-comment
+++ b/www/mod_python3/pkg-comment
@@ -1 +1 @@
-Apache module for integrating Python
+Apache module that embeds the Python interpreter within the server
diff --git a/www/mod_python3/pkg-descr b/www/mod_python3/pkg-descr
index ddf915e4d8f5..6e3e10329de3 100644
--- a/www/mod_python3/pkg-descr
+++ b/www/mod_python3/pkg-descr
@@ -3,7 +3,3 @@ for a considerable boost in performance and added flexibility
 in designing web based applications.
 
 WWW: http://www.modpython.org/
-developed by Gregory Trubetskoy <grisha@modpython.org> and others
-
-This port requires a Python installation without threads support. Build &
-(re)install Python with WITHOUT_THREADS set.
diff --git a/www/mod_python3/pkg-plist b/www/mod_python3/pkg-plist
index 819d9143a947..021957c03aed 100644
--- a/www/mod_python3/pkg-plist
+++ b/www/mod_python3/pkg-plist
@@ -1,16 +1,19 @@
-libexec/apache/mod_python.so
+libexec/apache2/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/__init__.py
-%%PYTHON_SITELIBDIR%%/mod_python/apache.py
-%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.py
-%%PYTHON_SITELIBDIR%%/mod_python/httpdapi.py
-%%PYTHON_SITELIBDIR%%/mod_python/publisher.py
-%%PYTHON_SITELIBDIR%%/mod_python/util.py
-%%PYTHON_SITELIBDIR%%/mod_python/zhandler.py
 %%PYTHON_SITELIBDIR%%/mod_python/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/apache.py
 %%PYTHON_SITELIBDIR%%/mod_python/apache.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/apache.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.py
 %%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/httpdapi.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/publisher.py
 %%PYTHON_SITELIBDIR%%/mod_python/publisher.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/publisher.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/util.py
 %%PYTHON_SITELIBDIR%%/mod_python/util.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/zhandler.pyc
+%%PYTHON_SITELIBDIR%%/mod_python/util.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/mod_python
diff --git a/www/mod_python3/pkg-req.threads b/www/mod_python3/pkg-req.threads
deleted file mode 100644
index 5328a30cedb5..000000000000
--- a/www/mod_python3/pkg-req.threads
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-# anders@fix.no, 2001-08-07
-
-pydir=`dirname $1 | sed "s/\/bin//"`
-mylibc=`ldd $1 | tail +2 | awk '{print $1}' | cut -d'.' -f1 | grep ^libc`
-
-case $mylibc in
-libc_r)
-	echo "Error: Python installation in $pydir uses threads. mod_python requires"
-	echo "it to be built without threads. Please deinstall & rebuild/reinstall Python with"
-	echo "WITHOUT_THREADS set."
-	exit 1
-	;;
-libc)
-	echo "Using a no-threads Python installation (in $pydir). Good."
-	exit 0
-	;;
-*)
-	echo "Unknown libc library. Cannot use a Python installation that uses this."
-	exit 1
-	;;
-esac