12 files changed, 72 insertions, 116 deletions

diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile
index b0b3ae8f50dd..8ab81d31000d 100644
--- a/www/mod_python/Makefile
+++ b/www/mod_python/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	mod_python
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.6
 CATEGORIES=	www python
-MASTER_SITES=	http://www.python.org/ftp/python/${PYTHON_VERSION:S/python//g}/ \
-		http://www.modpython.org/dist/ \
-		http://www3.kr.freebsd.org/~perky/distfiles/
-DISTFILES=	mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE}
+MASTER_SITES=	http://www.modpython.org/dist/ \
+		ftp://ftp.nuug.no/pub/anders/distfiles/
 DIST_SUBDIR=	python
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	perky@python.or.kr
+MAINTAINER=	anders@fix.no
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
@@ -23,19 +22,13 @@ USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
 
-PYTHON_WRKSRC=	${WRKSRC}/../Python-${PYTHON_VERSION:S/python//g}
-APXS=		${PREFIX}/sbin/apxs
+APXS?=		${LOCALBASE}/sbin/apxs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-apxs=${APXS} --with-python=${PYTHON_WRKSRC}
+CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
-.if defined(WITH_OPENPTY)
-OPTIONAL_LIBS+=	-lutil
-.endif
-
-PYTHON_CONFIGURE_ARGS+=	--without-threads
 STRIP_CMD?=	strip
 
 pre-fetch:
@@ -43,30 +36,21 @@ pre-fetch:
 	@${ECHO} "You may use the following build option:"
 	@${ECHO} ""
 	@${ECHO} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
-	@${ECHO} "  WITH_OPENPTY=yes  enables openpty function in posixmodule"
 	@${ECHO} ""
 
 pre-patch:
-.if !defined(WITH_OPENPTY)
-	cd ${PYTHON_WRKSRC} && ${PATCH} -s < ${PATCHDIR}/optpatch-WITHOUT_OPENPTY
-.endif
 .if defined(WANT_EAPI)
 	cd ${WRKSRC} && ${PATCH} -p2 -s < ${PATCHDIR}/optpatch-WANT_EAPI
 .endif
 
-pre-configure:
-	cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS}
-
 post-configure:
+	@${SH} ${PKGREQ}.threads ${PYTHON_CMD} ${PYTHON_BASE}
 .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
 
-pre-build:
-	cd ${PYTHON_WRKSRC} && ${MAKE}
-
 post-build:
 .if !defined(DONT_STRIP) && exists(${STRIP_CMD})
 	${STRIP_CMD} ${WRKSRC}/src/mod_python.so
