Update to 2.3c1

35 files changed, 91 insertions, 147 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python-devel/files/patch-configure b/lang/python-devel/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python-devel/files/patch-configure
+++ b/lang/python-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python-devel/files/patch-setup.py
+++ b/lang/python-devel/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python25/files/patch-configure b/lang/python25/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python25/files/patch-configure
+++ b/lang/python25/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python25/files/patch-setup.py
+++ b/lang/python25/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python26/files/patch-configure b/lang/python26/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python26/files/patch-configure
+++ b/lang/python26/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python26/files/patch-setup.py
+++ b/lang/python26/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python27/files/patch-configure b/lang/python27/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python27/files/patch-configure
+++ b/lang/python27/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python27/files/patch-setup.py
+++ b/lang/python27/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python30/files/patch-configure b/lang/python30/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python30/files/patch-configure
+++ b/lang/python30/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python30/files/patch-setup.py
+++ b/lang/python30/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python31/files/patch-configure
+++ b/lang/python31/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python31/files/patch-setup.py
+++ b/lang/python31/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 41950ba0b095..9d12657459be 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -5,11 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.3.b2
-PORTREVISION=	1
+PORTVERSION=	2.3.c1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${MASTER_SITE_PYTHON}
-MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
+MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.c1//}
 DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index 8d2858394868..d7a19947348c 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.3b2.tgz) = da16309c14caf585353686d5462fe9d7
+MD5 (python/Python-2.3c1.tgz) = 167327b762b305d72b1cce3a5d78ccdf
diff --git a/lang/python32/files/patch-configure b/lang/python32/files/patch-configure
index a17f2aa4095b..c17e753795a5 100644
--- a/lang/python32/files/patch-configure
+++ b/lang/python32/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jun 28 16:46:31 2003
-+++ configure	Thu Jul  3 22:29:46 2003
-@@ -3278,6 +3278,12 @@
+--- configure.orig	Sun Jul 13 18:46:13 2003
++++ configure	Sat Jul 19 15:21:09 2003
+@@ -3288,6 +3288,12 @@
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
@@ -13,12 +13,3 @@
      hp*|HP*)
  	  LDLIBRARY='libpython$(VERSION).sl'
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
-@@ -3907,7 +3913,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_save_cc="$CC"
--CC="$CC -Kthread"
-+CC="/nonexistent/ignore/$CC -Kthread"
- if test "$cross_compiling" = yes; then
-   ac_cv_kthread=no
- else
diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
index b325b8938e41..63779f7d0fe0 100644
--- a/lang/python32/files/patch-setup.py
+++ b/lang/python32/files/patch-setup.py
@@ -1,15 +1,15 @@
---- setup.py.orig	Tue Jun 17 11:51:28 2003
-+++ setup.py	Fri Jul  4 17:33:05 2003
+--- setup.py.orig	Thu Jul 10 21:48:39 2003
++++ setup.py	Sat Jul 19 16:27:04 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1127,7 +1127,7 @@
+@@ -1128,7 +1128,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 47c31cd65062..7a0c49a82a69 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -2382,6 +2382,9 @@ lib/%%PYTHON_VERSION%%/test/test_userstring.pyo
 lib/%%PYTHON_VERSION%%/test/test_uu.py
 lib/%%PYTHON_VERSION%%/test/test_uu.pyc
 lib/%%PYTHON_VERSION%%/test/test_uu.pyo
+lib/%%PYTHON_VERSION%%/test/test_warnings.py
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyc
+lib/%%PYTHON_VERSION%%/test/test_warnings.pyo
 lib/%%PYTHON_VERSION%%/test/test_wave.py
 lib/%%PYTHON_VERSION%%/test/test_wave.pyc
 lib/%%PYTHON_VERSION%%/test/test_wave.pyo
@@ -2983,7 +2986,6 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/suff.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texcheck.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/texi2html.py
-%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/trace.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/treesync.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/untabify.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/which.py