Update "py-mysqldb" package to version 1.2.3rc1 (1.2.3c1).

Changes since 1.2.2:
- Add a test for connection.ping()
- Fix #2061583: Ignore any non-numeric portion of client and server
  version numbers.
- Fix for bug #2479317 (patch #2496558) by kylev. Make some time handling
  stuff more consistent.
- Backport some new trunk tests
- Move tests into their own directory to parallel trunk
- Short-term fix for bug #2671682.
- Add nose.collector as test_suite
- We missed one more 2.6-warning generating exception
- Fix bug 1808476 for OSX compilation, ported from trunk.
- don't leak special-case tuples (present in unicode modes)
- Updated ez_setup.py to latest version.
- Found one more old-style raise. Should fix #2122496.
- Found one more Set reference.
- Change raise to use the modern syntax for Python 3.0 compatibility.
- Remove more deprecated Set usage. Refs #2156977.
- More documentation updates.
- Documentation and package data updates
- Fix #2001855: Don't use ez_setup; just use setuptools direction.
- Fix #2156977: Use frozenset as the base for DBAPISet. Only tested for
  Python 2.5.
- Fix bug #2137599: Better regex for parsing INPUT statements. Passes unit
  tests but has not been thoroughly tested.
- Remove versioned python name from package as egg packaging
  also does this.

This package now works with the "python26" package.

4 files changed, 17 insertions, 31 deletions

diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index ecb60a1baf3..af5fd906393 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/09/07 19:02:13 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2009/09/22 13:09:30 tron Exp $
 
-DISTNAME=	MySQL-python-${PKGVER}
-PKGNAME=	${PYPKGPREFIX}-mysqldb-${PKGVER}
-PKGVER=	1.2.2
-# PKGREVISION=	3
+DISTNAME=	MySQL-python-${DIST_VERSION}
+PKGNAME=	${PYPKGPREFIX}-mysqldb-${DIST_VERSION:S/c/rc/}
+DIST_VERSION=	1.2.3c1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mysql-python/}
 
@@ -12,14 +11,16 @@ HOMEPAGE=	http://sourceforge.net/projects/mysql-python
 COMMENT=	MySQL interface for Python
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c6:../../devel/py-setuptools
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 PYSETUPINSTALLARGS= --single-version-externally-managed --record plist.txt
-PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+=   DIST_VERSION=${DIST_VERSION} PYVERSSUFFIX=${PYVERSSUFFIX}
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
+PYTHON_VERSIONS_ACCEPTED=	26 25 24
 
 .include "../../mk/mysql.buildlink3.mk"
 
diff --git a/databases/py-mysqldb/PLIST b/databases/py-mysqldb/PLIST
index a1f230db1c6..763f3f344dd 100644
--- a/databases/py-mysqldb/PLIST
+++ b/databases/py-mysqldb/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2008/08/06 17:16:49 mjl Exp $
-${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/native_libs.txt
-${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.6 2009/09/22 13:09:30 tron Exp $
+${PYSITELIB}/MySQL_python-${DIST_VERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
+${PYSITELIB}/MySQL_python-${DIST_VERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
+${PYSITELIB}/MySQL_python-${DIST_VERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
+${PYSITELIB}/MySQL_python-${DIST_VERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
 ${PYSITELIB}/MySQLdb/__init__.py
 ${PYSITELIB}/MySQLdb/__init__.pyc
 ${PYSITELIB}/MySQLdb/__init__.pyo
diff --git a/databases/py-mysqldb/distinfo b/databases/py-mysqldb/distinfo
index af4b219161e..fe1bb909a0e 100644
--- a/databases/py-mysqldb/distinfo
+++ b/databases/py-mysqldb/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2009/05/24 10:51:18 tron Exp $
+$NetBSD: distinfo,v 1.10 2009/09/22 13:09:30 tron Exp $
 
-SHA1 (MySQL-python-1.2.2.tar.gz) = 945a04773f30091ad81743f9eb0329a3ee3de383
-RMD160 (MySQL-python-1.2.2.tar.gz) = 3f3ff52102c41f86de3181d33132f15a9882a5b1
-Size (MySQL-python-1.2.2.tar.gz) = 87078 bytes
-SHA1 (patch-aa) = 286e9b9cf0e15b61992831942d934f6773ee7e34
+SHA1 (MySQL-python-1.2.3c1.tar.gz) = ef300cb2c378004b11e81e832cadda559cfd2fc5
+RMD160 (MySQL-python-1.2.3c1.tar.gz) = f32517c86f5fdc9e8d81a9e427492a82af8c58d9
+Size (MySQL-python-1.2.3c1.tar.gz) = 89831 bytes
diff --git a/databases/py-mysqldb/patches/patch-aa b/databases/py-mysqldb/patches/patch-aa
deleted file mode 100644
index e854d2b6ce7..00000000000
--- a/databases/py-mysqldb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/05/24 10:51:18 tron Exp $
-
---- _mysql.c.orig	2007-02-28 02:35:56.000000000 +0000
-+++ _mysql.c	2009-05-24 11:47:17.000000000 +0100
-@@ -34,7 +34,7 @@
- #else
- #include "my_config.h"
- #endif
--#ifndef uint
-+#if !defined(uint) && !defined(__APPLE__)
- #define uint unsigned int
- #endif
- #include "mysql.h"