Upgrade to 1.5.2p2.

3 files changed, 93 insertions, 52 deletions

diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index b23109fec8eb..74e6317ef416 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    python-doc
-# Version required:     1.5.2
+# Version required:     1.5.2p2
 # Date created:         12 May 1999
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
@@ -9,8 +9,8 @@
 DISTNAME=	${DOCFORMAT}-${VERSION}
 PKGNAME=        python-doc-${DOCFORMAT}-${VERSION}
 CATEGORIES=	lang python
-MASTER_SITES=	ftp://www.python.org/pub/python/doc/1.5.2/ \
-		ftp://ftp.cwi.nl/pub/python/doc/1.5.2/
+MASTER_SITES=	http://www.python.org/ftp/python/doc/ \
+		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/doc/1.5.2p2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
@@ -19,7 +19,7 @@ DIST_SUBDIR=	python
 NO_BUILD=	yes
 PLIST=		${PKGDIR}/PLIST_${DOCFORMAT}
 
-VERSION=	1.5.2
+VERSION=	1.5.2p2
 DOCDIR=		${PREFIX}/share/doc/python
 
 DOCFORMAT?=	html
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 31a554974a53..266dedd6e5f8 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,5 +1,5 @@
-MD5 (python/html-1.5.2.tgz) = ca863b3aac948f9c564ce1763a668f06
-MD5 (python/pdf-a4-1.5.2.tgz) = 368879077d6c6bdf751070d455aaf30e
-MD5 (python/pdf-letter-1.5.2.tgz) = f659a46104d56a5589d75c91569227be
-MD5 (python/postscript-a4-1.5.2.tgz) = b64463b9b769ffc23b5e0ac40af75b72
-MD5 (python/postscript-letter-1.5.2.tgz) = b8ba4d3c6bb875a5921fcf1a94b459cf
+MD5 (python/html-1.5.2p2.tgz) = 401e1cc5cfb06377dba7d2a5640d286d
+MD5 (python/pdf-a4-1.5.2p2.tgz) = 02f623eef715ceff5e1af49ce6f5560d
+MD5 (python/pdf-letter-1.5.2p2.tgz) = d23c6c67102981488444e1db1b0f300b
+MD5 (python/postscript-a4-1.5.2p2.tgz) = ef422d240719eead77648ef393677763
+MD5 (python/postscript-letter-1.5.2p2.tgz) = 4c6d0b0153f3fcd5b229e61c412463e0
diff --git a/lang/python-doc-html/pkg-plist_html b/lang/python-doc-html/pkg-plist_html
index 1590f7a97fde..386bc1710cde 100644
--- a/lang/python-doc-html/pkg-plist_html
+++ b/lang/python-doc-html/pkg-plist_html
@@ -2,12 +2,14 @@ share/doc/python/api/about.html
 share/doc/python/api/abstract.html
 share/doc/python/api/api.css
 share/doc/python/api/api.html
+share/doc/python/api/buffer-structs.html
+share/doc/python/api/bufferObjects.html
 share/doc/python/api/cObjects.html
+share/doc/python/api/common-structs.html
 share/doc/python/api/complexObjects.html
 share/doc/python/api/concrete.html
 share/doc/python/api/contents.html
 share/doc/python/api/countingRefs.html
-share/doc/python/api/debugging.html
 share/doc/python/api/dictObjects.html
 share/doc/python/api/embedding.html
 share/doc/python/api/exceptionHandling.html
@@ -26,11 +28,17 @@ share/doc/python/api/intro.html
 share/doc/python/api/listObjects.html
 share/doc/python/api/longObjects.html
 share/doc/python/api/mapObjects.html
+share/doc/python/api/mapping-structs.html
 share/doc/python/api/mapping.html
+share/doc/python/api/memory.html
+share/doc/python/api/memoryExamples.html
+share/doc/python/api/memoryInterface.html
+share/doc/python/api/memoryOverview.html
 share/doc/python/api/moduleObjects.html
 share/doc/python/api/newTypes.html
-share/doc/python/api/node24.html
+share/doc/python/api/node14.html
 share/doc/python/api/noneObject.html
+share/doc/python/api/number-structs.html
 share/doc/python/api/number.html
 share/doc/python/api/numericObjects.html
 share/doc/python/api/object.html
@@ -38,8 +46,8 @@ share/doc/python/api/objects.html
 share/doc/python/api/os.html
 share/doc/python/api/otherObjects.html
 share/doc/python/api/processControl.html
-share/doc/python/api/refcountDetails.html
 share/doc/python/api/refcounts.html
+share/doc/python/api/sequence-structs.html
 share/doc/python/api/sequence.html
 share/doc/python/api/sequenceObjects.html
 share/doc/python/api/standardExceptions.html
@@ -61,16 +69,18 @@ share/doc/python/doc/index.html
 share/doc/python/doc/indexing.html
 share/doc/python/doc/info-units.html
 share/doc/python/doc/latex-primer.html
+share/doc/python/doc/meta-info.html
 share/doc/python/doc/node10.html
 share/doc/python/doc/node11.html
-share/doc/python/doc/node14.html
-share/doc/python/doc/node15.html
+share/doc/python/doc/node12.html
+share/doc/python/doc/node13.html
 share/doc/python/doc/node16.html
 share/doc/python/doc/node17.html
+share/doc/python/doc/node18.html
+share/doc/python/doc/node19.html
 share/doc/python/doc/node2.html
 share/doc/python/doc/node3.html
 share/doc/python/doc/node6.html
-share/doc/python/doc/node8.html
 share/doc/python/doc/node9.html
 share/doc/python/doc/references.html
 share/doc/python/doc/structured.html
@@ -142,21 +152,21 @@ share/doc/python/lib/SMTP-example.html
 share/doc/python/lib/SMTP-objects.html
 share/doc/python/lib/Signal_Example.html
 share/doc/python/lib/Socket_Example.html
+share/doc/python/lib/Urllib_Examples.html
 share/doc/python/lib/Using_the_cgi_module.html
+share/doc/python/lib/Wave-read-objects.html
+share/doc/python/lib/Wave-write-objects.html
 share/doc/python/lib/about.html
 share/doc/python/lib/addresslist-objects.html
 share/doc/python/lib/al-config-objects.html
 share/doc/python/lib/al-port-objects.html
 share/doc/python/lib/allos.html
+share/doc/python/lib/asyncore-example.html
+share/doc/python/lib/au-read-objects.html
+share/doc/python/lib/au-write-objects.html
 share/doc/python/lib/audio-device-objects.html
 share/doc/python/lib/binhex-notes.html
 share/doc/python/lib/bisect-example.html
-share/doc/python/lib/bitstring-ops.html
-share/doc/python/lib/bltin-code-objects.html
-share/doc/python/lib/bltin-ellipsis-object.html
-share/doc/python/lib/bltin-file-objects.html
-share/doc/python/lib/bltin-null-object.html
-share/doc/python/lib/bltin-type-objects.html
 share/doc/python/lib/boolean.html
 share/doc/python/lib/bsddb-objects.html
 share/doc/python/lib/built-in-funcs.html
@@ -165,11 +175,16 @@ share/doc/python/lib/bytecodes.html
 share/doc/python/lib/cd-parser-objects.html
 share/doc/python/lib/cgi-intro.html
 share/doc/python/lib/comparisons.html
+share/doc/python/lib/completer-objects.html
 share/doc/python/lib/condition-objects.html
+share/doc/python/lib/console-objects.html
 share/doc/python/lib/contents.html
 share/doc/python/lib/crypto.html
+share/doc/python/lib/curses-functions.html
+share/doc/python/lib/curses-window-objects.html
 share/doc/python/lib/dbhash-objects.html
 share/doc/python/lib/debugger-commands.html
+share/doc/python/lib/dl-objects.html
 share/doc/python/lib/embedding-locale.html
 share/doc/python/lib/event-objects.html
 share/doc/python/lib/examples-imp.html
