From nobody@FreeBSD.org  Tue Dec 26 21:23:31 2000
Return-Path: <nobody@FreeBSD.org>
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 7738337B400
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 26 Dec 2000 21:23:30 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id eBR5NUV08626;
	Tue, 26 Dec 2000 21:23:30 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200012270523.eBR5NUV08626@freefall.freebsd.org>
Date: Tue, 26 Dec 2000 21:23:30 -0800 (PST)
From: perky@python.or.kr
Sender: nobody@FreeBSD.org
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update Port: www/mod_python (by maintainer)
X-Send-Pr-Version: www-1.0

>Number:         23874
>Category:       ports
>Synopsis:       Update Port: www/mod_python (by maintainer)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 26 21:30:01 PST 2000
>Closed-Date:    Wed Dec 27 08:16:01 PST 2000
>Last-Modified:  Wed Dec 27 08:16:14 PST 2000
>Originator:     Chang, Hye-Shik
>Release:        FreeBSD 4.2
>Organization:
Yonsei University
>Environment:
FreeBSD sbtm.yonsei.ac.kr 4.2-STABLE FreeBSD 4.2-STABLE #0: Mon Dec 25 17:16:07 KST 2000     root@sbtm.yonsei.ac.kr:/usr/src/sys/compile/ARA  i386
>Description:
- program was upgraded on 18 Dec
- port was cleaned up slightly
- dist. site added

>How-To-Repeat:

>Fix:
diff -ruN mod_python.orig/Makefile mod_python/Makefile
--- mod_python.orig/Makefile	Wed Dec 27 14:12:43 2000
+++ mod_python/Makefile	Wed Dec 27 14:09:13 2000
@@ -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 @@
 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 -ruN mod_python.orig/distinfo mod_python/distinfo
--- mod_python.orig/distinfo	Wed Dec 27 14:12:43 2000
+++ mod_python/distinfo	Wed Dec 27 13:44:21 2000
@@ -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 -ruN mod_python.orig/files/patch-Makefile.in mod_python/files/patch-Makefile.in
--- mod_python.orig/files/patch-Makefile.in	Wed Dec 27 14:12:43 2000
+++ mod_python/files/patch-Makefile.in	Wed Dec 27 13:53:59 2000
@@ -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 -ruN mod_python.orig/files/patch-configure mod_python/files/patch-configure
--- mod_python.orig/files/patch-configure	Wed Dec 27 14:12:43 2000
+++ mod_python/files/patch-configure	Wed Dec 27 13:53:37 2000
@@ -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 -ruN mod_python.orig/pkg-plist mod_python/pkg-plist
--- mod_python.orig/pkg-plist	Wed Dec 27 14:12:43 2000
+++ mod_python/pkg-plist	Wed Dec 27 13:59:10 2000
@@ -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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: kevlo 
State-Changed-When: Wed Dec 27 08:16:01 PST 2000 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=23874 
>Unformatted:
