mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

updates 2.7.2_2

Browse Source 
. Python 2.1 support
. EAPI option added. (for www/apache13-modssl)
. MASTER_SITES order changed (www.modpython.org site is always slow)

PR:		27214
Submitted by:	Chang, Hye-Shik <perky@python.or.kr> MAINTAINER
This commit is contained in:
James E. Housley 2001-05-11 12:38:46 +00:00
parent fba7eacd8b
commit 638e72dc16
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=42515
10 changed files with 86 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
www/mod_python/Makefile
View File

@ -7,10 +7,10 @@
PORTNAME= mod_python PORTNAME= mod_python
PORTVERSION= 2.7.2 PORTVERSION= 2.7.2
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= www python CATEGORIES= www python
MASTER_SITES= http://www.modpython.org/dist/ \ MASTER_SITES= http://www.python.org/ftp/python/${PYTHON_VERSION:S/python//g}/ \
http://www.python.org/ftp/python/2.0/ \ http://www.modpython.org/dist/ \
http://www3.kr.freebsd.org/~perky/distfiles/ http://www3.kr.freebsd.org/~perky/distfiles/
DISTFILES= mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE} DISTFILES= mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE}
DIST_SUBDIR= python DIST_SUBDIR= python
@ -21,7 +21,6 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
USE_PYTHON= yes USE_PYTHON= yes
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -29,53 +28,35 @@ PYTHON_WRKSRC= ${WRKSRC}/../Python-${PYTHON_VERSION:S/python//g}
APXS= ${PREFIX}/sbin/apxs APXS= ${PREFIX}/sbin/apxs
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs \ CONFIGURE_ARGS+=--with-apxs=${APXS} --with-python=${PYTHON_WRKSRC}
--with-python=${PYTHON_WRKSRC} CONFIGURE_ENV= PYTHON_BIN=${PYTHON_CMD}
CONFIGURE_ENV= PYTHON_BIN=${LOCALBASE}/bin/python
PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
.if defined(WITH_OPENPTY) .if defined(WITH_OPENPTY)
OPTIONAL_LIBS+= -lutil OPTIONAL_LIBS+= -lutil
.endif .endif
.if defined(WITH_GNUREADLINE)
OPTIONAL_LIBS+= -lreadline
.endif
PYTHON_CONFIGURE_ARGS+= --without-threads PYTHON_CONFIGURE_ARGS+= --without-threads
PYTHON_SETUP_FILE?= ${PORTSDIR}/lang/python/files/Setup STRIP_CMD?= strip
STRIP_BIN?= /usr/bin/strip
pre-fetch: pre-fetch:
@${ECHO} "" @${ECHO} ""
@${ECHO} "You may use the following build option:" @${ECHO} "You may use the following build option:"
@${ECHO} "" @${ECHO} ""
@${ECHO} " PYTHON_SETUP_FILE=path specify python modules setup file" @${ECHO} " WANT_EAPI=yes build as apache EAPI module (for apache13-modssl)"
@${ECHO} " WITH_OPENPTY=yes enables openpty function in posixmodule" @${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} "" @${ECHO} ""
pre-patch: pre-patch:
.if !defined(${WITH_OPENPTY}) .if !defined(WITH_OPENPTY)
${PATCH} -s <files/optpatch-Python::configure ${PATCH} -s < ${PATCHDIR}/optpatch-WITHOUT_OPENPTY
.endif
.if defined(WANT_EAPI)
${PATCH} -s < ${PATCHDIR}/optpatch-WANT_EAPI
.endif .endif
pre-configure: pre-configure:
cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS} cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS}
.if !exists(${PYTHON_SETUP_FILE})
@${ECHO} ""
@${ECHO} "### COULD NOT FIND PYTHON SETUP FILE"
@${ECHO} "### SPECIFY FILE PATH OR INSTALL PORT 'lang/python'"
@${ECHO} ""
.endif
.if !defined(WITH_GNUREADLINE)
${SED} 's/^readline/#without_readline/g' ${PYTHON_SETUP_FILE} \
> ${PYTHON_WRKSRC}/Modules/Setup
.else
${CP} ${PYTHON_SETUP_FILE} ${PYTHON_WRKSRC}/Modules/Setup
.endif
post-configure: post-configure:
.if defined(OPTIONAL_LIBS) .if defined(OPTIONAL_LIBS)
@ -88,8 +69,8 @@ pre-build:
cd ${PYTHON_WRKSRC} && ${MAKE} cd ${PYTHON_WRKSRC} && ${MAKE}
post-build: post-build:
.if !defined(DONT_STRIP) && exists(${STRIP_BIN}) .if !defined(DONT_STRIP) && exists(${STRIP_CMD})
${STRIP_BIN} ${WRKSRC}/src/mod_python.so ${STRIP_CMD} ${WRKSRC}/src/mod_python.so
.endif .endif
post-install: post-install:

2
www/mod_python/distinfo
View File

@ -1,2 +1,2 @@
MD5 (python/mod_python-2.7.2.tgz) = 5b73af91c891c63f4be450d7a7dc0bb2 MD5 (python/mod_python-2.7.2.tgz) = 5b73af91c891c63f4be450d7a7dc0bb2
MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054

11
www/mod_python/files/optpatch-WANT_EAPI Normal file
View File

@ -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=.

14
www/mod_python/files/optpatch-Python::configure → www/mod_python/files/optpatch-WITHOUT_OPENPTY
View File

@ -1,19 +1,17 @@
--- work/Python-2.0/configure.orig Fri Mar 16 07:32:48 2001 --- work/Python-2.1/configure.orig Wed May 9 06:04:43 2001
+++ work/Python-2.0/configure Fri Mar 16 07:35:20 2001 +++ work/Python-2.1/configure Wed May 9 06:05:14 2001
@@ -3975,7 +3975,7 @@ @@ -4293,6 +4293,7 @@
fi
done done
-
+if false; then +if false; then
# check for openpty and forkpty # check for openpty and forkpty
for ac_func in openpty for ac_func in openpty
@@ -4173,7 +4173,7 @@ @@ -4491,6 +4492,7 @@
fi fi
done done
-
+fi +fi
# check for long file support functions # check for long file support functions

11
www/mod_python/files/patch-Python::setup.py Normal file
View File

@ -0,0 +1,11 @@
--- ../Python-2.1/setup.py.orig Fri Mar 2 07:24:14 2001
+++ ../Python-2.1/setup.py Mon Mar 5 15:26:17 2001
@@ -14,7 +14,7 @@
from distutils.command.build_ext import build_ext
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,

47
www/mod_python3/Makefile
View File

