Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Mar 2001 23:44:44 -0800 (PST)
From:      perky@python.or.kr
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/26064: Update port: www/mod_python
Message-ID:  <200103250744.f2P7iiL65668@freefall.freebsd.org>

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

>Number:         26064
>Category:       ports
>Synopsis:       Update port: www/mod_python
>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:   Sat Mar 24 23:50:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Chang, Hye-Shik
>Release:        FreeBSD 4.2
>Organization:
Yonsei University
>Environment:
FreeBSD sbtm.yonsei.ac.kr 4.3-BETA FreeBSD 4.3-BETA #0: Mon Mar 19 22:23:56 KST 2001     root@sbtm.yonsei.ac.kr:/usr/src/sys/compile/AYANAMI  i386
>Description:
second port revision from mod_python 2.7.2 

- added Apache EAPI module build option (for www/apache13-modssl port)
- changed variable names for more standard port style
- patched some bug option on WITH_OPENPTY
- renamed one optional patch file
- disabled auto ldconfig (mod_python doesn't need ldconfig)

** removed:
     files/optpatch-Python::configure
** added:
     files/optpatch-Python:configure
     files/optpatch-src:Makefile.in

>How-To-Repeat:

>Fix:
diff -ruN mod_python.orig/Makefile mod_python/Makefile
--- mod_python.orig/Makefile	Fri Mar 23 10:12:11 2001
+++ mod_python/Makefile	Sun Mar 25 16:35:15 2001
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_python
 PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://www.modpython.org/dist/ \
 		http://www.python.org/ftp/python/2.0/ \
@@ -21,7 +21,6 @@
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
 USE_PYTHON=	yes
-INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -29,9 +28,8 @@
 APXS=		${PREFIX}/sbin/apxs
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-apxs=${LOCALBASE}/sbin/apxs \
-		--with-python=${PYTHON_WRKSRC}
-CONFIGURE_ENV=	PYTHON_BIN=${LOCALBASE}/bin/python
+CONFIGURE_ARGS+= --with-apxs=${APXS} --with-python=${PYTHON_WRKSRC}
+CONFIGURE_ENV=	PYTHON_BIN=${PYTHON_CMD}
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 .if defined(WITH_OPENPTY)
@@ -44,21 +42,25 @@
 
 PYTHON_CONFIGURE_ARGS+=	--without-threads
 PYTHON_SETUP_FILE?=	${PORTSDIR}/lang/python/files/Setup
-STRIP_BIN?=	    /usr/bin/strip
+STRIP_CMD?=	    /usr/bin/strip
 
 pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build option:"
 	@${ECHO} ""
 	@${ECHO} "  PYTHON_SETUP_FILE=path  specify python modules setup file"
+	@${ECHO} "  EAPI=yes  build as apache EAPI module (for apache13-modssl)"
 	@${ECHO} "  WITH_OPENPTY=yes  enables openpty function in posixmodule"
 	@${ECHO} "  WITH_GNUREADLINE=yes  enables gnu readline library"
 	@${ECHO} "  DONT_STRIP=yes  don't strip shared object"
 	@${ECHO} ""
 
 pre-patch:
-.if !defined(${WITH_OPENPTY})
-	${PATCH} -s <files/optpatch-Python::configure
+.if !defined(WITH_OPENPTY)
+	${PATCH} -s <files/optpatch-Python:configure
+.endif
+.if defined(EAPI)
+	${PATCH} -s <files/optpatch-src:Makefile.in
 .endif
 
 pre-configure:
@@ -88,8 +90,8 @@
 	cd ${PYTHON_WRKSRC} && ${MAKE}
 
 post-build:
-.if !defined(DONT_STRIP) && exists(${STRIP_BIN})
-	${STRIP_BIN} ${WRKSRC}/src/mod_python.so
+.if !defined(DONT_STRIP) && exists(${STRIP_CMD})
+	${STRIP_CMD} ${WRKSRC}/src/mod_python.so
 .endif
 
 post-install:
diff -ruN mod_python.orig/files/optpatch-Python::configure mod_python/files/optpatch-Python::configure
--- mod_python.orig/files/optpatch-Python::configure	Fri Mar 23 10:37:32 2001
+++ mod_python/files/optpatch-Python::configure	Thu Jan  1 09:00:00 1970
@@ -1,20 +0,0 @@
---- work/Python-2.0/configure.orig	Fri Mar 16 07:32:48 2001
-+++ work/Python-2.0/configure	Fri Mar 16 07:35:20 2001
-@@ -3975,7 +3975,7 @@
- fi
- done
- 
--
-+if false; then
- # check for openpty and forkpty
- 
- for ac_func in openpty
-@@ -4173,7 +4173,7 @@
- 
- fi
- done
--
-+fi
- 
- # check for long file support functions
- for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
diff -ruN mod_python.orig/files/optpatch-Python:configure mod_python/files/optpatch-Python:configure
--- mod_python.orig/files/optpatch-Python:configure	Thu Jan  1 09:00:00 1970
+++ mod_python/files/optpatch-Python:configure	Fri Mar 23 10:37:32 2001
@@ -0,0 +1,20 @@
+--- work/Python-2.0/configure.orig	Fri Mar 16 07:32:48 2001
++++ work/Python-2.0/configure	Fri Mar 16 07:35:20 2001
+@@ -3975,7 +3975,7 @@
+ fi
+ done
+ 
+-
++if false; then
+ # check for openpty and forkpty
+ 
+ for ac_func in openpty
+@@ -4173,7 +4173,7 @@
+ 
+ fi
+ done
+-
++fi
+ 
+ # check for long file support functions
+ for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
diff -ruN mod_python.orig/files/optpatch-src:Makefile.in mod_python/files/optpatch-src:Makefile.in
--- mod_python.orig/files/optpatch-src:Makefile.in	Thu Jan  1 09:00:00 1970
+++ mod_python/files/optpatch-src:Makefile.in	Sun Mar 25 16:14:09 2001
@@ -0,0 +1,11 @@
+--- work/mod_python-2.7.2/src/Makefile.in.orig	Sun Mar 25 16:05:21 2001
++++ work/mod_python-2.7.2/src/Makefile.in	Sun Mar 25 16:05:30 2001
+@@ -52,7 +52,7 @@
+ INCLUDES=@INCLUDES@
+ LIBS=@LIBS@
+ LDFLAGS=@LDFLAGS@
+-OPT=
++OPT=-DEAPI
+ CFLAGS=$(OPT) $(INCLUDES) 
+ srcdir=.
+ 

>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?200103250744.f2P7iiL65668>