diff options
34 files changed, 294 insertions, 165 deletions
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python-devel/files/patch-setup.py +++ b/lang/python-devel/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python/Makefile b/lang/python/Makefile index 925b95221a30..9452e873bea3 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -7,11 +7,10 @@ PORTNAME= python PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -86,7 +85,12 @@ pre-install: .endfor .endfor +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.2 + post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.2 ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp @${MKDIR} ${PYTHONPREFIX_SITELIBDIR} diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index a9d86488e2d8..654d269f1cc3 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -1,4 +1,5 @@ bin/pydoc +bin/pydoc2.2 bin/python bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h diff --git a/lang/python15/Makefile b/lang/python15/Makefile index a424ceaa6f91..cc97ed924740 100644 --- a/lang/python15/Makefile +++ b/lang/python15/Makefile @@ -9,8 +9,8 @@ PORTNAME= python PORTVERSION= 1.5.2 PORTREVISION= 2 CATEGORIES= lang python -MASTER_SITES= ftp://www.python.org/pub/python/src/ \ - ftp://ftp.cwi.nl/pub/python/src/ +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/src DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -24,7 +24,7 @@ CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= altinstall PLIST= ${WRKDIR}/PLIST MAN1= ${PYTHON_VERSION}.1 -NO_LATEST_LINK= yes +LATEST_LINK= ${PYTHON_VERSION:S/.//} USE_PYTHON= yes PYTHON_VERSION= python1.5 diff --git a/lang/python20/Makefile b/lang/python20/Makefile index 8adcb2609542..b1a80b319f95 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -9,10 +9,8 @@ PORTNAME= python PORTVERSION= 2.0.1 PORTREVISION= 1 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -26,11 +24,11 @@ CONFIGURE_ENV= OPT="${CFLAGS}" INSTALL_TARGET= altinstall PLIST= ${WRKDIR}/PLIST MAN1= ${PYTHON_VERSION}.1 -NO_LATEST_LINK= yes USE_PYTHON= yes PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes +LATEST_LINK= ${PYTHON_VERSION:S/.//} # # The standard setup file diff --git a/lang/python21/Makefile b/lang/python21/Makefile index f4d18d7db204..58278e42f66c 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -7,12 +7,10 @@ PORTNAME= python PORTVERSION= 2.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -29,6 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.1 PYTHON_NO_DEPENDS= yes +LATEST_LINK= ${PYTHON_VERSION:S/.//} # # If you don't want to use Python's thread module, you need to set @@ -70,6 +69,10 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.1 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -80,6 +83,7 @@ pre-install: .endfor post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.1 ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python21/files/patch-setup.py b/lang/python21/files/patch-setup.py index f3cef489fa8f..a2ea5569ba4f 100644 --- a/lang/python21/files/patch-setup.py +++ b/lang/python21/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 +--- setup.py.orig Fri Dec 28 06:51:02 2001 ++++ setup.py Fri Jul 4 18:38:23 2003 @@ -14,7 +14,7 @@ from distutils.command.build_ext import build_ext @@ -9,3 +9,12 @@ def find_file(filename, std_dirs, paths): """Searches for the directory where a given file is located, +@@ -609,7 +609,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist index f2b5f8a6fec5..5a58a90108dd 100644 --- a/lang/python21/pkg-plist +++ b/lang/python21/pkg-plist @@ -1,5 +1,5 @@ bin/%%PYTHON_VERSION%% -bin/pydoc +bin/pydoc2.1 include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h diff --git a/lang/python22/Makefile b/lang/python22/Makefile index 925b95221a30..9452e873bea3 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -7,11 +7,10 @@ PORTNAME= python PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -86,7 +85,12 @@ pre-install: .endfor .endfor +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.2 + post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.2 ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp @${MKDIR} ${PYTHONPREFIX_SITELIBDIR} diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist index a9d86488e2d8..654d269f1cc3 100644 --- a/lang/python22/pkg-plist +++ b/lang/python22/pkg-plist @@ -1,4 +1,5 @@ bin/pydoc +bin/pydoc2.2 bin/python bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 925b95221a30..9452e873bea3 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -7,11 +7,10 @@ PORTNAME= python PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -86,7 +85,12 @@ pre-install: .endfor .endfor +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.2 + post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.2 ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp @${MKDIR} ${PYTHONPREFIX_SITELIBDIR} diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index a9d86488e2d8..654d269f1cc3 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -1,4 +1,5 @@ bin/pydoc +bin/pydoc2.2 bin/python bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 925b95221a30..9452e873bea3 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -7,11 +7,10 @@ PORTNAME= python PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -86,7 +85,12 @@ pre-install: .endfor .endfor +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.2 + post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.2 ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp @${MKDIR} ${PYTHONPREFIX_SITELIBDIR} diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index a9d86488e2d8..654d269f1cc3 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -1,4 +1,5 @@ bin/pydoc +bin/pydoc2.2 bin/python bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python30/files/patch-setup.py +++ b/lang/python30/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 5712f112a5a5..41950ba0b095 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -6,12 +6,9 @@ PORTNAME= python PORTVERSION= 2.3.b2 +PORTREVISION= 1 CATEGORIES= lang python ipv6 -MASTER_SITES= http://www.python.org/%SUBDIR%/ \ - http://python.mirrors.pair.com/%SUBDIR%/ \ - http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \ - http://python.planetmirror.com/%SUBDIR%/ \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_PYTHON} MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION:S/.b2//} DISTFILES= ${PYTHON_DISTFILE} @@ -23,8 +20,8 @@ WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" -INSTALL_TARGET= install -MAN1= python.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 @@ -99,6 +96,12 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -109,8 +112,12 @@ pre-install: .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ + ${PREFIX}/bin + @${MKDIR} ${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ + ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index f3cef489fa8f..b325b8938e41 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 -@@ -14,7 +14,7 @@ - from distutils.command.build_ext import build_ext +--- setup.py.orig Tue Jun 17 11:51:28 2003 ++++ setup.py Fri Jul 4 17:33:05 2003 +@@ -15,7 +15,7 @@ + from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"] - def find_file(filename, std_dirs, paths): - """Searches for the directory where a given file is located, + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if +@@ -1127,7 +1127,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index f01cea612fe3..47c31cd65062 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -1,6 +1,5 @@ -bin/idle -bin/pydoc -bin/python +bin/idle2.3 +bin/pydoc2.3 bin/%%PYTHON_VERSION%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h @@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/emacs/site-lisp/python-mode.el %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh |