From anders@totem.fix.no  Sun Oct 14 17:54:05 2001
Return-Path: <anders@totem.fix.no>
Received: from totem.fix.no (totem.fix.no [213.142.66.130])
	by hub.freebsd.org (Postfix) with ESMTP id 5E6FB37B406
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Oct 2001 17:54:05 -0700 (PDT)
Received: by totem.fix.no (Postfix, from userid 1000)
	id 142C23D3A; Mon, 15 Oct 2001 02:54:03 +0200 (CEST)
Message-Id: <20011015005403.142C23D3A@totem.fix.no>
Date: Mon, 15 Oct 2001 02:54:03 +0200 (CEST)
From: Anders Nordby <anders@fix.no>
Reply-To: Anders Nordby <anders@fix.no>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: www/mod_python
X-Send-Pr-Version: 3.2

>Number:         31273
>Category:       ports
>Synopsis:       Update port: www/mod_python
>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:   Sun Oct 14 18:00:01 PDT 2001
>Closed-Date:    Tue Nov 6 06:24:31 PST 2001
>Last-Modified:  Tue Nov 06 06:25:00 PST 2001
>Originator:     Anders Nordby
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:

	<Relevant environment information (multiple lines)>

>Description:

Remove self from pkg-descr.
Fix pkg-req script.
Set NO_PACKAGE, as this port requires Python without threads support.

>How-To-Repeat:

	<Code/input/activities to reproduce the problem (multiple lines)>

>Fix:

diff -Nur mod_python.orig/Makefile mod_python/Makefile
--- mod_python.orig/Makefile	Sat Oct 13 14:15:57 2001
+++ mod_python/Makefile	Sun Oct 14 22:31:32 2001
@@ -18,6 +18,7 @@
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
+NO_PACKAGE=	"Requires Python without threads support"
 USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
@@ -44,7 +45,7 @@
 .endif
 
 post-configure:
-	@${SH} ${PKGREQ}.threads ${PYTHON_CMD} ${PYTHON_BASE}
+	@${SH} ${PKGREQ}.threads ${PYTHON_CMD}
 .if defined(OPTIONAL_LIBS)
 	${SED} 's/^\(LIBS=.*\)/\1 ${OPTIONAL_LIBS}/' ${WRKSRC}/src/Makefile \
 		> ${WRKSRC}/src/Makefile.tmp && \
diff -Nur mod_python.orig/pkg-descr mod_python/pkg-descr
--- mod_python.orig/pkg-descr	Thu Aug 16 11:31:29 2001
+++ mod_python/pkg-descr	Sun Oct 14 21:14:32 2001
@@ -7,5 +7,3 @@
 
 This port requires a Python installation without threads support. Build &
 (re)install Python with WITHOUT_THREADS set.
-
-- Anders Nordby <anders@fix.no>
diff -Nur mod_python.orig/pkg-req.threads mod_python/pkg-req.threads
--- mod_python.orig/pkg-req.threads	Thu Aug 16 11:31:29 2001
+++ mod_python/pkg-req.threads	Sun Oct 14 21:15:13 2001
@@ -1,18 +1,18 @@
 #! /bin/sh
 # anders@fix.no, 2001-08-07
 
-mydir=`dirname $0`
+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 $2 uses threads. mod_python requires"
+	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 (PREFIX $2). Good."
+	echo "Using a no-threads Python installation (in $pydir). Good."
 	exit 0
 	;;
 *)
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: petef 
State-Changed-When: Tue Nov 6 06:24:31 PST 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31273 
>Unformatted:
