Upgrade to 2.0.1.

6 files changed, 17 insertions, 9 deletions

diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 9eafb1f0536c..082ef4b6b898 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -99,11 +99,11 @@ PYTHON_WRKSRC=		${WRKDIR}/Python-2.1
 PYDISTUTILS=	${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR}
 PYXML=			${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
 
-PYTHON_DISTFILE=	BeOpen-Python-2.0.tar.gz
+PYTHON_DISTFILE=	Python-2.0.1.tgz
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python20
-PYTHON_REL=			200
+PYTHON_REL=			201
 PYTHON_SUFFIX=		20
-PYTHON_WRKSRC=		${WRKDIR}/Python-2.0
+PYTHON_WRKSRC=		${WRKDIR}/Python-2.0.1
 
 # Python-1.6
 # ${PYTHON_PORTSDIR} is not set because we don't support building 
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 65b3490941a8..366cffdea802 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	lang python
-MASTER_SITES=	http://www.python.org/ftp/python/2.0/ \
-		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/2.0/
+MASTER_SITES=	http://www.python.org/ftp/python/2.0.1/ \
+		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/2.0.1/
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER?=	tg@FreeBSD.org
@@ -131,7 +131,7 @@ post-install:
 .endif
 .if !defined(WITHOUT_DEMO)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
+	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - [M-z]* | \
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index 3c57fda73235..236e2da23008 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1 +1 @@
-MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
+MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79
diff --git a/lang/python20/pkg-plist b/lang/python20/pkg-plist
index 47b4a8d57cc9..4aad96d17bf9 100644
--- a/lang/python20/pkg-plist
+++ b/lang/python20/pkg-plist
@@ -591,6 +591,7 @@ 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
@@ -598,7 +599,6 @@ 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
@@ -1030,6 +1030,7 @@ 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_mailbox
 lib/%%PYTHON_VERSION%%/test/output/test_math
 lib/%%PYTHON_VERSION%%/test/output/test_md5
 lib/%%PYTHON_VERSION%%/test/output/test_mimetools
@@ -1264,6 +1265,9 @@ 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_mailbox.py
+lib/%%PYTHON_VERSION%%/test/test_mailbox.pyc
+lib/%%PYTHON_VERSION%%/test/test_mailbox.pyo
 lib/%%PYTHON_VERSION%%/test/test_math.py
 lib/%%PYTHON_VERSION%%/test/test_math.pyc
 lib/%%PYTHON_VERSION%%/test/test_math.pyo
diff --git a/lang/python20/pkg-plist.Demo b/lang/python20/pkg-plist.Demo
index 61fb3f50f27b..f47c2852a137 100644
--- a/lang/python20/pkg-plist.Demo
+++ b/lang/python20/pkg-plist.Demo
@@ -106,6 +106,7 @@ share/examples/%%PYTHON_VERSION%%/scripts/unbirthday.py
 share/examples/%%PYTHON_VERSION%%/scripts/update.py
 share/examples/%%PYTHON_VERSION%%/scripts/wh.py
 share/examples/%%PYTHON_VERSION%%/sgi/README
+share/examples/%%PYTHON_VERSION%%/sgi/al/.cvsignore
 share/examples/%%PYTHON_VERSION%%/sgi/al/README
 share/examples/%%PYTHON_VERSION%%/sgi/al/alwatch.py
 share/examples/%%PYTHON_VERSION%%/sgi/al/broadcast.py
@@ -131,6 +132,7 @@ share/examples/%%PYTHON_VERSION%%/sgi/cd/listcd.py
 share/examples/%%PYTHON_VERSION%%/sgi/cd/playcd.py
 share/examples/%%PYTHON_VERSION%%/sgi/cd/recvcd.py
 share/examples/%%PYTHON_VERSION%%/sgi/cd/sendcd.py
+share/examples/%%PYTHON_VERSION%%/sgi/flp/.cvsignore
 share/examples/%%PYTHON_VERSION%%/sgi/flp/tcache.fd
 share/examples/%%PYTHON_VERSION%%/sgi/flp/tcache.py
 share/examples/%%PYTHON_VERSION%%/sgi/flp/test_cb.fd
@@ -152,6 +154,7 @@ share/examples/%%PYTHON_VERSION%%/sgi/sv/burstcapt.py
 share/examples/%%PYTHON_VERSION%%/sgi/sv/contcapt.py
 share/examples/%%PYTHON_VERSION%%/sgi/sv/rgbgrab.py
 share/examples/%%PYTHON_VERSION%%/sgi/sv/simpleinput.py
+share/examples/%%PYTHON_VERSION%%/sgi/video/.cvsignore
 share/examples/%%PYTHON_VERSION%%/sgi/video/DisplayVideoIn.py
 share/examples/%%PYTHON_VERSION%%/sgi/video/Dsend.py
 share/examples/%%PYTHON_VERSION%%/sgi/video/LiveVideoIn.py
diff --git a/lang/python20/pkg-plist.Tools b/lang/python20/pkg-plist.Tools
index 17f0ba4a305e..cc3a94881ac1 100644
--- a/lang/python20/pkg-plist.Tools
+++ b/lang/python20/pkg-plist.Tools
@@ -35,6 +35,7 @@ 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