@@ -180,11 +195,13 @@ share/doc/python/lib/forms-objects.html
 share/doc/python/lib/front.html
 share/doc/python/lib/ftp-objects.html
 share/doc/python/lib/genindex.html
+share/doc/python/lib/html-parser-objects.html
 share/doc/python/lib/imap4-example.html
 share/doc/python/lib/imap4-objects.html
 share/doc/python/lib/img1.gif
 share/doc/python/lib/index.html
 share/doc/python/lib/internet.html
+share/doc/python/lib/interpreter-objects.html
 share/doc/python/lib/intro.html
 share/doc/python/lib/lib.css
 share/doc/python/lib/lib.html
@@ -202,10 +219,12 @@ share/doc/python/lib/mmedia.html
 share/doc/python/lib/modindex.html
 share/doc/python/lib/module-BaseHTTPServer.html
 share/doc/python/lib/module-Bastion.html
+share/doc/python/lib/module-CGIHTTPServer.html
 share/doc/python/lib/module-ConfigParser.html
 share/doc/python/lib/module-DEVICE.html
 share/doc/python/lib/module-MimeWriter.html
 share/doc/python/lib/module-Queue.html
+share/doc/python/lib/module-SimpleHTTPServer.html
 share/doc/python/lib/module-SocketServer.html
 share/doc/python/lib/module-StringIO.html
 share/doc/python/lib/module-TERMIOSuppercase.html
@@ -216,6 +235,7 @@ share/doc/python/lib/module-al-constants.html
 share/doc/python/lib/module-al.html
 share/doc/python/lib/module-anydbm.html
 share/doc/python/lib/module-array.html
+share/doc/python/lib/module-asyncore.html
 share/doc/python/lib/module-audioop.html
 share/doc/python/lib/module-base64.html
 share/doc/python/lib/module-binascii.html
@@ -228,18 +248,25 @@ share/doc/python/lib/module-cStringIO.html
 share/doc/python/lib/module-calendar.html
 share/doc/python/lib/module-cd.html
 share/doc/python/lib/module-cgi.html
+share/doc/python/lib/module-chunk.html
 share/doc/python/lib/module-cmath.html
 share/doc/python/lib/module-cmd.html
+share/doc/python/lib/module-cmp.html
+share/doc/python/lib/module-cmpcache.html
 share/doc/python/lib/module-code.html
+share/doc/python/lib/module-codeop.html
 share/doc/python/lib/module-colorsys.html
 share/doc/python/lib/module-commands.html
 share/doc/python/lib/module-compileall.html
 share/doc/python/lib/module-copy.html
 share/doc/python/lib/module-copyreg.html
 share/doc/python/lib/module-crypt.html
+share/doc/python/lib/module-curses.html
 share/doc/python/lib/module-dbhash.html
 share/doc/python/lib/module-dbm.html
+share/doc/python/lib/module-dircache.html
 share/doc/python/lib/module-dis.html
+share/doc/python/lib/module-dl.html
 share/doc/python/lib/module-dumbdbm.html
 share/doc/python/lib/module-errno.html
 share/doc/python/lib/module-exceptions.html
@@ -251,6 +278,7 @@ share/doc/python/lib/module-flp.html
 share/doc/python/lib/module-fm.html
 share/doc/python/lib/module-fnmatch.html
 share/doc/python/lib/module-formatter.html
+share/doc/python/lib/module-fpformat.html
 share/doc/python/lib/module-ftplib.html
 share/doc/python/lib/module-gdbm.html
 share/doc/python/lib/module-getopt.html
@@ -261,6 +289,7 @@ share/doc/python/lib/module-glob.html
 share/doc/python/lib/module-gopherlib.html
 share/doc/python/lib/module-grp.html
 share/doc/python/lib/module-gzip.html
+share/doc/python/lib/module-htmlentitydefs.html
 share/doc/python/lib/module-htmllib.html
 share/doc/python/lib/module-httplib.html
 share/doc/python/lib/module-imageop.html
@@ -270,6 +299,7 @@ share/doc/python/lib/module-imghdr.html
 share/doc/python/lib/module-imp.html
 share/doc/python/lib/module-jpeg.html
 share/doc/python/lib/module-keyword.html
+share/doc/python/lib/module-linecache.html
 share/doc/python/lib/module-locale.html
 share/doc/python/lib/module-mailbox.html
 share/doc/python/lib/module-mailcap.html
@@ -284,7 +314,10 @@ share/doc/python/lib/module-mimify.html
 share/doc/python/lib/module-mpz.html
 share/doc/python/lib/module-msvcrt.html
 share/doc/python/lib/module-multifile.html
+share/doc/python/lib/module-mutex.html
 share/doc/python/lib/module-netrc.html
+share/doc/python/lib/module-new.html
+share/doc/python/lib/module-nis.html
 share/doc/python/lib/module-nntplib.html
 share/doc/python/lib/module-operator.html
 share/doc/python/lib/module-os.html
@@ -292,12 +325,14 @@ share/doc/python/lib/module-os.path.html
 share/doc/python/lib/module-parser.html
 share/doc/python/lib/module-pdb.html
 share/doc/python/lib/module-pickle.html
+share/doc/python/lib/module-pipes.html
 share/doc/python/lib/module-popen2.html
 share/doc/python/lib/module-poplib.html
 share/doc/python/lib/module-posix.html
 share/doc/python/lib/module-posixfile.html
 share/doc/python/lib/module-pprint.html
 share/doc/python/lib/module-profile.html
+share/doc/python/lib/module-pty.html
 share/doc/python/lib/module-pwd.html
 share/doc/python/lib/module-pyclbr.html
 share/doc/python/lib/module-pycompile.html
@@ -311,7 +346,9 @@ share/doc/python/lib/module-resource.html
 share/doc/python/lib/module-rexec.html
 share/doc/python/lib/module-rfc822.html
 share/doc/python/lib/module-rgbimg.html
+share/doc/python/lib/module-rlcompleter.html
 share/doc/python/lib/module-rotor.html
+share/doc/python/lib/module-sched.html
 share/doc/python/lib/module-select.html
 share/doc/python/lib/module-sgmllib.html
 share/doc/python/lib/module-sha.html
@@ -324,8 +361,12 @@ share/doc/python/lib/module-smtplib.html
 share/doc/python/lib/module-sndhdr.html
 share/doc/python/lib/module-socket.html
 share/doc/python/lib/module-stat.html
+share/doc/python/lib/module-statcache.html
+share/doc/python/lib/module-statvfs.html
 share/doc/python/lib/module-string.html
 share/doc/python/lib/module-struct.html
+share/doc/python/lib/module-sunau.html
+share/doc/python/lib/module-sunaudiodev-constants.html
 share/doc/python/lib/module-sunaudiodev.html
 share/doc/python/lib/module-symbol.html
 share/doc/python/lib/module-sys.html
@@ -339,11 +380,13 @@ share/doc/python/lib/module-time.html
 share/doc/python/lib/module-token.html
 share/doc/python/lib/module-tokenize.html
 share/doc/python/lib/module-traceback.html
+share/doc/python/lib/module-tty.html
 share/doc/python/lib/module-types.html
 share/doc/python/lib/module-urllib.html
 share/doc/python/lib/module-urlparse.html
 share/doc/python/lib/module-user.html
 share/doc/python/lib/module-uu.html
+share/doc/python/lib/module-wave.html
 share/doc/python/lib/module-whichdb.html
 share/doc/python/lib/module-whrandom.html
 share/doc/python/lib/module-winsound.html
@@ -354,39 +397,37 @@ share/doc/python/lib/msvcrt-console.html
 share/doc/python/lib/msvcrt-files.html
 share/doc/python/lib/msvcrt-other.html
 share/doc/python/lib/multifile-example.html
+share/doc/python/lib/mutex-objects.html
 share/doc/python/lib/netdata.html
 share/doc/python/lib/netrc-objects.html
 share/doc/python/lib/nntp-objects.html
-share/doc/python/lib/node124.html
-share/doc/python/lib/node130.html
-share/doc/python/lib/node167.html
-share/doc/python/lib/node168.html
-share/doc/python/lib/node175.html
-share/doc/python/lib/node192.html
-share/doc/python/lib/node194.html
-share/doc/python/lib/node195.html
-share/doc/python/lib/node196.html
-share/doc/python/lib/node197.html
-share/doc/python/lib/node198.html
-share/doc/python/lib/node201.html
-share/doc/python/lib/node265.html
-share/doc/python/lib/node303.html
-share/doc/python/lib/node310.html
-share/doc/python/lib/node311.html
-share/doc/python/lib/node312.html
-share/doc/python/lib/node313.html
-share/doc/python/lib/node314.html
-share/doc/python/lib/node315.html
-share/doc/python/lib/node316.html
-share/doc/python/lib/node51.html
-share/doc/python/lib/node52.html
-share/doc/python/lib/node82.html
+share/doc/python/lib/node128.html
+share/doc/python/lib/node181.html
+share/doc/python/lib/node182.html
+share/doc/python/lib/node190.html
+share/doc/python/lib/node207.html
+share/doc/python/lib/node209.html
+share/doc/python/lib/node210.html
+share/doc/python/lib/node211.html
+share/doc/python/lib/node212.html
+share/doc/python/lib/node213.html
+share/doc/python/lib/node218.html
+share/doc/python/lib/node289.html
+share/doc/python/lib/node335.html
+share/doc/python/lib/node342.html
+share/doc/python/lib/node343.html
+share/doc/python/lib/node344.html
+share/doc/python/lib/node345.html
+share/doc/python/lib/node347.html
+share/doc/python/lib/node74.html
+share/doc/python/lib/obsolete-modules.html
 share/doc/python/lib/os-fd-ops.html
 share/doc/python/lib/os-file-dir.html
 share/doc/python/lib/os-newstreams.html
 share/doc/python/lib/os-path.html
 share/doc/python/lib/os-process.html
 share/doc/python/lib/os-procinfo.html
+share/doc/python/lib/pickle-example.html
 share/doc/python/lib/player-objects.html
 share/doc/python/lib/pop3-example.html
 share/doc/python/lib/pop3-objects.html
@@ -406,33 +447,33 @@ share/doc/python/lib/re-objects.html
 share/doc/python/lib/re-syntax.html
 share/doc/python/lib/restricted.html
 share/doc/python/lib/rlock-objects.html
+share/doc/python/lib/rng-objects.html
+share/doc/python/lib/scheduler-objects.html
 share/doc/python/lib/semaphore-objects.html
 share/doc/python/lib/sgi.html
 share/doc/python/lib/shlex-objects.html
 share/doc/python/lib/shutil-example.html
+share/doc/python/lib/socket-objects.html
 share/doc/python/lib/someos.html
 share/doc/python/lib/specialattrs.html
 share/doc/python/lib/strings.html
 share/doc/python/lib/subclassing-reprs.html
 share/doc/python/lib/sunos.html
+share/doc/python/lib/telnet-example.html
 share/doc/python/lib/telnet-objects.html
+share/doc/python/lib/template-objects.html
 share/doc/python/lib/termios_Example.html
 share/doc/python/lib/thread-objects.html
+share/doc/python/lib/traceback-example.html
 share/doc/python/lib/truth.html
 share/doc/python/lib/types.html
-share/doc/python/lib/typesfunctions.html
-share/doc/python/lib/typesinternal.html
 share/doc/python/lib/typesmapping.html
-share/doc/python/lib/typesmethods.html
-share/doc/python/lib/typesmodules.html
 share/doc/python/lib/typesnumeric.html
-share/doc/python/lib/typesobjects.html
 share/doc/python/lib/typesother.html
-share/doc/python/lib/typesseq-mutable.html
 share/doc/python/lib/typesseq-strings.html
-share/doc/python/lib/typesseq.html
 share/doc/python/lib/undoc.html
 share/doc/python/lib/unix.html
+share/doc/python/lib/urlopener-objs.html
 share/doc/python/lib/writer-impls.html
 share/doc/python/lib/writer-interface.html
 share/doc/python/lib/xdr-exceptions.html