upgrade to py-mysql 1.2.0

databases/py-mysql/Makefile

@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.22 2005/09/08 03:45:17 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.23 2005/09/12 04:29:35 brad Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 COMMENT=	"Python interface to MySQL"
 
-VERSION=	0.9.2
+VERSION=	1.2.0
 DISTNAME=	MySQL-python-${VERSION}
-PKGNAME=	py-mysql-${VERSION}p0
+PKGNAME=	py-mysql-${VERSION}
 CATEGORIES=	databases
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mysql-python/}
 
-HOMEPAGE=	http://sourceforge.net/projects/mysql-python
+HOMEPAGE=	http://sourceforge.net/projects/mysql-python/
 
 MAINTAINER=	Shell Hung <shell@openbsd.org>
 
@@ -30,12 +30,8 @@ NO_REGRESS=	Yes
 
 DOC_DIR=	${PREFIX}/share/doc/MySQL-python
 
-do-configure:
-	@perl -i -pe 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR}
 	${INSTALL_DATA} ${WRKBUILD}/doc/*.html ${DOC_DIR}
 
-
 .include <bsd.port.mk>

databases/py-mysql/distinfo

@@ -1,4 +1,4 @@
-MD5 (MySQL-python-0.9.2.tar.gz) = afef758f56289f98408dd9f379d8fc8d
+MD5 (MySQL-python-1.2.0.tar.gz) = b0eb974cc3c917276e015275e1ec996f
-RMD160 (MySQL-python-0.9.2.tar.gz) = f7ef371e8f2c0a3b6979a99bfa368e4342aa4080
+RMD160 (MySQL-python-1.2.0.tar.gz) = 8a58029ec2ee3dd7108fee0c47ca229a02f277b7
-SHA1 (MySQL-python-0.9.2.tar.gz) = b6959ee5e28847e557229ddc318b097f10144ff2
+SHA1 (MySQL-python-1.2.0.tar.gz) = 5d64a32068061aed5f81567469ba30ccc3f69137
-SIZE (MySQL-python-0.9.2.tar.gz) = 64258
+SIZE (MySQL-python-1.2.0.tar.gz) = 252290

databases/py-mysql/patches/patch-_mysql_c

@@ -1,15 +1,12 @@
-$OpenBSD: patch-_mysql_c,v 1.1 2005/09/08 03:45:17 pvalchev Exp $
+$OpenBSD: patch-_mysql_c,v 1.2 2005/09/12 04:29:35 brad Exp $
---- _mysql.c.orig	Wed Jul 31 23:01:30 2002
+--- _mysql.c.orig	Mon Feb  7 20:00:54 2005
-+++ _mysql.c	Wed Sep  7 20:12:48 2005
++++ _mysql.c	Mon Sep 12 00:10:38 2005
-@@ -1353,7 +1353,11 @@ _mysql_ConnectionObject_shutdown(
+@@ -1747,7 +1747,7 @@ _mysql_ConnectionObject_shutdown(
- 	if (!PyArg_NoArgs(args)) return NULL;
  	check_connection(self);
  	Py_BEGIN_ALLOW_THREADS
+ 	r = mysql_shutdown(&(self->connection)
+-#if MYSQL_VERSION_ID >= 40103
 +#if (MYSQL_VERSION_ID >= 40103 && MYSQL_VERSION_ID != 50000)
-+	r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT);
+ 		, SHUTDOWN_DEFAULT
-+#else
+ #endif
- 	r = mysql_shutdown(&(self->connection));
+ 		);
-+#endif
- 	Py_END_ALLOW_THREADS
- 	if (r) return _mysql_Exception(self);
- 	Py_INCREF(Py_None);

databases/py-mysql/patches/patch-setup_py

@@ -1,21 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.4 2002/09/15 10:54:19 shell Exp $
---- setup.py.orig	Sun Sep 15 18:49:41 2002
-+++ setup.py	Sun Sep 15 18:50:42 2002
-@@ -20,7 +20,7 @@ thread_safe_library = YES
- name = "MySQL-%s" % os.path.basename(sys.executable)
- version = "0.9.2"
- 
--mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient"
-+mysqlclient = "mysqlclient"
- 
- # include files and library locations should cover most platforms
- include_dirs = [
-@@ -52,7 +52,7 @@ if sys.platform == "netbsd1":
-     include_dirs = ['/usr/pkg/include/mysql']
-     library_dirs = ['/usr/pkg/lib/mysql']
- elif sys.platform in ("freebsd4", "openbsd3"):
--    LOCALBASE = os.environ.get('LOCALBASE', '/usr/local')
-+    LOCALBASE = os.environ.get('LOCALBASE', '%%LOCALBASE%%')
-     include_dirs = ['%s/include/mysql' % LOCALBASE]
-     library_dirs = ['%s/lib/mysql' % LOCALBASE]
- elif sys.platform == "sunos5": # Solaris 2.8 + gcc

databases/py-mysql/pkg/PLIST

@@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/14 23:31:46 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/09/12 04:29:35 brad Exp $
-lib/python${MODPY_VERSION}/site-packages/CompatMysqldb.py
-lib/python${MODPY_VERSION}/site-packages/CompatMysqldb.pyc
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/__init__.py
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/__init__.pyc
@@ -25,20 +23,21 @@ lib/python${MODPY_VERSION}/site-packages/MySQLdb/converters.py
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/converters.pyc
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/cursors.py
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/cursors.pyc
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/mxdatetimes.py
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/mxdatetimes.pyc
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/pytimes.py
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/pytimes.pyc
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/sets.py
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/sets.pyc
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/stringtimes.py
+lib/python${MODPY_VERSION}/site-packages/MySQLdb/stringtimes.pyc
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/times.py
 lib/python${MODPY_VERSION}/site-packages/MySQLdb/times.pyc
 lib/python${MODPY_VERSION}/site-packages/_mysql.so
 lib/python${MODPY_VERSION}/site-packages/_mysql_exceptions.py
 lib/python${MODPY_VERSION}/site-packages/_mysql_exceptions.pyc
 share/doc/MySQL-python/
-share/doc/MySQL-python/MySQLdb-1.html
-share/doc/MySQL-python/MySQLdb-2.html
-share/doc/MySQL-python/MySQLdb-3.html
-share/doc/MySQL-python/MySQLdb-4.html
-share/doc/MySQL-python/MySQLdb-FAQ-1.html
-share/doc/MySQL-python/MySQLdb-FAQ-2.html
-share/doc/MySQL-python/MySQLdb-FAQ-3.html
-share/doc/MySQL-python/MySQLdb-FAQ.html
 share/doc/MySQL-python/MySQLdb.html
+share/doc/MySQL-python/README.html
+share/doc/MySQL-python/index.html
+share/doc/MySQL-python/pep-0249.html