ports/63960: [patch]: make www/mod_python honor LOCALBASE instead of hard-coding /usr/local

[Josh Elsasser]

>Number:         63960
>Category:       ports
>Synopsis:       [patch]: make www/mod_python honor LOCALBASE instead of hard-coding /usr/local
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 08 19:40:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Josh Elsasser
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 5.2-CURRENT #11: Sat Feb  7 15:09:05 EST 2004
    joshe at jade.elsasser.org:/usr/local/obj/usr/src/sys/JADE



>Description:


patch-Makefile.in hard-coded /usr/local/sbin/apxs instead of using APXS, which is ${LOCALBASE}/sbin/apxs by default.
Also, update the check for a threaded python to know about freebsd-5's threading libraries.
Take maintainerhsip as well.


>How-To-Repeat:





>Fix:


--- mod_python.diff begins here ---
diff -u -rN mod_python.old/Makefile mod_python/Makefile
--- mod_python.old/Makefile	Sat Nov  8 05:11:39 2003
+++ mod_python/Makefile	Mon Mar  8 12:17:56 2004
@@ -13,7 +13,7 @@
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	python
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	jre at vineyard.net
 COMMENT=	Apache module for integrating Python
 
 USE_APACHE=	yes
@@ -25,6 +25,7 @@
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
+MAKE_ENV=	PORTS_APXS=${APXS}
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 STRIP_CMD?=	strip
diff -u -rN mod_python.old/files/patch-Makefile.in mod_python/files/patch-Makefile.in
--- mod_python.old/files/patch-Makefile.in	Mon Jan 15 02:43:43 2001
+++ mod_python/files/patch-Makefile.in	Mon Mar  8 11:33:34 2004
@@ -5,7 +5,7 @@
  	@echo "Performing DSO installation."
  	@echo
 -	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
-+	/usr/local/sbin/apxs -i -a src/mod_python.so
++	$(PORTS_APXS) -i -a src/mod_python.so
  	@$(MAKE) install_py_lib
  	@echo
 -	@echo "Now don't forget to edit your main config and add"
diff -u -rN mod_python.old/pkg-req.threads mod_python/pkg-req.threads
--- mod_python.old/pkg-req.threads	Tue Aug  5 05:11:38 2003
+++ mod_python/pkg-req.threads	Mon Mar  8 22:23:59 2004
@@ -2,7 +2,7 @@
 # anders at fix.no, 2001-08-07
 
 pydir=`dirname $1 | sed "s/\/bin//"`
-if [ "`ldd $1|grep libc_r`" ]; then
+if [ "`ldd $1|egrep 'libc_r|libkse|libthr|libpthread'`" ]; then
 	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."
--- mod_python.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: