Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Nov 2000 13:40:39 -0800 (PST)
From:      perky@python.or.kr
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/22850: Update port: www/mod_python (by maintainer)
Message-ID:  <20001114214039.02E4937B479@hub.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         22850
>Category:       ports
>Synopsis:       Update port: www/mod_python (by maintainer)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 14 13:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Chang, Hye-Shik
>Release:        FreeBSD 4.2-BETA (from 4.0-REL)
>Organization:
Yonsei University
>Environment:
FreeBSD sbtm.yonsei.ac.kr 4.2-BETA FreeBSD 4.2-BETA #0: Thu Nov  2 14:25:44 KST 2000     root@sbtm.yonsei.ac.kr:/usr/src/sys/compile/ARA  i386
>Description:
Upgraded to 2.6.3 (from 2.6) and slightly cleaned up
thanx to Anders Nordby <anders@fix.no> for advices.
and messages was changed to his.

>How-To-Repeat:

>Fix:
diff -uNr mod_python_orig/Makefile mod_python/Makefile
--- mod_python_orig/Makefile	Tue Nov 14 20:55:16 2000
+++ mod_python/Makefile	Wed Nov 15 06:09:13 2000
@@ -1,57 +1,40 @@
 # New ports collection makefile for:	mod_python
 # Date created:				28 August 2000
-# Whom:					Hye-Shik Chang <perky@freebsd-kr.org>
+# Whom:					Hye-Shik Chang <perky@python.or.kr>
 #
 # $FreeBSD: ports/www/mod_python/Makefile,v 1.2 2000/11/08 22:49:53 steve Exp $
 #
 
 PORTNAME=	mod_python
-PORTVERSION=	2.6
+PORTVERSION= 	2.6.3
 CATEGORIES=	www python
-MASTER_SITES=	ftp://freebsd-kr.org/pub/FreeBSD/ \
-		http://www.modpython.org/dist/ \
-		ftp://ftp.python.org/pub/python/src/ \
-		ftp://ftp.cdrom.com/pub/python/www.python.org/ftp/python/src/ \
-		http://sunsite.org.uk/Mirrors/ftp.python.org/pub/www.python.org/ftp/python/src/
+MASTER_SITES=	http://www.modpython.org/dist/ \
+		http://www.pythonlabs.com/products/python2.0/downloads/
 DISTFILES=      mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE}
+DIST_SUBDIR=	python
 
-MAINTAINER=	perky@freebsd-kr.org
+MAINTAINER=	perky@python.or.kr
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 \
-		${LOCALBASE}/bin/${PYTHON_VERSION}:${PORTSDIR}/lang/python15
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
-APXS=			${PREFIX}/sbin/apxs
-PYTHON_VERSION=		python1.5
-PYTHON_NO_DEPENDS=	yes
-
-.if exists(${APXS})
-AP_LIBEXEC!=    ${APXS} -q LIBEXEC
-.else
-AP_LIBEXEC=     ${PREFIX}/libexec/apache
-.endif
-
-COMPILEALL=	${PYTHON_LIBDIR}/compileall.py
-
-PLIST_SUB+=	AP_LIBEXEC=${AP_LIBEXEC:S/^${PREFIX}\///} \
-		PYTHON_SITELIBDIR="${PYTHON_SITELIBDIR:S/^${PREFIX}\///}"
-
-do-build:
-	@${ECHO} "=> Building lib${PYTHON_VERSION}.a for mod_python ..."
-	cd ${PYTHON_WRKSRC} && ./configure && ${MAKE} lib${PYTHON_VERSION}.a
-	@${ECHO} "=> Building mod_python.so ..."
-	cd ${WRKSRC}/src;${APXS} -I../../Python-1.5.2/Include -I../../Python-1.5.2 -I${WRKSRC}/src/include -c mod_python.c -lm ../../Python-1.5.2/lib${PYTHON_VERSION}.a
-	${PYTHON_CMD} ${COMPILEALL} ${WRKSRC}/lib/python/mod_python
-
-do-install:
-	cd ${WRKSRC}/src;${APXS} -i -a mod_python.so
-	${MKDIR} ${PYTHON_SITELIBDIR}/mod_python
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/python/mod_python/* ${PYTHON_SITELIBDIR}/mod_python
+PYTHON_WRKSRC=	${WRKSRC}/../Python-${PYTHON_VERSION:S/python//g}
+APXS=		${PREFIX}/sbin/apxs
+
+GNU_CONFIGURE=	yes
+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
+
+pre-configure:
+	cd ${PYTHON_WRKSRC} && ./configure --without-threads && cd Modules && ${MAKE} -f Makefile.pre Makefile
+
+pre-build:
+	cd ${PYTHON_WRKSRC} && ${MAKE}
 
 post-install:
-	@${ECHO_MSG} "======================================================="
-	@${ECHO_MSG} "  mod_python was installed successfully."
-	@${ECHO_MSG} "  please read the manual at http://www.modpython.org"
-	@${ECHO_MSG} "======================================================="
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff -uNr mod_python_orig/distinfo mod_python/distinfo
--- mod_python_orig/distinfo	Sat Oct 28 10:20:02 2000
+++ mod_python/distinfo	Wed Nov 15 03:02:23 2000
@@ -1,2 +1,2 @@
-MD5 (mod_python-2.6.tgz) = a71a014662a02648f4c2970814b296fd
-MD5 (py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
+MD5 (python/mod_python-2.6.3.tgz) = c3c3a12a5fd6d86e9334cdf4f6a9e845
+MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
diff -uNr mod_python_orig/files/patch-Makefile.in mod_python/files/patch-Makefile.in
--- mod_python_orig/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
+++ mod_python/files/patch-Makefile.in	Wed Nov 15 05:46:59 2000
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Wed Nov 15 05:33:51 2000
++++ Makefile.in	Wed Nov 15 05:40:52 2000
+@@ -90,13 +90,10 @@
+ 	@echo
+ 	@echo "Performing DSO installation."
+ 	@echo
+-	$(INSTALL) src/mod_python.so $(LIBEXECDIR)
++	/usr/local/sbin/apxs -i -a src/mod_python.so
+ 	@$(MAKE) install_py_lib
+ 	@echo
+-	@echo "Now don't forget to edit your main config and add"
+-	@echo "    LoadModule python_module $(LIBEXECDIR)/mod_python.so"
+-	@echo "and if your configuration uses ClearModuleList, then also"
+-	@echo "    AddModule mod_python.c"
++	@echo "  ## Apache has to be restarted."
+ 	@echo
+ 
+ 
diff -uNr mod_python_orig/files/patch-configure mod_python/files/patch-configure
--- mod_python_orig/files/patch-configure	Thu Jan  1 09:00:00 1970
+++ mod_python/files/patch-configure	Wed Nov 15 05:47:30 2000
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Nov 15 05:33:42 2000
++++ configure	Wed Nov 15 05:33:58 2000
+@@ -1312,7 +1312,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
+-PyTHREADS=`$PYTHON_BIN -c "import sys; print \"thread\" in sys.builtin_module_names"`
++PyTHREADS="0"
+ if test "$PyTHREADS" = "1"; then
+   echo "$ac_t""yes" 1>&6
+   echo
diff -uNr mod_python_orig/pkg-descr mod_python/pkg-descr
--- mod_python_orig/pkg-descr	Sat Oct 28 10:20:02 2000
+++ mod_python/pkg-descr	Wed Nov 15 05:54:46 2000
@@ -6,4 +6,4 @@
 developed by Gregory Trubetskoy <grisha@ispol.com>
 
 - Hye-Shik "Perky" Chang
-perky@freebsd-kr.org
+  perky@python.or.kr
diff -uNr mod_python_orig/pkg-message mod_python/pkg-message
--- mod_python_orig/pkg-message	Thu Jan  1 09:00:00 1970
+++ mod_python/pkg-message	Wed Nov 15 06:26:56 2000
@@ -0,0 +1,15 @@
+================================================================================
+
+Also remember to add to your Apache configuration in the appropriate context:
+
+PythonPath "['/path/to/foo', '/path/to/bar']"
+AddHandler python-program .py
+PythonHandler foobar
+PythonDebug On
+
+Where PythonPath includes the paths to at least the Python libdir, its
+site-packages dir, and to the dir where your Python programs are. Also consider
+including the dir to mod_python if your Python distribution is installed in a
+non-standard location. For more information, see http://www.modpython.org/.
+
+================================================================================
diff -uNr mod_python_orig/pkg-plist mod_python/pkg-plist
--- mod_python_orig/pkg-plist	Sat Oct 28 10:20:02 2000
+++ mod_python/pkg-plist	Wed Nov  1 01:49:06 2000
@@ -1,12 +1,12 @@
-%%AP_LIBEXEC%%/mod_python.so
-%%PYTHON_SITELIBDIR%%/mod_python/__init__.py
-%%PYTHON_SITELIBDIR%%/mod_python/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/apache.py
-%%PYTHON_SITELIBDIR%%/mod_python/apache.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.py
-%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/httpdapi.py
-%%PYTHON_SITELIBDIR%%/mod_python/httpdapi.pyc
-%%PYTHON_SITELIBDIR%%/mod_python/zhandler.py
-%%PYTHON_SITELIBDIR%%/mod_python/zhandler.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/mod_python
+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


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


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001114214039.02E4937B479>