diff --git a/www/mod_python/distinfo b/www/mod_python/distinfo
index e8cedfca40ff..5122d7820f8f 100644
--- a/www/mod_python/distinfo
+++ b/www/mod_python/distinfo
@@ -1,2 +1 @@
-MD5 (python/mod_python-2.7.3.tgz) = 06798145df78dbd8de7cbd089842264b
-MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
+MD5 (python/mod_python-2.7.6.tgz) = 68929391d20c14d820d7004458ab9f03
diff --git a/www/mod_python/files/optpatch-WITHOUT_OPENPTY b/www/mod_python/files/optpatch-WITHOUT_OPENPTY
deleted file mode 100644
index 4d64a8659f80..000000000000
--- a/www/mod_python/files/optpatch-WITHOUT_OPENPTY
+++ /dev/null
@@ -1,18 +0,0 @@
---- work/Python-2.1/configure.orig	Wed May  9 06:04:43 2001
-+++ work/Python-2.1/configure	Wed May  9 06:05:14 2001
-@@ -4293,6 +4293,7 @@
- done
- 
- 
-+if false; then
- # check for openpty and forkpty
- 
- for ac_func in openpty
-@@ -4491,6 +4492,7 @@
- fi
- done
- 
-+fi
- 
- # check for long file support functions
- for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
diff --git a/www/mod_python/files/patch-Python::setup.py b/www/mod_python/files/patch-Python::setup.py
deleted file mode 100644
index cbd821bb97b9..000000000000
--- a/www/mod_python/files/patch-Python::setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../Python-2.1/setup.py.orig	Fri Mar  2 07:24:14 2001
-+++ ../Python-2.1/setup.py	Mon Mar  5 15:26:17 2001
-@@ -14,7 +14,7 @@
- from distutils.command.build_ext import build_ext
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
- 
- def find_file(filename, std_dirs, paths):
-     """Searches for the directory where a given file is located,
diff --git a/www/mod_python/pkg-descr b/www/mod_python/pkg-descr
index 62e965e86fcc..91ea4859de0f 100644
--- a/www/mod_python/pkg-descr
+++ b/www/mod_python/pkg-descr
@@ -3,7 +3,9 @@ for a considerable boost in performance and added flexibility
 in designing web based applications.
 
 WWW: http://www.modpython.org/
-developed by Gregory Trubetskoy <grisha@ispol.com>
+developed by Gregory Trubetskoy <grisha@modpython.org> and others
 
-- Hye-Shik "Perky" Chang
-  perky@python.or.kr
+This port requires a Python installation without threads support. Build &
+(re)install Python with WITHOUT_THREADS set.
+
+- Anders Nordby <anders@fix.no>
diff --git a/www/mod_python/pkg-req.threads b/www/mod_python/pkg-req.threads
new file mode 100644
index 000000000000..d3526527fe90
--- /dev/null
+++ b/www/mod_python/pkg-req.threads
@@ -0,0 +1,22 @@
+#! /bin/sh
+# anders@fix.no, 2001-08-07
+
+mydir=`dirname $0`
+mylibc=`ldd $1 | tail +2 | awk '{print $1}' | cut -d'.' -f1 | grep ^libc`
+
+case $mylibc in
+libc_r)
+	echo "Error: Python installation in $2 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 (PREFIX $2). Good."
+	exit 0
+	;;
+*)
+	echo "Unknown libc library. Cannot use a Python installation that uses this."
+	exit 1
+	;;
+esac
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index b0b3ae8f50dd..8ab81d31000d 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	mod_python
-PORTVERSION=	2.7.3
+PORTVERSION=	2.7.6
 CATEGORIES=	www python
-MASTER_SITES=	http://www.python.org/ftp/python/${PYTHON_VERSION:S/python//g}/ \
-		http://www.modpython.org/dist/ \
-		http://www3.kr.freebsd.org/~perky/distfiles/
-DISTFILES=	mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE}
+MASTER_SITES=	http://www.modpython.org/dist/ \
+		ftp://ftp.nuug.no/pub/anders/distfiles/
 DIST_SUBDIR=	python
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	perky@python.or.kr
+MAINTAINER=	anders@fix.no
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
@@ -23,19 +22,13 @@ USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
 
-PYTHON_WRKSRC=	${WRKSRC}/../Python-${PYTHON_VERSION:S/python//g}
-APXS=		${PREFIX}/sbin/apxs
+APXS?=		${LOCALBASE}/sbin/apxs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-apxs=${APXS} --with-python=${PYTHON_WRKSRC}
+CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
-.if defined(WITH_OPENPTY)
-OPTIONAL_LIBS+=	-lutil
-.endif
-
-PYTHON_CONFIGURE_ARGS+=	--without-threads
 STRIP_CMD?=	strip
 
 pre-fetch:
@@ -43,30 +36,21 @@ pre-fetch:
 	@${ECHO} "You may use the following build option:"
 	@${ECHO} ""
 	@${ECHO} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
-	@${ECHO} "  WITH_OPENPTY=yes  enables openpty function in posixmodule"
 	@${ECHO} ""
 
 pre-patch:
-.if !defined(WITH_OPENPTY)
-	cd ${PYTHON_WRKSRC} && ${PATCH} -s < ${PATCHDIR}/optpatch-WITHOUT_OPENPTY
-.endif
 .if defined(WANT_EAPI)
 	cd ${WRKSRC} && ${PATCH} -p2 -s < ${PATCHDIR}/optpatch-WANT_EAPI
 .endif
 
-pre-configure:
-	cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS}
-
 post-configure:
+	@${SH} ${PKGREQ}.threads ${PYTHON_CMD} ${PYTHON_BASE}
 .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
 
-pre-build:
-	cd ${PYTHON_WRKSRC} && ${MAKE}
-
 post-build:
 .if !defined(DONT_STRIP) && exists(${STRIP_CMD})
 	${STRIP_CMD} ${WRKSRC}/src/mod_python.so
diff --git a/www/mod_python3/distinfo b/www/mod_python3/distinfo
index e8cedfca40ff..5122d7820f8f 100644
--- a/www/mod_python3/distinfo
+++ b/www/mod_python3/distinfo
@@ -1,2 +1 @@
-MD5 (python/mod_python-2.7.3.tgz) = 06798145df78dbd8de7cbd089842264b
-MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
+MD5 (python/mod_python-2.7.6.tgz) = 68929391d20c14d820d7004458ab9f03
diff --git a/www/mod_python3/files/optpatch-WITHOUT_OPENPTY b/www/mod_python3/files/optpatch-WITHOUT_OPENPTY
deleted file mode 100644
index 4d64a8659f80..000000000000
--- a/www/mod_python3/files/optpatch-WITHOUT_OPENPTY
+++ /dev/null
@@ -1,18 +0,0 @@
---- work/Python-2.1/configure.orig	Wed May  9 06:04:43 2001
-+++ work/Python-2.1/configure	Wed May  9 06:05:14 2001
-@@ -4293,6 +4293,7 @@
- done
- 
- 
-+if false; then
- # check for openpty and forkpty
- 
- for ac_func in openpty
-@@ -4491,6 +4492,7 @@
- fi
- done
- 
-+fi
- 
- # check for long file support functions
- for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
diff --git a/www/mod_python3/files/patch-Python::setup.py b/www/mod_python3/files/patch-Python::setup.py
deleted file mode 100644
index cbd821bb97b9..000000000000
--- a/www/mod_python3/files/patch-Python::setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../Python-2.1/setup.py.orig	Fri Mar  2 07:24:14 2001
-+++ ../Python-2.1/setup.py	Mon Mar  5 15:26:17 2001
-@@ -14,7 +14,7 @@
- from distutils.command.build_ext import build_ext
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
- 
- def find_file(filename, std_dirs, paths):
-     """Searches for the directory where a given file is located,
diff --git a/www/mod_python3/pkg-descr b/www/mod_python3/pkg-descr
index 62e965e86fcc..91ea4859de0f 100644
--- a/www/mod_python3/pkg-descr
+++ b/www/mod_python3/pkg-descr
@@ -3,7 +3,9 @@ for a considerable boost in performance and added flexibility
 in designing web based applications.
 
 WWW: http://www.modpython.org/
-developed by Gregory Trubetskoy <grisha@ispol.com>
+developed by Gregory Trubetskoy <grisha@modpython.org> and others
 
-- Hye-Shik "Perky" Chang
-  perky@python.or.kr
+This port requires a Python installation without threads support. Build &
+(re)install Python with WITHOUT_THREADS set.
+
+- Anders Nordby <anders@fix.no>
diff --git a/www/mod_python3/pkg-req.threads b/www/mod_python3/pkg-req.threads
new file mode 100644
index 000000000000..d3526527fe90
--- /dev/null
+++ b/www/mod_python3/pkg-req.threads
@@ -0,0 +1,22 @@
+#! /bin/sh
+# anders@fix.no, 2001-08-07
+
+mydir=`dirname $0`
+mylibc=`ldd $1 | tail +2 | awk '{print $1}' | cut -d'.' -f1 | grep ^libc`
+
+case $mylibc in
+libc_r)
+	echo "Error: Python installation in $2 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 (PREFIX $2). Good."
+	exit 0
+	;;
+*)
+	echo "Unknown libc library. Cannot use a Python installation that uses this."
+	exit 1
+	;;
+esac