Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Dec 2002 21:27:33 +0100 (CET)
From:      "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/46171: new port: www/mod_python3 version 3.0.1
Message-ID:  <200212102027.gBAKRXnn063558@eikonww2.eikon.e-technik.tu-muenchen.de>

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

>Number:         46171
>Category:       ports
>Synopsis:       new port: www/mod_python3 version 3.0.1
>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 Dec 10 12:30:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Simon 'corecode' Schubert
>Release:        FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD eikonww2.eikon.e-technik.tu-muenchen.de 4.7-RELEASE-p2 FreeBSD 4.7-RELEASE-p2 #4: Tue Dec 3 17:21:43 CET 2002 root@eikonww2.eikon.e-technik.tu-muenchen.de:/usr/obj/usr/src/sys/SCHNITZEL i386


	
>Description:
	this is version 3.0.1 of mod_python, for use with apache2 _only_.
	repo-copy from www/mod_python needed; diff attached.

	removed files: files/patch-configure
	
>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/www/mod_python/Makefile ./Makefile
--- /usr/ports/www/mod_python/Makefile	Mon Nov 11 09:00:45 2002
+++ ./Makefile	Tue Dec 10 21:05:11 2002
@@ -5,27 +5,31 @@
 # $FreeBSD: ports/www/mod_python/Makefile,v 1.18 2002/11/10 16:48:25 lioux Exp $
 #
 
-PORTNAME=	mod_python
-PORTVERSION=	2.7.8
+PORTNAME=	mod_python3
+PORTVERSION=	3.0.1
 CATEGORIES=	www python
-MASTER_SITES=	http://www.modpython.org/dist/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
-DIST_SUBDIR=	python
+MASTER_SITES=	http://www.apache.org/dist/httpd/modpython/ \
+		http://apache.mirrorcentral.com/dist/httpd/modpython/ \
+		http://apache.missouri.edu/dist/httpd/modpython/ \
+		http://ftp.epix.net/apache/dist/httpd/modpython/ \
+		ftp://ftp.digex.net/pub/packages/network/apache/httpd/modpython/ \
+		ftp://ftp.cuckoo.com/pub/mirrors/apache/dist/httpd/modpython/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/dist/httpd/modpython,}
+DISTNAME=	mod_python-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
+DIST_SUBDIR=	python
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
+BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
+
+APXS=		${LOCALBASE}/sbin/apxs
 
-NO_PACKAGE=	"Requires Python without threads support"
 USE_PYTHON=	yes
 
 .include <bsd.port.pre.mk>
 
-APXS?=		${LOCALBASE}/sbin/apxs
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-apxs=${APXS}
 CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
@@ -33,20 +37,7 @@
 
 STRIP_CMD?=	strip
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build option:"
-	@${ECHO} ""
-	@${ECHO} "  WANT_EAPI=yes  build as apache EAPI module (for apache13-modssl)"
-	@${ECHO} ""
-
-pre-patch:
-.if defined(WANT_EAPI)
-	cd ${WRKSRC} && ${PATCH} -p2 -s < ${PATCHDIR}/optpatch-WANT_EAPI
-.endif
-
 post-configure:
-	@${SH} ${PKGREQ}.threads ${PYTHON_CMD}
 .if defined(OPTIONAL_LIBS)
 	${SED} 's/^\(LIBS=.*\)/\1 ${OPTIONAL_LIBS}/' ${WRKSRC}/src/Makefile \
 		> ${WRKSRC}/src/Makefile.tmp && \
diff -ruN /usr/ports/www/mod_python/distinfo ./distinfo
--- /usr/ports/www/mod_python/distinfo	Wed May  8 00:37:18 2002
+++ ./distinfo	Mon Dec  2 16:24:34 2002
@@ -1 +1 @@
-MD5 (python/mod_python-2.7.8.tgz) = 4d5bee8317bfb45a3bb09f02b435e917
+MD5 (python/mod_python-3.0.1.tgz) = 41e587e2347449d60ed4ea02ffbc8a14
diff -ruN /usr/ports/www/mod_python/files/optpatch-WANT_EAPI ./files/optpatch-WANT_EAPI
--- /usr/ports/www/mod_python/files/optpatch-WANT_EAPI	Sat May 19 21:08:31 2001
+++ ./files/optpatch-WANT_EAPI	Tue Dec  3 14:25:12 2002
@@ -1,11 +1,11 @@
---- work/mod_python-2.7.3/src/Makefile.in.orig	Wed May 16 19:20:23 2001
-+++ work/mod_python-2.7.3/src/Makefile.in	Wed May 16 19:20:52 2001
-@@ -52,7 +52,7 @@
+--- src/Makefile.in.orig	Fri Nov  8 01:15:11 2002
++++ src/Makefile.in	Tue Dec  3 14:25:08 2002
+@@ -63,7 +63,7 @@
  INCLUDES=@INCLUDES@
  LIBS=@LIBS@
  LDFLAGS=@LDFLAGS@
 -OPT=
-+OPT=-DEAPI
++OPT=-EAPI
  CFLAGS=$(OPT) $(INCLUDES) 
  srcdir=.
  
diff -ruN /usr/ports/www/mod_python/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/www/mod_python/files/patch-Makefile.in	Wed Dec 27 17:15:55 2000
+++ ./files/patch-Makefile.in	Mon Dec  2 16:38:07 2002
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Dec 27 13:49:54 2000
-+++ Makefile.in	Wed Dec 27 13:52:28 2000
-@@ -82,13 +82,10 @@
+--- Makefile.in.orig	Fri Nov  8 01:15:10 2002
++++ Makefile.in	Mon Dec  2 16:36:51 2002
+@@ -92,13 +92,10 @@
  	@echo
  	@echo "Performing DSO installation."
  	@echo
@@ -15,4 +15,4 @@
 +	@echo "  ## Apache has to be restarted."
  	@echo
  
- install_static:	static
+ install_py_lib:
diff -ruN /usr/ports/www/mod_python/files/patch-configure ./files/patch-configure
--- /usr/ports/www/mod_python/files/patch-configure	Sat May 19 21:08:31 2001
+++ ./files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- configure.orig	Wed May 16 19:13:31 2001
-+++ configure	Wed May 16 19:14:11 2001
-@@ -1324,7 +1324,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:1327: 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 -ruN /usr/ports/www/mod_python/pkg-descr ./pkg-descr
--- /usr/ports/www/mod_python/pkg-descr	Tue Nov  6 15:24:29 2001
+++ ./pkg-descr	Tue Dec 10 21:26:08 2002
@@ -2,8 +2,13 @@
 for a considerable boost in performance and added flexibility
 in designing web based applications.
 
-WWW: http://www.modpython.org/
 developed by Gregory Trubetskoy <grisha@modpython.org> and others
 
-This port requires a Python installation without threads support. Build &
-(re)install Python with WITHOUT_THREADS set.
+This port requires Apache2 to be built with threads support
+(WITH_THREADS=yes). Note that this is orthogonal to mod_php4 which
+requires Apache2 to be built without threads. You have to make a decision
+then. Good Luck.
+
+WWW: http://www.modpython.org/
+
+-- Simon 'corecode' Schubert
diff -ruN /usr/ports/www/mod_python/pkg-plist ./pkg-plist
--- /usr/ports/www/mod_python/pkg-plist	Wed Dec 27 17:15:52 2000
+++ ./pkg-plist	Tue Dec  3 14:50:38 2002
@@ -1,16 +1,17 @@
-libexec/apache/mod_python.so
+libexec/apache2/mod_python.so
 %%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
+%%PYTHON_SITELIBDIR%%/mod_python/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/apache.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/cgihandler.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/publisher.pyo
+%%PYTHON_SITELIBDIR%%/mod_python/util.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/mod_python
diff -ruN /usr/ports/www/mod_python/pkg-req.threads ./pkg-req.threads
--- /usr/ports/www/mod_python/pkg-req.threads	Tue Nov  6 15:24:29 2001
+++ ./pkg-req.threads	Thu Jan  1 01:00:00 1970
@@ -1,22 +0,0 @@
-#! /bin/sh
-# anders@fix.no, 2001-08-07
-
-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 $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 (in $pydir). Good."
-	exit 0
-	;;
-*)
-	echo "Unknown libc library. Cannot use a Python installation that uses this."
-	exit 1
-	;;
-esac
	


>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?200212102027.gBAKRXnn063558>