@ -7,10 +7,10 @@
PORTNAME= mod_python PORTNAME= mod_python
PORTVERSION= 2.7.2 PORTVERSION= 2.7.2
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= www python CATEGORIES= www python
MASTER_SITES= http://www.modpython.org/dist/ \ MASTER_SITES= http://www.python.org/ftp/python/${PYTHON_VERSION:S/python//g}/ \
http://www.python.org/ftp/python/2.0/ \ http://www.modpython.org/dist/ \
http://www3.kr.freebsd.org/~perky/distfiles/ http://www3.kr.freebsd.org/~perky/distfiles/
DISTFILES= mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE} DISTFILES= mod_python-${PORTVERSION}.tgz ${PYTHON_DISTFILE}
DIST_SUBDIR= python DIST_SUBDIR= python
@ -21,7 +21,6 @@ BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13 RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
USE_PYTHON= yes USE_PYTHON= yes
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -29,53 +28,35 @@ PYTHON_WRKSRC= ${WRKSRC}/../Python-${PYTHON_VERSION:S/python//g}
APXS= ${PREFIX}/sbin/apxs APXS= ${PREFIX}/sbin/apxs
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs \ CONFIGURE_ARGS+=--with-apxs=${APXS} --with-python=${PYTHON_WRKSRC}
--with-python=${PYTHON_WRKSRC} CONFIGURE_ENV= PYTHON_BIN=${PYTHON_CMD}
CONFIGURE_ENV= PYTHON_BIN=${LOCALBASE}/bin/python
PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
.if defined(WITH_OPENPTY) .if defined(WITH_OPENPTY)
OPTIONAL_LIBS+= -lutil OPTIONAL_LIBS+= -lutil
.endif .endif
.if defined(WITH_GNUREADLINE)
OPTIONAL_LIBS+= -lreadline
.endif
PYTHON_CONFIGURE_ARGS+= --without-threads PYTHON_CONFIGURE_ARGS+= --without-threads
PYTHON_SETUP_FILE?= ${PORTSDIR}/lang/python/files/Setup STRIP_CMD?= strip
STRIP_BIN?= /usr/bin/strip
pre-fetch: pre-fetch:
@${ECHO} "" @${ECHO} ""
@${ECHO} "You may use the following build option:" @${ECHO} "You may use the following build option:"
@${ECHO} "" @${ECHO} ""
@${ECHO} " PYTHON_SETUP_FILE=path specify python modules setup file" @${ECHO} " WANT_EAPI=yes build as apache EAPI module (for apache13-modssl)"
@${ECHO} " WITH_OPENPTY=yes enables openpty function in posixmodule" @${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} "" @${ECHO} ""
pre-patch: pre-patch:
.if !defined(${WITH_OPENPTY}) .if !defined(WITH_OPENPTY)
${PATCH} -s <files/optpatch-Python::configure ${PATCH} -s < ${PATCHDIR}/optpatch-WITHOUT_OPENPTY
.endif
.if defined(WANT_EAPI)
${PATCH} -s < ${PATCHDIR}/optpatch-WANT_EAPI
.endif .endif
pre-configure: pre-configure:
cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS} cd ${PYTHON_WRKSRC} && ./configure ${PYTHON_CONFIGURE_ARGS}
.if !exists(${PYTHON_SETUP_FILE})
@${ECHO} ""
@${ECHO} "### COULD NOT FIND PYTHON SETUP FILE"
@${ECHO} "### SPECIFY FILE PATH OR INSTALL PORT 'lang/python'"
@${ECHO} ""
.endif
.if !defined(WITH_GNUREADLINE)
${SED} 's/^readline/#without_readline/g' ${PYTHON_SETUP_FILE} \
> ${PYTHON_WRKSRC}/Modules/Setup
.else
${CP} ${PYTHON_SETUP_FILE} ${PYTHON_WRKSRC}/Modules/Setup
.endif
post-configure: post-configure:
.if defined(OPTIONAL_LIBS) .if defined(OPTIONAL_LIBS)
@ -88,8 +69,8 @@ pre-build:
cd ${PYTHON_WRKSRC} && ${MAKE} cd ${PYTHON_WRKSRC} && ${MAKE}
post-build: post-build:
.if !defined(DONT_STRIP) && exists(${STRIP_BIN}) .if !defined(DONT_STRIP) && exists(${STRIP_CMD})
${STRIP_BIN} ${WRKSRC}/src/mod_python.so ${STRIP_CMD} ${WRKSRC}/src/mod_python.so
.endif .endif
post-install: post-install:

2
www/mod_python3/distinfo
View File

@ -1,2 +1,2 @@
MD5 (python/mod_python-2.7.2.tgz) = 5b73af91c891c63f4be450d7a7dc0bb2 MD5 (python/mod_python-2.7.2.tgz) = 5b73af91c891c63f4be450d7a7dc0bb2
MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054

11
www/mod_python3/files/optpatch-WANT_EAPI Normal file
View File

@ -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=.

14
www/mod_python3/files/optpatch-Python::configure → www/mod_python3/files/optpatch-WITHOUT_OPENPTY
View File

@ -1,19 +1,17 @@
--- work/Python-2.0/configure.orig Fri Mar 16 07:32:48 2001 --- work/Python-2.1/configure.orig Wed May 9 06:04:43 2001
+++ work/Python-2.0/configure Fri Mar 16 07:35:20 2001 +++ work/Python-2.1/configure Wed May 9 06:05:14 2001
@@ -3975,7 +3975,7 @@ @@ -4293,6 +4293,7 @@
fi
done done
-
+if false; then +if false; then
# check for openpty and forkpty # check for openpty and forkpty
for ac_func in openpty for ac_func in openpty
@@ -4173,7 +4173,7 @@ @@ -4491,6 +4492,7 @@
fi fi
done done
-
+fi +fi
# check for long file support functions # check for long file support functions

11
www/mod_python3/files/patch-Python::setup.py Normal file
View File

@ -0,0 +1,11 @@
--- ../Python-2.1/setup.py.orig Fri Mar 2 07:24:14 2001
+++ ../Python-2.1/setup.py Mon Mar 5 15:26:17 2001
@@ -14,7 +14,7 @@
from distutils.command.build_ext import build_ext
# This global variable is used to hold the list of modules to be disabled.
-disabled_module_list = []
+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
def find_file(filename, std_dirs, paths):
"""Searches for the directory where a given file is located,