From 188d493de995d1426b05b3f9ef211baa52852ac2 Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Wed, 27 Dec 2000 16:15:55 +0000 Subject: Update to 2.7.1 PR: 23874 Submitted by: MAINTAINER --- www/mod_python/Makefile | 7 ++++--- www/mod_python/distinfo | 2 +- www/mod_python/files/patch-Makefile.in | 8 ++++---- www/mod_python/files/patch-configure | 8 ++++---- www/mod_python/pkg-plist | 26 +++++++++++++++----------- 5 files changed, 28 insertions(+), 23 deletions(-) (limited to 'www/mod_python') diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile index 9d61b0362bf3..428c4ff78b87 100644 --- a/www/mod_python/Makefile +++ b/www/mod_python/Makefile @@ -6,10 +6,11 @@ # PORTNAME= mod_python -PORTVERSION= 2.6.3 +PORTVERSION= 2.7.1 CATEGORIES= www python MASTER_SITES= http://www.modpython.org/dist/ \ - http://www.pythonlabs.com/products/python2.0/downloads/ + http://www.python.org/ftp/python/2.0/ \ + http://www3.kr.freebsd.org/~perky/distfiles/ DISTFILES= mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE} DIST_SUBDIR= python @@ -26,7 +27,7 @@ USE_PYTHON= yes CONFIGURE_ARGS= --with-apxs=${LOCALBASE}/sbin/apxs \ --with-python=${PYTHON_WRKSRC} CONFIGURE_ENV= PYTHON_BIN=${LOCALBASE}/bin/python -PLIST_SUB+= PYTHON_LIBPATH=${PYTHON_LIBPATH:S/^${LOCALBASE}//g}lib +PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} pre-configure: cd ${PYTHON_WRKSRC} && ./configure --without-threads && cd Modules && ${MAKE} -f Makefile.pre Makefile diff --git a/www/mod_python/distinfo b/www/mod_python/distinfo index 73735c8bea60..8b78ef8a354f 100644 --- a/www/mod_python/distinfo +++ b/www/mod_python/distinfo @@ -1,2 +1,2 @@ -MD5 (python/mod_python-2.6.3.tgz) = c3c3a12a5fd6d86e9334cdf4f6a9e845 +MD5 (python/mod_python-2.7.1.tgz) = 19bb7dc023636f0d79e623971f3f4f3d MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/www/mod_python/files/patch-Makefile.in b/www/mod_python/files/patch-Makefile.in index de6da8520979..de15a6bb574c 100644 --- a/www/mod_python/files/patch-Makefile.in +++ b/www/mod_python/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed Nov 15 05:33:51 2000 -+++ Makefile.in Wed Nov 15 05:40:52 2000 -@@ -90,13 +90,10 @@ +--- 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 @@ -15,4 +15,4 @@ + @echo " ## Apache has to be restarted." @echo - + install_static: static diff --git a/www/mod_python/files/patch-configure b/www/mod_python/files/patch-configure index 67f2ce25aee9..7b8239180552 100644 --- a/www/mod_python/files/patch-configure +++ b/www/mod_python/files/patch-configure @@ -1,9 +1,9 @@ ---- configure.orig Wed Nov 15 05:33:42 2000 -+++ configure Wed Nov 15 05:33:58 2000 -@@ -1312,7 +1312,7 @@ +--- configure.orig Wed Dec 27 13:49:44 2000 ++++ configure Wed Dec 27 13:50:32 2000 +@@ -1313,7 +1313,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:1315: checking whether Python is compiled with thread support" >&5 + echo "configure:1316: 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 diff --git a/www/mod_python/pkg-plist b/www/mod_python/pkg-plist index d46dd4a28c4d..819d9143a947 100644 --- a/www/mod_python/pkg-plist +++ b/www/mod_python/pkg-plist @@ -1,12 +1,16 @@ libexec/apache/mod_python.so -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/__init__.py -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/apache.py -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/cgihandler.py -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/httpdapi.py -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/zhandler.py -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/__init__.pyc -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/apache.pyc -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/cgihandler.pyc -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/httpdapi.pyc -%%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python/zhandler.pyc -@dirrm %%PYTHON_LIBPATH%%/%%PYTHON_VERSION%%/site-packages/mod_python +%%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/apache.pyc +%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyc +%%PYTHON_SITELIBDIR%%/mod_python/httpdapi.pyc +%%PYTHON_SITELIBDIR%%/mod_python/publisher.pyc +%%PYTHON_SITELIBDIR%%/mod_python/util.pyc +%%PYTHON_SITELIBDIR%%/mod_python/zhandler.pyc +@dirrm %%PYTHON_SITELIBDIR%%/mod_python -- cgit v1.2.3