diff options
91 files changed, 3926 insertions, 1729 deletions
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python-devel/distinfo +++ b/lang/python-devel/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python-devel/files/Setup b/lang/python-devel/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python-devel/files/Setup +++ b/lang/python-devel/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python-devel/files/Setup.OpenSSL b/lang/python-devel/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python-devel/files/Setup.OpenSSL +++ b/lang/python-devel/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python-devel/files/patch-aa b/lang/python-devel/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python-devel/files/patch-aa +++ b/lang/python-devel/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python-devel/pkg-plist.Tools b/lang/python-devel/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python-devel/pkg-plist.Tools +++ b/lang/python-devel/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python/Makefile b/lang/python/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python/distinfo b/lang/python/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python/files/Setup b/lang/python/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python/files/Setup +++ b/lang/python/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python/files/Setup.OpenSSL b/lang/python/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python/files/Setup.OpenSSL +++ b/lang/python/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python/files/patch-aa b/lang/python/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python/files/patch-aa +++ b/lang/python/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python/pkg-plist.Tools b/lang/python/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python/pkg-plist.Tools +++ b/lang/python/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python20/Makefile b/lang/python20/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python20/Makefile +++ b/lang/python20/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python20/distinfo b/lang/python20/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python20/distinfo +++ b/lang/python20/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python20/files/Setup b/lang/python20/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python20/files/Setup +++ b/lang/python20/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python20/files/Setup.OpenSSL b/lang/python20/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python20/files/Setup.OpenSSL +++ b/lang/python20/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python20/files/patch-aa b/lang/python20/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python20/files/patch-aa +++ b/lang/python20/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python20/pkg-plist +++ b/lang/python20/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python20/pkg-plist.Tools b/lang/python20/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python20/pkg-plist.Tools +++ b/lang/python20/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python21/Makefile b/lang/python21/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python21/distinfo b/lang/python21/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python21/distinfo +++ b/lang/python21/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python21/files/Setup b/lang/python21/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python21/files/Setup +++ b/lang/python21/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python21/files/Setup.OpenSSL b/lang/python21/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python21/files/Setup.OpenSSL +++ b/lang/python21/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python21/files/patch-aa b/lang/python21/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python21/files/patch-aa +++ b/lang/python21/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python21/pkg-plist +++ b/lang/python21/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python21/pkg-plist.Tools b/lang/python21/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python21/pkg-plist.Tools +++ b/lang/python21/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python22/Makefile b/lang/python22/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python22/Makefile +++ b/lang/python22/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python22/distinfo b/lang/python22/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python22/distinfo +++ b/lang/python22/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python22/files/Setup b/lang/python22/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python22/files/Setup +++ b/lang/python22/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python22/files/Setup.OpenSSL b/lang/python22/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python22/files/Setup.OpenSSL +++ b/lang/python22/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python22/files/patch-aa b/lang/python22/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python22/files/patch-aa +++ b/lang/python22/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python22/pkg-plist +++ b/lang/python22/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python22/pkg-plist.Tools b/lang/python22/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python22/pkg-plist.Tools +++ b/lang/python22/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python23/distinfo b/lang/python23/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python23/distinfo +++ b/lang/python23/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python23/files/Setup b/lang/python23/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python23/files/Setup +++ b/lang/python23/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python23/files/Setup.OpenSSL b/lang/python23/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python23/files/Setup.OpenSSL +++ b/lang/python23/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python23/files/patch-aa b/lang/python23/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python23/files/patch-aa +++ b/lang/python23/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python23/pkg-plist.Tools b/lang/python23/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python23/pkg-plist.Tools +++ b/lang/python23/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python24/Makefile b/lang/python24/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python24/distinfo b/lang/python24/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python24/distinfo +++ b/lang/python24/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python24/files/Setup b/lang/python24/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python24/files/Setup +++ b/lang/python24/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python24/files/Setup.OpenSSL b/lang/python24/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python24/files/Setup.OpenSSL +++ b/lang/python24/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python24/files/patch-aa b/lang/python24/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python24/files/patch-aa +++ b/lang/python24/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python24/pkg-plist.Tools b/lang/python24/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python24/pkg-plist.Tools +++ b/lang/python24/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python25/Makefile b/lang/python25/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python25/distinfo b/lang/python25/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python25/files/Setup b/lang/python25/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python25/files/Setup +++ b/lang/python25/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python25/files/Setup.OpenSSL b/lang/python25/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python25/files/Setup.OpenSSL +++ b/lang/python25/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python25/files/patch-aa b/lang/python25/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python25/files/patch-aa +++ b/lang/python25/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python25/pkg-plist.Tools b/lang/python25/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python25/pkg-plist.Tools +++ b/lang/python25/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python26/Makefile b/lang/python26/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python26/distinfo b/lang/python26/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python26/files/Setup b/lang/python26/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python26/files/Setup +++ b/lang/python26/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python26/files/Setup.OpenSSL b/lang/python26/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python26/files/Setup.OpenSSL +++ b/lang/python26/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python26/files/patch-aa b/lang/python26/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python26/files/patch-aa +++ b/lang/python26/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python26/pkg-plist.Tools b/lang/python26/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python26/pkg-plist.Tools +++ b/lang/python26/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python27/Makefile b/lang/python27/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python27/distinfo b/lang/python27/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python27/files/Setup b/lang/python27/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python27/files/Setup +++ b/lang/python27/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python27/files/Setup.OpenSSL b/lang/python27/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python27/files/Setup.OpenSSL +++ b/lang/python27/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python27/files/patch-aa b/lang/python27/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python27/files/patch-aa +++ b/lang/python27/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python27/pkg-plist.Tools b/lang/python27/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python27/pkg-plist.Tools +++ b/lang/python27/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python30/Makefile b/lang/python30/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python30/distinfo b/lang/python30/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python30/files/Setup b/lang/python30/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python30/files/Setup +++ b/lang/python30/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python30/files/Setup.OpenSSL b/lang/python30/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python30/files/Setup.OpenSSL +++ b/lang/python30/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python30/files/patch-aa b/lang/python30/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python30/files/patch-aa +++ b/lang/python30/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python30/pkg-plist.Tools b/lang/python30/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python30/pkg-plist.Tools +++ b/lang/python30/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python31/Makefile b/lang/python31/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python31/distinfo b/lang/python31/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python31/files/Setup b/lang/python31/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python31/files/Setup +++ b/lang/python31/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python31/files/Setup.OpenSSL b/lang/python31/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python31/files/Setup.OpenSSL +++ b/lang/python31/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python31/files/patch-aa b/lang/python31/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python31/files/patch-aa +++ b/lang/python31/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python31/pkg-plist.Tools b/lang/python31/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python31/pkg-plist.Tools +++ b/lang/python31/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche diff --git a/lang/python32/Makefile b/lang/python32/Makefile index ea43fb19929e..44a654b5a30b 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -6,14 +6,15 @@ # PORTNAME= python -PORTVERSION= 1.6 +PORTVERSION= 2.0 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/1.6/ -DISTNAME= Python-${PORTVERSION} +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ +DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= tg@FreeBSD.org DIST_SUBDIR= python +WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" @@ -22,7 +23,7 @@ PLIST= ${WRKDIR}/PLIST MAN1= python.1 USE_PYTHON= yes -PYTHON_VERSION= python1.6 +PYTHON_VERSION= python2.0 PYTHON_NO_DEPENDS= yes # @@ -36,9 +37,11 @@ SETUP_FILE= Setup # LIBC_R!= /sbin/ldconfig -r | grep c_r || true .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS) -CONFIGURE_ARGS+= --with-thread +CONFIGURE_ARGS+= --with-threads CFLAGS+= -D_THREAD_SAFE CONFIGURE_ENV+= LDFLAGS="-pthread ${LDFLAGS}" +.else +CONFIGURE_ARGS+= --without-threads .endif # @@ -65,10 +68,6 @@ PLIST_GMP= ${PKGDIR}/pkg-plist.gmp PLIST_TOOLS= ${PKGDIR}/pkg-plist.Tools .endif -post-extract: - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd4.sh - cd ${WRKSRC}/Lib && ${SH} ${FILESDIR}/plat-freebsd5.sh - post-configure: ${CP} ${FILESDIR}/${SETUP_FILE} ${WRKSRC}/Modules/Setup .for file in ${SETUP_LOCAL} @@ -97,20 +96,20 @@ PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/${platform} - ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/* \ +.for file in FCNTL.py IN.py SOCKET.py TERMIOS.py regen + ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PREFIX}/lib/${PYTHON_VERSION}/${platform}/ .endfor +.endfor @sort -r -o ${PLIST} ${PLIST_GMP} ${PLIST_TOOLS} ${PKGDIR}/pkg-plist post-install: strip ${PREFIX}/bin/python - @${MKDIR} ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/share/emacs/site-lisp ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/python @${MKDIR} ${PREFIX}/lib/${PYTHON_VERSION}/site-packages .if !defined(WITHOUT_TOOLS) - @cd ${WRKSRC}; tar cf - Tools | \ + @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${PREFIX}/lib/${PYTHON_VERSION}; tar xf -) .endif diff --git a/lang/python32/distinfo b/lang/python32/distinfo index d17eb803009a..3c57fda73235 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1 +1 @@ -MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python32/files/Setup b/lang/python32/files/Setup index e550ce3aca12..5b32c7319622 100644 --- a/lang/python32/files/Setup +++ b/lang/python32/files/Setup @@ -22,25 +22,27 @@ # <module> is anything else but should be a valid Python # identifier (letters, digits, underscores, beginning with non-digit) # +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# # Lines can also have the form # # <name> = <value> # # which defines a Make variable definition inserted into Makefile.in # -# Finally, if a line has the literal form -# -# *shared* -# -# (that is including the '*' and '*' !) then the following modules will -# not be included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be added -# to the linker options, but rules to create their .o files and their -# shared libraries will still be added to the Makefile, and their -# names will be collected in the Make variable SHAREDMODS. This is -# used to build modules as shared libraries. (They must be installed -# using "make sharedinstall".) (For compatibility, *noconfig* has the -# same effect as *shared*.) +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options, but rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) # # In addition, *static* reverses this effect (negating a previous # *shared* line). @@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST) # at run time! # Standard path -- don't edit. -# No leading colon since this is the first entry +# No leading colon since this is the first entry. # Empty since this is now just the runtime prefix. DESTPATH= -# Site specific path insertions -- should begin with : if non-empty +# Site specific path components -- should begin with : if non-empty SITEPATH= -# Standard enabled (tests are always available) -TESTPATH=:test +# Standard path components for test modules +TESTPATH= -# Path for machine- or system-dependent modules (and shared libraries) +# Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -98,8 +100,6 @@ _sre _sre.c # Fredrik Lundh's new regular expressions GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -127,16 +127,17 @@ readline readline.c -lmytinfo -lreadline -ltermcap # Modules that should always be present (non UNIX dependent): array arraymodule.c # array objects -cmath cmathmodule.c # complex math library functions -math mathmodule.c -lm # math library functions, e.g. sin() +cmath cmathmodule.c # -lm # complex math library functions +math mathmodule.c -lm # math library functions, e.g. sin() strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking -time timemodule.c # -lm # time operations and variables +time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies _codecs _codecsmodule.c # access to the builtin codecs and codec registry unicodedata unicodedata.c unicodedatabase.c # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table _locale _localemodule.c # access to ISO C locale support @@ -149,14 +150,18 @@ fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) errno errnomodule.c # posix (UNIX) errno values -mmap mmapmodule.c # Memory-mapped files (also works on Win32) select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -errno errnomodule.c # posix (UNIX) errno values +_socket socketmodule.c # socket(2) + +# Memory-mapped files (also works on Win32). +# Some platforms require -lucb. +mmap mmapmodule.c # -lucb # Socket module compiled with SSL support; you must edit the SSL variable: -#SSL=/usr -#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c #-lnsl # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -181,26 +186,6 @@ imageop imageop.c # Operations on images rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:$(DESTLIB)/stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -226,7 +211,7 @@ sha shamodule.c # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z #GMP=/ufs/guido/src/gmp -#mpz mpzmodule.c -lgmp +#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a # SGI IRIX specific modules -- off by default. @@ -234,13 +219,12 @@ sha shamodule.c # These module work on any SGI machine: # *** gl must be enabled higher up in this file *** -#fm fmmodule.c -lfm -lgl # Font Manager +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager #sgi sgimodule.c # sgi.nap() and a few more # This module requires the header file # /usr/people/4Dgifts/iristools/include/izoom.h: - -#imgfile imgfile.c -limage -lgutil -lm # Image Processing Utilities +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities # These modules require the Multimedia Development Option (I think): @@ -255,11 +239,15 @@ sha shamodule.c # components such as dialogs and buttons using SGI's GL and FM # libraries. You must ftp the FORMS library separately from # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + # The FORMS variable must point to the FORMS subdirectory of the forms # toplevel directory: #FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl # SunOS specific modules -- off by default: @@ -293,20 +281,18 @@ TKPATH=:lib-tk # *** Always uncomment this (leave the leading underscore in!): # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncommend and edit to reflect where your X11 header files are: +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: # -I/usr/X11R6/include \ # *** Or uncomment this for Solaris: # -I/usr/openwin/include \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ # *** Uncomment and edit for Tix extension only: # -DWITH_TIX -ltix4.1.8.0 \ # *** Uncomment and edit for BLT extension only: # -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ # *** Uncomment and edit for PIL (TkImaging) extension only: # -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for Mesa (what's Mesa?): -# -lGL -lGLU -lMesatk -lMesaaux \ # *** Uncomment and edit for TOGL extension only: # -DWITH_TOGL togl.c \ # *** Uncomment and edit to reflect where your Tcl/Tk libraries are: @@ -317,9 +303,12 @@ TKPATH=:lib-tk # -L/usr/X11R6/lib \ # *** Or uncomment this for Solaris: # -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ # *** Always uncomment this; X11 libraries to link with: -# -lX11 -lXext -lXmu - +# -lX11 # Lance Ellinghaus's modules: @@ -327,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap +_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap @@ -348,6 +337,7 @@ new newmodule.c dl dlmodule.c + # Modules that provide persistent dictionary-like semantics. You will # probably want to arrange for at least one of them to be available on # your machine, though none are defined by default because of library @@ -371,11 +361,16 @@ dbm dbmmodule.c # dbm(3) may require -lndbm or similar # # Edit the variables DB and DBPORT to point to the db top directory # and the subdirectory of PORT where you built it. +# +# (See http://www.jenkon-dev.com/~rd/python/ for an interface to +# BSD DB 2.1.0.) + +# Note: If a db.h file is found by configure, bsddb will be enabled +# automatically via Setup.config.in -#DB=/depot/sundry/src/db.1.85/ -#DBPORT=$(DB)/PORT/sunos.5.2 -#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a -bsddb bsddbmodule.o +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a @@ -385,7 +380,7 @@ bsddb bsddbmodule.o # Helper module for various ascii-encoders binascii binascii.c -# Fred Drake's interface to the Python parser. +# Fred Drake's interface to the Python parser parser parsermodule.c # Digital Creations' cStringIO and cPickle @@ -415,7 +410,6 @@ fpetest fpetestmodule.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c -lz - # Interface to the Expat XML parser # # Expat is written by James Clark and must be downloaded separately @@ -426,10 +420,16 @@ zlib zlibmodule.c -lz # http://www.jclark.com/xml/expat.html, the current production release is # always ftp://ftp.jclark.com/pub/xml/expat.zip. # -# (Note: the expat build process doesn't yet build a libexpat.a; you can -# do this manually while we try convince the author to add it.) +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o # -#EXPAT_DIR=/usr/local/src/expat/ +#EXPAT_DIR=/usr/local/src/expat #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat diff --git a/lang/python32/files/Setup.OpenSSL b/lang/python32/files/Setup.OpenSSL index 8e5c71a0efd7..c675971496ca 100644 --- a/lang/python32/files/Setup.OpenSSL +++ b/lang/python32/files/Setup.OpenSSL @@ -2,7 +2,5 @@ # Socket module compiled with SSL support; you must edit the SSL variable: SSL=/usr -socket socketmodule.c \ - -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ - -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto diff --git a/lang/python32/files/patch-aa b/lang/python32/files/patch-aa index bf67a5c243e4..b4e298027a7e 100644 --- a/lang/python32/files/patch-aa +++ b/lang/python32/files/patch-aa @@ -1,13 +1,6 @@ ---- Makefile.in.orig Thu Aug 3 19:00:01 2000 -+++ Makefile.in Wed Aug 16 17:38:14 2000 -@@ -95,14 +95,14 @@ - # Modes for directories, executables and data files created by the - # install process. Default to group-writable directories but - # user-only-writable for executables and data files. --DIRMODE= 775 -+DIRMODE= 755 - EXEMODE= 755 - FILEMODE= 644 +--- Makefile.in.orig Wed Aug 30 11:43:56 2000 ++++ Makefile.in Wed Aug 30 16:32:22 2000 +@@ -110,8 +110,8 @@ # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/install-sh -c @@ -18,20 +11,3 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN=@LN@ -@@ -259,7 +259,7 @@ - # Install the library - PLATDIR= plat-$(MACHDEP) - MACHDEPS= $(PLATDIR) --LIBSUBDIRS= lib-old lib-tk site-packages test test/output encodings \ -+LIBSUBDIRS= lib-old lib-tk site-packages test test/output curses encodings \ - distutils distutils/command $(MACHDEPS) - libinstall: python $(srcdir)/Lib/$(PLATDIR) - @for i in $(SCRIPTDIR) $(LIBDEST); \ -@@ -303,6 +303,7 @@ - case $$i in \ - *CVS) ;; \ - *.py[co]) ;; \ -+ *.orig) ;; \ - *~) ;; \ - *) \ - if test -d $$i; then continue; fi; \ diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index ecc0b1111158..47b4a8d57cc9 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -32,11 +32,6 @@ include/%%PYTHON_VERSION%%/metagrammar.h include/%%PYTHON_VERSION%%/methodobject.h include/%%PYTHON_VERSION%%/modsupport.h include/%%PYTHON_VERSION%%/moduleobject.h -include/%%PYTHON_VERSION%%/mymalloc.h -include/%%PYTHON_VERSION%%/mymath.h -include/%%PYTHON_VERSION%%/myproto.h -include/%%PYTHON_VERSION%%/myselect.h -include/%%PYTHON_VERSION%%/mytime.h include/%%PYTHON_VERSION%%/node.h include/%%PYTHON_VERSION%%/object.h include/%%PYTHON_VERSION%%/objimpl.h @@ -48,6 +43,8 @@ include/%%PYTHON_VERSION%%/pgenheaders.h include/%%PYTHON_VERSION%%/pydebug.h include/%%PYTHON_VERSION%%/pyerrors.h include/%%PYTHON_VERSION%%/pyfpe.h +include/%%PYTHON_VERSION%%/pymem.h +include/%%PYTHON_VERSION%%/pyport.h include/%%PYTHON_VERSION%%/pystate.h include/%%PYTHON_VERSION%%/pythonrun.h include/%%PYTHON_VERSION%%/pythread.h @@ -73,6 +70,10 @@ lib/%%PYTHON_VERSION%%/CGIHTTPServer.pyo lib/%%PYTHON_VERSION%%/ConfigParser.py lib/%%PYTHON_VERSION%%/ConfigParser.pyc lib/%%PYTHON_VERSION%%/ConfigParser.pyo +lib/%%PYTHON_VERSION%%/Cookie.py +lib/%%PYTHON_VERSION%%/Cookie.pyc +lib/%%PYTHON_VERSION%%/Cookie.pyo +lib/%%PYTHON_VERSION%%/LICENSE.txt lib/%%PYTHON_VERSION%%/MimeWriter.py lib/%%PYTHON_VERSION%%/MimeWriter.pyc lib/%%PYTHON_VERSION%%/MimeWriter.pyo @@ -109,6 +110,9 @@ lib/%%PYTHON_VERSION%%/asynchat.pyo lib/%%PYTHON_VERSION%%/asyncore.py lib/%%PYTHON_VERSION%%/asyncore.pyc lib/%%PYTHON_VERSION%%/asyncore.pyo +lib/%%PYTHON_VERSION%%/atexit.py +lib/%%PYTHON_VERSION%%/atexit.pyc +lib/%%PYTHON_VERSION%%/atexit.pyo lib/%%PYTHON_VERSION%%/audiodev.py lib/%%PYTHON_VERSION%%/audiodev.pyc lib/%%PYTHON_VERSION%%/audiodev.pyo @@ -157,12 +161,12 @@ lib/%%PYTHON_VERSION%%/compileall.pyo lib/%%PYTHON_VERSION%%/config/Makefile lib/%%PYTHON_VERSION%%/config/Makefile.pre.in lib/%%PYTHON_VERSION%%/config/Setup +lib/%%PYTHON_VERSION%%/config/Setup.config lib/%%PYTHON_VERSION%%/config/Setup.local -lib/%%PYTHON_VERSION%%/config/Setup.thread lib/%%PYTHON_VERSION%%/config/config.c lib/%%PYTHON_VERSION%%/config/config.c.in lib/%%PYTHON_VERSION%%/config/install-sh -lib/%%PYTHON_VERSION%%/config/libpython1.6.a +lib/%%PYTHON_VERSION%%/config/lib%%PYTHON_VERSION%%.a lib/%%PYTHON_VERSION%%/config/makesetup lib/%%PYTHON_VERSION%%/config/python.o lib/%%PYTHON_VERSION%%/copy.py @@ -177,6 +181,9 @@ lib/%%PYTHON_VERSION%%/curses/__init__.pyo lib/%%PYTHON_VERSION%%/curses/ascii.py lib/%%PYTHON_VERSION%%/curses/ascii.pyc lib/%%PYTHON_VERSION%%/curses/ascii.pyo +lib/%%PYTHON_VERSION%%/curses/has_key.py +lib/%%PYTHON_VERSION%%/curses/has_key.pyc +lib/%%PYTHON_VERSION%%/curses/has_key.pyo lib/%%PYTHON_VERSION%%/curses/textpad.py lib/%%PYTHON_VERSION%%/curses/textpad.pyc lib/%%PYTHON_VERSION%%/curses/textpad.pyo @@ -497,6 +504,9 @@ lib/%%PYTHON_VERSION%%/encodings/mbcs.pyo lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo +lib/%%PYTHON_VERSION%%/encodings/undefined.py +lib/%%PYTHON_VERSION%%/encodings/undefined.pyc +lib/%%PYTHON_VERSION%%/encodings/undefined.pyo lib/%%PYTHON_VERSION%%/encodings/unicode_escape.py lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyc lib/%%PYTHON_VERSION%%/encodings/unicode_escape.pyo @@ -515,9 +525,6 @@ lib/%%PYTHON_VERSION%%/encodings/utf_16_le.pyo lib/%%PYTHON_VERSION%%/encodings/utf_8.py lib/%%PYTHON_VERSION%%/encodings/utf_8.pyc lib/%%PYTHON_VERSION%%/encodings/utf_8.pyo -lib/%%PYTHON_VERSION%%/exceptions.py -lib/%%PYTHON_VERSION%%/exceptions.pyc -lib/%%PYTHON_VERSION%%/exceptions.pyo lib/%%PYTHON_VERSION%%/filecmp.py lib/%%PYTHON_VERSION%%/filecmp.pyc lib/%%PYTHON_VERSION%%/filecmp.pyo @@ -542,6 +549,9 @@ lib/%%PYTHON_VERSION%%/getopt.pyo lib/%%PYTHON_VERSION%%/getpass.py lib/%%PYTHON_VERSION%%/getpass.pyc lib/%%PYTHON_VERSION%%/getpass.pyo +lib/%%PYTHON_VERSION%%/gettext.py +lib/%%PYTHON_VERSION%%/gettext.pyc +lib/%%PYTHON_VERSION%%/gettext.pyo lib/%%PYTHON_VERSION%%/glob.py lib/%%PYTHON_VERSION%%/glob.pyc lib/%%PYTHON_VERSION%%/glob.pyo @@ -581,7 +591,6 @@ lib/%%PYTHON_VERSION%%/knee.pyo lib/%%PYTHON_VERSION%%/lib-dynload/_cursesmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so -lib/%%PYTHON_VERSION%%/lib-dynload/bsddbmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so lib/%%PYTHON_VERSION%%/lib-dynload/dbmmodule.so @@ -589,6 +598,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/dlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpectlmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/fpetestmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so +@comment lib/%%PYTHON_VERSION%%/lib-dynload/linuxaudiodev.so lib/%%PYTHON_VERSION%%/lib-dynload/md5module.so lib/%%PYTHON_VERSION%%/lib-dynload/newmodule.so lib/%%PYTHON_VERSION%%/lib-dynload/nismodule.so @@ -914,6 +924,9 @@ lib/%%PYTHON_VERSION%%/smtplib.pyo lib/%%PYTHON_VERSION%%/sndhdr.py lib/%%PYTHON_VERSION%%/sndhdr.pyc lib/%%PYTHON_VERSION%%/sndhdr.pyo +lib/%%PYTHON_VERSION%%/socket.py +lib/%%PYTHON_VERSION%%/socket.pyc +lib/%%PYTHON_VERSION%%/socket.pyo lib/%%PYTHON_VERSION%%/sre.py lib/%%PYTHON_VERSION%%/sre.pyc lib/%%PYTHON_VERSION%%/sre.pyo @@ -959,6 +972,7 @@ lib/%%PYTHON_VERSION%%/telnetlib.pyo lib/%%PYTHON_VERSION%%/tempfile.py lib/%%PYTHON_VERSION%%/tempfile.pyc lib/%%PYTHON_VERSION%%/tempfile.pyo +lib/%%PYTHON_VERSION%%/test/README lib/%%PYTHON_VERSION%%/test/__init__.py lib/%%PYTHON_VERSION%%/test/__init__.pyc lib/%%PYTHON_VERSION%%/test/__init__.pyo @@ -968,47 +982,74 @@ lib/%%PYTHON_VERSION%%/test/autotest.pyc lib/%%PYTHON_VERSION%%/test/autotest.pyo lib/%%PYTHON_VERSION%%/test/greyrgb.uue lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter +lib/%%PYTHON_VERSION%%/test/output/test_StringIO lib/%%PYTHON_VERSION%%/test/output/test_al lib/%%PYTHON_VERSION%%/test/output/test_array +lib/%%PYTHON_VERSION%%/test/output/test_atexit lib/%%PYTHON_VERSION%%/test/output/test_audioop +lib/%%PYTHON_VERSION%%/test/output/test_augassign lib/%%PYTHON_VERSION%%/test/output/test_binascii lib/%%PYTHON_VERSION%%/test/output/test_binhex lib/%%PYTHON_VERSION%%/test/output/test_bsddb lib/%%PYTHON_VERSION%%/test/output/test_builtin lib/%%PYTHON_VERSION%%/test/output/test_cd +lib/%%PYTHON_VERSION%%/test/output/test_cfgparser +lib/%%PYTHON_VERSION%%/test/output/test_cgi lib/%%PYTHON_VERSION%%/test/output/test_cl +lib/%%PYTHON_VERSION%%/test/output/test_class lib/%%PYTHON_VERSION%%/test/output/test_cmath +lib/%%PYTHON_VERSION%%/test/output/test_compile lib/%%PYTHON_VERSION%%/test/output/test_contains +lib/%%PYTHON_VERSION%%/test/output/test_cookie +lib/%%PYTHON_VERSION%%/test/output/test_copy_reg lib/%%PYTHON_VERSION%%/test/output/test_cpickle lib/%%PYTHON_VERSION%%/test/output/test_crypt lib/%%PYTHON_VERSION%%/test/output/test_dbm lib/%%PYTHON_VERSION%%/test/output/test_dl +lib/%%PYTHON_VERSION%%/test/output/test_dospath lib/%%PYTHON_VERSION%%/test/output/test_errno lib/%%PYTHON_VERSION%%/test/output/test_exceptions lib/%%PYTHON_VERSION%%/test/output/test_extcall lib/%%PYTHON_VERSION%%/test/output/test_fcntl +lib/%%PYTHON_VERSION%%/test/output/test_file lib/%%PYTHON_VERSION%%/test/output/test_fork1 +lib/%%PYTHON_VERSION%%/test/output/test_format +lib/%%PYTHON_VERSION%%/test/output/test_gc lib/%%PYTHON_VERSION%%/test/output/test_gdbm +lib/%%PYTHON_VERSION%%/test/output/test_getopt +lib/%%PYTHON_VERSION%%/test/output/test_gettext lib/%%PYTHON_VERSION%%/test/output/test_gl lib/%%PYTHON_VERSION%%/test/output/test_grammar lib/%%PYTHON_VERSION%%/test/output/test_grp lib/%%PYTHON_VERSION%%/test/output/test_gzip +lib/%%PYTHON_VERSION%%/test/output/test_hash lib/%%PYTHON_VERSION%%/test/output/test_imageop lib/%%PYTHON_VERSION%%/test/output/test_imgfile +lib/%%PYTHON_VERSION%%/test/output/test_import +lib/%%PYTHON_VERSION%%/test/output/test_largefile +lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev lib/%%PYTHON_VERSION%%/test/output/test_long +lib/%%PYTHON_VERSION%%/test/output/test_longexp lib/%%PYTHON_VERSION%%/test/output/test_math lib/%%PYTHON_VERSION%%/test/output/test_md5 +lib/%%PYTHON_VERSION%%/test/output/test_mimetools +lib/%%PYTHON_VERSION%%/test/output/test_minidom lib/%%PYTHON_VERSION%%/test/output/test_mmap lib/%%PYTHON_VERSION%%/test/output/test_new lib/%%PYTHON_VERSION%%/test/output/test_nis lib/%%PYTHON_VERSION%%/test/output/test_ntpath lib/%%PYTHON_VERSION%%/test/output/test_opcodes +lib/%%PYTHON_VERSION%%/test/output/test_openpty lib/%%PYTHON_VERSION%%/test/output/test_operations lib/%%PYTHON_VERSION%%/test/output/test_operator +lib/%%PYTHON_VERSION%%/test/output/test_parser lib/%%PYTHON_VERSION%%/test/output/test_pickle lib/%%PYTHON_VERSION%%/test/output/test_pkg +lib/%%PYTHON_VERSION%%/test/output/test_poll lib/%%PYTHON_VERSION%%/test/output/test_popen2 +lib/%%PYTHON_VERSION%%/test/output/test_posixpath lib/%%PYTHON_VERSION%%/test/output/test_pow +lib/%%PYTHON_VERSION%%/test/output/test_pty lib/%%PYTHON_VERSION%%/test/output/test_pwd lib/%%PYTHON_VERSION%%/test/output/test_pyexpat lib/%%PYTHON_VERSION%%/test/output/test_re @@ -1016,6 +1057,7 @@ lib/%%PYTHON_VERSION%%/test/output/test_regex lib/%%PYTHON_VERSION%%/test/output/test_rfc822 lib/%%PYTHON_VERSION%%/test/output/test_rgbimg lib/%%PYTHON_VERSION%%/test/output/test_rotor +lib/%%PYTHON_VERSION%%/test/output/test_sax lib/%%PYTHON_VERSION%%/test/output/test_select lib/%%PYTHON_VERSION%%/test/output/test_sha lib/%%PYTHON_VERSION%%/test/output/test_signal @@ -1031,12 +1073,16 @@ lib/%%PYTHON_VERSION%%/test/output/test_time lib/%%PYTHON_VERSION%%/test/output/test_timing lib/%%PYTHON_VERSION%%/test/output/test_tokenize lib/%%PYTHON_VERSION%%/test/output/test_types +lib/%%PYTHON_VERSION%%/test/output/test_ucn lib/%%PYTHON_VERSION%%/test/output/test_unicode lib/%%PYTHON_VERSION%%/test/output/test_unicodedata lib/%%PYTHON_VERSION%%/test/output/test_unpack +lib/%%PYTHON_VERSION%%/test/output/test_urllib +lib/%%PYTHON_VERSION%%/test/output/test_urlparse lib/%%PYTHON_VERSION%%/test/output/test_userdict lib/%%PYTHON_VERSION%%/test/output/test_userlist lib/%%PYTHON_VERSION%%/test/output/test_userstring +lib/%%PYTHON_VERSION%%/test/output/test_wave lib/%%PYTHON_VERSION%%/test/output/test_winreg lib/%%PYTHON_VERSION%%/test/output/test_winsound lib/%%PYTHON_VERSION%%/test/output/test_xmllib @@ -1060,18 +1106,32 @@ lib/%%PYTHON_VERSION%%/test/reperf.pyo lib/%%PYTHON_VERSION%%/test/sortperf.py lib/%%PYTHON_VERSION%%/test/sortperf.pyc lib/%%PYTHON_VERSION%%/test/sortperf.pyo +lib/%%PYTHON_VERSION%%/test/string_tests.py +lib/%%PYTHON_VERSION%%/test/string_tests.pyc +lib/%%PYTHON_VERSION%%/test/string_tests.pyo +lib/%%PYTHON_VERSION%%/test/test.xml +lib/%%PYTHON_VERSION%%/test/test.xml.out lib/%%PYTHON_VERSION%%/test/test_MimeWriter.py lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyc lib/%%PYTHON_VERSION%%/test/test_MimeWriter.pyo +lib/%%PYTHON_VERSION%%/test/test_StringIO.py +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyc +lib/%%PYTHON_VERSION%%/test/test_StringIO.pyo lib/%%PYTHON_VERSION%%/test/test_al.py lib/%%PYTHON_VERSION%%/test/test_al.pyc lib/%%PYTHON_VERSION%%/test/test_al.pyo lib/%%PYTHON_VERSION%%/test/test_array.py lib/%%PYTHON_VERSION%%/test/test_array.pyc lib/%%PYTHON_VERSION%%/test/test_array.pyo +lib/%%PYTHON_VERSION%%/test/test_atexit.py +lib/%%PYTHON_VERSION%%/test/test_atexit.pyc +lib/%%PYTHON_VERSION%%/test/test_atexit.pyo lib/%%PYTHON_VERSION%%/test/test_audioop.py lib/%%PYTHON_VERSION%%/test/test_audioop.pyc lib/%%PYTHON_VERSION%%/test/test_audioop.pyo +lib/%%PYTHON_VERSION%%/test/test_augassign.py +lib/%%PYTHON_VERSION%%/test/test_augassign.pyc +lib/%%PYTHON_VERSION%%/test/test_augassign.pyo lib/%%PYTHON_VERSION%%/test/test_b1.py lib/%%PYTHON_VERSION%%/test/test_b1.pyc lib/%%PYTHON_VERSION%%/test/test_b1.pyo @@ -1093,15 +1153,33 @@ lib/%%PYTHON_VERSION%%/test/test_builtin.pyo lib/%%PYTHON_VERSION%%/test/test_cd.py lib/%%PYTHON_VERSION%%/test/test_cd.pyc lib/%%PYTHON_VERSION%%/test/test_cd.pyo +lib/%%PYTHON_VERSION%%/test/test_cfgparser.py +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyc +lib/%%PYTHON_VERSION%%/test/test_cfgparser.pyo +lib/%%PYTHON_VERSION%%/test/test_cgi.py +lib/%%PYTHON_VERSION%%/test/test_cgi.pyc +lib/%%PYTHON_VERSION%%/test/test_cgi.pyo lib/%%PYTHON_VERSION%%/test/test_cl.py lib/%%PYTHON_VERSION%%/test/test_cl.pyc lib/%%PYTHON_VERSION%%/test/test_cl.pyo +lib/%%PYTHON_VERSION%%/test/test_class.py +lib/%%PYTHON_VERSION%%/test/test_class.pyc +lib/%%PYTHON_VERSION%%/test/test_class.pyo lib/%%PYTHON_VERSION%%/test/test_cmath.py lib/%%PYTHON_VERSION%%/test/test_cmath.pyc lib/%%PYTHON_VERSION%%/test/test_cmath.pyo +lib/%%PYTHON_VERSION%%/test/test_compile.py +lib/%%PYTHON_VERSION%%/test/test_compile.pyc +lib/%%PYTHON_VERSION%%/test/test_compile.pyo lib/%%PYTHON_VERSION%%/test/test_contains.py lib/%%PYTHON_VERSION%%/test/test_contains.pyc lib/%%PYTHON_VERSION%%/test/test_contains.pyo +lib/%%PYTHON_VERSION%%/test/test_cookie.py +lib/%%PYTHON_VERSION%%/test/test_cookie.pyc +lib/%%PYTHON_VERSION%%/test/test_cookie.pyo +lib/%%PYTHON_VERSION%%/test/test_copy_reg.py +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyc +lib/%%PYTHON_VERSION%%/test/test_copy_reg.pyo lib/%%PYTHON_VERSION%%/test/test_cpickle.py lib/%%PYTHON_VERSION%%/test/test_cpickle.pyc lib/%%PYTHON_VERSION%%/test/test_cpickle.pyo @@ -1114,6 +1192,9 @@ lib/%%PYTHON_VERSION%%/test/test_dbm.pyo lib/%%PYTHON_VERSION%%/test/test_dl.py lib/%%PYTHON_VERSION%%/test/test_dl.pyc lib/%%PYTHON_VERSION%%/test/test_dl.pyo +lib/%%PYTHON_VERSION%%/test/test_dospath.py +lib/%%PYTHON_VERSION%%/test/test_dospath.pyc +lib/%%PYTHON_VERSION%%/test/test_dospath.pyo lib/%%PYTHON_VERSION%%/test/test_errno.py lib/%%PYTHON_VERSION%%/test/test_errno.pyc lib/%%PYTHON_VERSION%%/test/test_errno.pyo @@ -1126,12 +1207,27 @@ lib/%%PYTHON_VERSION%%/test/test_extcall.pyo lib/%%PYTHON_VERSION%%/test/test_fcntl.py lib/%%PYTHON_VERSION%%/test/test_fcntl.pyc lib/%%PYTHON_VERSION%%/test/test_fcntl.pyo +lib/%%PYTHON_VERSION%%/test/test_file.py +lib/%%PYTHON_VERSION%%/test/test_file.pyc +lib/%%PYTHON_VERSION%%/test/test_file.pyo lib/%%PYTHON_VERSION%%/test/test_fork1.py lib/%%PYTHON_VERSION%%/test/test_fork1.pyc lib/%%PYTHON_VERSION%%/test/test_fork1.pyo +lib/%%PYTHON_VERSION%%/test/test_format.py +lib/%%PYTHON_VERSION%%/test/test_format.pyc +lib/%%PYTHON_VERSION%%/test/test_format.pyo +lib/%%PYTHON_VERSION%%/test/test_gc.py +lib/%%PYTHON_VERSION%%/test/test_gc.pyc +lib/%%PYTHON_VERSION%%/test/test_gc.pyo lib/%%PYTHON_VERSION%%/test/test_gdbm.py lib/%%PYTHON_VERSION%%/test/test_gdbm.pyc lib/%%PYTHON_VERSION%%/test/test_gdbm.pyo +lib/%%PYTHON_VERSION%%/test/test_getopt.py +lib/%%PYTHON_VERSION%%/test/test_getopt.pyc +lib/%%PYTHON_VERSION%%/test/test_getopt.pyo +lib/%%PYTHON_VERSION%%/test/test_gettext.py +lib/%%PYTHON_VERSION%%/test/test_gettext.pyc +lib/%%PYTHON_VERSION%%/test/test_gettext.pyo lib/%%PYTHON_VERSION%%/test/test_gl.py lib/%%PYTHON_VERSION%%/test/test_gl.pyc lib/%%PYTHON_VERSION%%/test/test_gl.pyo @@ -1144,21 +1240,42 @@ lib/%%PYTHON_VERSION%%/test/test_grp.pyo lib/%%PYTHON_VERSION%%/test/test_gzip.py lib/%%PYTHON_VERSION%%/test/test_gzip.pyc lib/%%PYTHON_VERSION%%/test/test_gzip.pyo +lib/%%PYTHON_VERSION%%/test/test_hash.py +lib/%%PYTHON_VERSION%%/test/test_hash.pyc +lib/%%PYTHON_VERSION%%/test/test_hash.pyo lib/%%PYTHON_VERSION%%/test/test_imageop.py lib/%%PYTHON_VERSION%%/test/test_imageop.pyc lib/%%PYTHON_VERSION%%/test/test_imageop.pyo lib/%%PYTHON_VERSION%%/test/test_imgfile.py lib/%%PYTHON_VERSION%%/test/test_imgfile.pyc lib/%%PYTHON_VERSION%%/test/test_imgfile.pyo +lib/%%PYTHON_VERSION%%/test/test_import.py +lib/%%PYTHON_VERSION%%/test/test_import.pyc +lib/%%PYTHON_VERSION%%/test/test_import.pyo +lib/%%PYTHON_VERSION%%/test/test_largefile.py +lib/%%PYTHON_VERSION%%/test/test_largefile.pyc +lib/%%PYTHON_VERSION%%/test/test_largefile.pyo +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.py +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyc +lib/%%PYTHON_VERSION%%/test/test_linuxaudiodev.pyo lib/%%PYTHON_VERSION%%/test/test_long.py lib/%%PYTHON_VERSION%%/test/test_long.pyc lib/%%PYTHON_VERSION%%/test/test_long.pyo +lib/%%PYTHON_VERSION%%/test/test_longexp.py +lib/%%PYTHON_VERSION%%/test/test_longexp.pyc +lib/%%PYTHON_VERSION%%/test/test_longexp.pyo lib/%%PYTHON_VERSION%%/test/test_math.py lib/%%PYTHON_VERSION%%/test/test_math.pyc lib/%%PYTHON_VERSION%%/test/test_math.pyo lib/%%PYTHON_VERSION%%/test/test_md5.py lib/%%PYTHON_VERSION%%/test/test_md5.pyc lib/%%PYTHON_VERSION%%/test/test_md5.pyo +lib/%%PYTHON_VERSION%%/test/test_mimetools.py +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyc +lib/%%PYTHON_VERSION%%/test/test_mimetools.pyo +lib/%%PYTHON_VERSION%%/test/test_minidom.py +lib/%%PYTHON_VERSION%%/test/test_minidom.pyc +lib/%%PYTHON_VERSION%%/test/test_minidom.pyo lib/%%PYTHON_VERSION%%/test/test_mmap.py lib/%%PYTHON_VERSION%%/test/test_mmap.pyc lib/%%PYTHON_VERSION%%/test/test_mmap.pyo @@ -1174,24 +1291,39 @@ lib/%%PYTHON_VERSION%%/test/test_ntpath.pyo lib/%%PYTHON_VERSION%%/test/test_opcodes.py lib/%%PYTHON_VERSION%%/test/test_opcodes.pyc lib/%%PYTHON_VERSION%%/test/test_opcodes.pyo +lib/%%PYTHON_VERSION%%/test/test_openpty.py +lib/%%PYTHON_VERSION%%/test/test_openpty.pyc +lib/%%PYTHON_VERSION%%/test/test_openpty.pyo lib/%%PYTHON_VERSION%%/test/test_operations.py lib/%%PYTHON_VERSION%%/test/test_operations.pyc lib/%%PYTHON_VERSION%%/test/test_operations.pyo lib/%%PYTHON_VERSION%%/test/test_operator.py lib/%%PYTHON_VERSION%%/test/test_operator.pyc lib/%%PYTHON_VERSION%%/test/test_operator.pyo +lib/%%PYTHON_VERSION%%/test/test_parser.py +lib/%%PYTHON_VERSION%%/test/test_parser.pyc +lib/%%PYTHON_VERSION%%/test/test_parser.pyo lib/%%PYTHON_VERSION%%/test/test_pickle.py lib/%%PYTHON_VERSION%%/test/test_pickle.pyc lib/%%PYTHON_VERSION%%/test/test_pickle.pyo lib/%%PYTHON_VERSION%%/test/test_pkg.py lib/%%PYTHON_VERSION%%/test/test_pkg.pyc lib/%%PYTHON_VERSION%%/test/test_pkg.pyo +lib/%%PYTHON_VERSION%%/test/test_poll.py +lib/%%PYTHON_VERSION%%/test/test_poll.pyc +lib/%%PYTHON_VERSION%%/test/test_poll.pyo lib/%%PYTHON_VERSION%%/test/test_popen2.py lib/%%PYTHON_VERSION%%/test/test_popen2.pyc lib/%%PYTHON_VERSION%%/test/test_popen2.pyo +lib/%%PYTHON_VERSION%%/test/test_posixpath.py +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyc +lib/%%PYTHON_VERSION%%/test/test_posixpath.pyo lib/%%PYTHON_VERSION%%/test/test_pow.py lib/%%PYTHON_VERSION%%/test/test_pow.pyc lib/%%PYTHON_VERSION%%/test/test_pow.pyo +lib/%%PYTHON_VERSION%%/test/test_pty.py +lib/%%PYTHON_VERSION%%/test/test_pty.pyc +lib/%%PYTHON_VERSION%%/test/test_pty.pyo lib/%%PYTHON_VERSION%%/test/test_pwd.py lib/%%PYTHON_VERSION%%/test/test_pwd.pyc lib/%%PYTHON_VERSION%%/test/test_pwd.pyo @@ -1213,6 +1345,9 @@ lib/%%PYTHON_VERSION%%/test/test_rgbimg.pyo lib/%%PYTHON_VERSION%%/test/test_rotor.py lib/%%PYTHON_VERSION%%/test/test_rotor.pyc lib/%%PYTHON_VERSION%%/test/test_rotor.pyo +lib/%%PYTHON_VERSION%%/test/test_sax.py +lib/%%PYTHON_VERSION%%/test/test_sax.pyc +lib/%%PYTHON_VERSION%%/test/test_sax.pyo lib/%%PYTHON_VERSION%%/test/test_select.py lib/%%PYTHON_VERSION%%/test/test_select.pyc lib/%%PYTHON_VERSION%%/test/test_select.pyo @@ -1261,6 +1396,9 @@ lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo lib/%%PYTHON_VERSION%%/test/test_types.py lib/%%PYTHON_VERSION%%/test/test_types.pyc lib/%%PYTHON_VERSION%%/test/test_types.pyo +lib/%%PYTHON_VERSION%%/test/test_ucn.py +lib/%%PYTHON_VERSION%%/test/test_ucn.pyc +lib/%%PYTHON_VERSION%%/test/test_ucn.pyo lib/%%PYTHON_VERSION%%/test/test_unicode.py lib/%%PYTHON_VERSION%%/test/test_unicode.pyc lib/%%PYTHON_VERSION%%/test/test_unicode.pyo @@ -1270,6 +1408,12 @@ lib/%%PYTHON_VERSION%%/test/test_unicodedata.pyo lib/%%PYTHON_VERSION%%/test/test_unpack.py lib/%%PYTHON_VERSION%%/test/test_unpack.pyc lib/%%PYTHON_VERSION%%/test/test_unpack.pyo +lib/%%PYTHON_VERSION%%/test/test_urllib.py +lib/%%PYTHON_VERSION%%/test/test_urllib.pyc +lib/%%PYTHON_VERSION%%/test/test_urllib.pyo +lib/%%PYTHON_VERSION%%/test/test_urlparse.py +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyc +lib/%%PYTHON_VERSION%%/test/test_urlparse.pyo lib/%%PYTHON_VERSION%%/test/test_userdict.py lib/%%PYTHON_VERSION%%/test/test_userdict.pyc lib/%%PYTHON_VERSION%%/test/test_userdict.pyo @@ -1279,6 +1423,9 @@ lib/%%PYTHON_VERSION%%/test/test_userlist.pyo lib/%%PYTHON_VERSION%%/test/test_userstring.py lib/%%PYTHON_VERSION%%/test/test_userstring.pyc lib/%%PYTHON_VERSION%%/test/test_userstring.pyo +lib/%%PYTHON_VERSION%%/test/test_wave.py +lib/%%PYTHON_VERSION%%/test/test_wave.pyc +lib/%%PYTHON_VERSION%%/test/test_wave.pyo lib/%%PYTHON_VERSION%%/test/test_winreg.py lib/%%PYTHON_VERSION%%/test/test_winreg.pyc lib/%%PYTHON_VERSION%%/test/test_winreg.pyo @@ -1345,6 +1492,9 @@ lib/%%PYTHON_VERSION%%/uu.pyo lib/%%PYTHON_VERSION%%/wave.py lib/%%PYTHON_VERSION%%/wave.pyc lib/%%PYTHON_VERSION%%/wave.pyo +lib/%%PYTHON_VERSION%%/webbrowser.py +lib/%%PYTHON_VERSION%%/webbrowser.pyc +lib/%%PYTHON_VERSION%%/webbrowser.pyo lib/%%PYTHON_VERSION%%/whichdb.py lib/%%PYTHON_VERSION%%/whichdb.pyc lib/%%PYTHON_VERSION%%/whichdb.pyo @@ -1354,15 +1504,53 @@ lib/%%PYTHON_VERSION%%/whrandom.pyo lib/%%PYTHON_VERSION%%/xdrlib.py lib/%%PYTHON_VERSION%%/xdrlib.pyc lib/%%PYTHON_VERSION%%/xdrlib.pyo +lib/%%PYTHON_VERSION%%/xml/__init__.py +lib/%%PYTHON_VERSION%%/xml/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/__init__.py +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/dom/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/dom/minidom.py +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/minidom.pyo +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.py +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyc +lib/%%PYTHON_VERSION%%/xml/dom/pulldom.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.py +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/parsers/expat.py +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyc +lib/%%PYTHON_VERSION%%/xml/parsers/expat.pyo +lib/%%PYTHON_VERSION%%/xml/sax/__init__.py +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyc +lib/%%PYTHON_VERSION%%/xml/sax/__init__.pyo +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.py +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyc +lib/%%PYTHON_VERSION%%/xml/sax/_exceptions.pyo +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.py +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/expatreader.pyo +lib/%%PYTHON_VERSION%%/xml/sax/handler.py +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyc +lib/%%PYTHON_VERSION%%/xml/sax/handler.pyo +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.py +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyc +lib/%%PYTHON_VERSION%%/xml/sax/saxutils.pyo +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.py +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyc +lib/%%PYTHON_VERSION%%/xml/sax/xmlreader.pyo lib/%%PYTHON_VERSION%%/xmllib.py lib/%%PYTHON_VERSION%%/xmllib.pyc lib/%%PYTHON_VERSION%%/xmllib.pyo lib/%%PYTHON_VERSION%%/zipfile.py lib/%%PYTHON_VERSION%%/zipfile.pyc lib/%%PYTHON_VERSION%%/zipfile.pyo -share/doc/python/LICENSE share/emacs/site-lisp/python-mode.el -@dirrm share/doc/python +@dirrm lib/%%PYTHON_VERSION%%/xml/parsers +@dirrm lib/%%PYTHON_VERSION%%/xml/sax +@dirrm lib/%%PYTHON_VERSION%%/xml/dom +@dirrm lib/%%PYTHON_VERSION%%/xml @dirrm lib/%%PYTHON_VERSION%%/test/output @dirrm lib/%%PYTHON_VERSION%%/test @dirrm lib/%%PYTHON_VERSION%%/site-packages diff --git a/lang/python32/pkg-plist.Tools b/lang/python32/pkg-plist.Tools index cfdb6903e778..17f0ba4a305e 100644 --- a/lang/python32/pkg-plist.Tools +++ b/lang/python32/pkg-plist.Tools @@ -21,18 +21,20 @@ lib/%%PYTHON_VERSION%%/Tools/compiler/compile.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/__init__.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/ast.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/consts.py +lib/%%PYTHON_VERSION%%/Tools/compiler/dumppyc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/misc.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pyassem.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/pycodegen.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/transformer.py lib/%%PYTHON_VERSION%%/Tools/compiler/compiler/visitor.py lib/%%PYTHON_VERSION%%/Tools/compiler/demo.py +lib/%%PYTHON_VERSION%%/Tools/compiler/regrtest.py +lib/%%PYTHON_VERSION%%/Tools/compiler/setup.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/README lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqconf.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqcust.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqw.py lib/%%PYTHON_VERSION%%/Tools/faqwiz/faqwiz.py -lib/%%PYTHON_VERSION%%/Tools/freeze/.cvsignore lib/%%PYTHON_VERSION%%/Tools/freeze/README lib/%%PYTHON_VERSION%%/Tools/freeze/bkfile.py lib/%%PYTHON_VERSION%%/Tools/freeze/checkextensions.py @@ -47,6 +49,7 @@ lib/%%PYTHON_VERSION%%/Tools/freeze/modulefinder.py lib/%%PYTHON_VERSION%%/Tools/freeze/parsesetup.py lib/%%PYTHON_VERSION%%/Tools/freeze/win32.html lib/%%PYTHON_VERSION%%/Tools/freeze/winmakemakefile.py +lib/%%PYTHON_VERSION%%/Tools/i18n/msgfmt.py lib/%%PYTHON_VERSION%%/Tools/i18n/pygettext.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoExpand.py lib/%%PYTHON_VERSION%%/Tools/idle/AutoIndent.py @@ -200,14 +203,18 @@ lib/%%PYTHON_VERSION%%/Tools/scripts/pathfix.py lib/%%PYTHON_VERSION%%/Tools/scripts/pdeps.py lib/%%PYTHON_VERSION%%/Tools/scripts/pindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/ptags.py +lib/%%PYTHON_VERSION%%/Tools/scripts/redemo.py +lib/%%PYTHON_VERSION%%/Tools/scripts/reindent.py lib/%%PYTHON_VERSION%%/Tools/scripts/rgrep.py lib/%%PYTHON_VERSION%%/Tools/scripts/suff.py lib/%%PYTHON_VERSION%%/Tools/scripts/sum5.py lib/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py +lib/%%PYTHON_VERSION%%/Tools/scripts/trace.py lib/%%PYTHON_VERSION%%/Tools/scripts/treesync.py lib/%%PYTHON_VERSION%%/Tools/scripts/untabify.py lib/%%PYTHON_VERSION%%/Tools/scripts/which.py lib/%%PYTHON_VERSION%%/Tools/scripts/xxci.py +lib/%%PYTHON_VERSION%%/Tools/unicode/makeunicodedata.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/README lib/%%PYTHON_VERSION%%/Tools/versioncheck/_checkversion.py lib/%%PYTHON_VERSION%%/Tools/versioncheck/checkversions.py @@ -224,6 +231,7 @@ lib/%%PYTHON_VERSION%%/Tools/world/world @dirrm lib/%%PYTHON_VERSION%%/Tools/world @dirrm lib/%%PYTHON_VERSION%%/Tools/webchecker @dirrm lib/%%PYTHON_VERSION%%/Tools/versioncheck +@dirrm lib/%%PYTHON_VERSION%%/Tools/unicode @dirrm lib/%%PYTHON_VERSION%%/Tools/scripts @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche/X @dirrm lib/%%PYTHON_VERSION%%/Tools/pynche |