Update to 0.9.1.

Prompted by:	many
Submitted by:	Anders Nordby <anders@fix.no>

8 files changed, 26 insertions, 56 deletions

diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 3f747aaa835e..75a63266f411 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-MySQLdb
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysql-python
diff --git a/databases/py-MySQLdb-devel/distinfo b/databases/py-MySQLdb-devel/distinfo
index 3139d8885f2b..21818138a9d4 100644
--- a/databases/py-MySQLdb-devel/distinfo
+++ b/databases/py-MySQLdb-devel/distinfo
@@ -1 +1 @@
-MD5 (MySQL-python-0.9.0.tar.gz) = bd56fa81769739d6710e320b3765675b
+MD5 (MySQL-python-0.9.1.tar.gz) = 802e271d46e3d845045ce0378f82fd85
diff --git a/databases/py-MySQLdb-devel/files/patch-_mysql.c b/databases/py-MySQLdb-devel/files/patch-_mysql.c
deleted file mode 100644
index fe72118ba2fb..000000000000
--- a/databases/py-MySQLdb-devel/files/patch-_mysql.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- _mysql.c	2002/01/09 13:02:08	1.1
-+++ _mysql.c	2002/01/09 13:06:07
-@@ -781,7 +781,11 @@
- 			goto error;
- 		}
- 		if (!row) {
-+#if PY_VERSION_HEX < 0x02020000
- 			if (_PyTuple_Resize(r, i, 0) == -1) goto error;
-+#else
-+			if (_PyTuple_Resize(r, i) == -1) goto error;
-+#endif
- 			break;
- 		}
- 		v = convert_row(self, row);
diff --git a/databases/py-MySQLdb-devel/files/patch-ab b/databases/py-MySQLdb-devel/files/patch-ab
index 12b44feae719..f468651029cd 100644
--- a/databases/py-MySQLdb-devel/files/patch-ab
+++ b/databases/py-MySQLdb-devel/files/patch-ab
@@ -1,13 +1,15 @@
---- setup.py.orig	Tue Oct 31 21:28:16 2000
-+++ setup.py	Wed Nov  1 13:51:41 2000
-@@ -32,8 +32,8 @@
+--- setup.py.orig	Wed Oct 17 05:17:30 2001
++++ setup.py	Tue Jan 22 00:33:59 2002
+@@ -24,9 +24,9 @@
+     libraries = [mysqlclient, "z"]
      runtime_library_dirs = []
-     extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib']
- elif os.name == "posix": # most Linux/UNIX platforms
--    include_dirs = ['/usr/include/mysql']
--    library_dirs = ['/usr/lib/mysql']
+     extra_objects = []
+-elif sys.platform in ("freebsd4", "openbsd2"): 
+-    include_dirs = ['/usr/local/include/mysql']
+-    library_dirs = ['/usr/local/lib/mysql']
++elif sys.platform[:7] in ("freebsd", "openbsd"): 
 +    include_dirs = ['%%LOCALBASE%%/include/mysql']
 +    library_dirs = ['%%LOCALBASE%%/lib/mysql']
-     # MySQL-3.23 seems to need libz
      libraries = [mysqlclient, "z"]
-     # On some platorms, this can be used to find the shared libraries
+     runtime_library_dirs = []
+     extra_objects = []
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 3f747aaa835e..75a63266f411 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	py-MySQLdb
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysql-python
diff --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo
index 3139d8885f2b..21818138a9d4 100644
--- a/databases/py-MySQLdb/distinfo
+++ b/databases/py-MySQLdb/distinfo
@@ -1 +1 @@
-MD5 (MySQL-python-0.9.0.tar.gz) = bd56fa81769739d6710e320b3765675b
+MD5 (MySQL-python-0.9.1.tar.gz) = 802e271d46e3d845045ce0378f82fd85
diff --git a/databases/py-MySQLdb/files/patch-_mysql.c b/databases/py-MySQLdb/files/patch-_mysql.c
deleted file mode 100644
index fe72118ba2fb..000000000000
--- a/databases/py-MySQLdb/files/patch-_mysql.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- _mysql.c	2002/01/09 13:02:08	1.1
-+++ _mysql.c	2002/01/09 13:06:07
-@@ -781,7 +781,11 @@
- 			goto error;
- 		}
- 		if (!row) {
-+#if PY_VERSION_HEX < 0x02020000
- 			if (_PyTuple_Resize(r, i, 0) == -1) goto error;
-+#else
-+			if (_PyTuple_Resize(r, i) == -1) goto error;
-+#endif
- 			break;
- 		}
- 		v = convert_row(self, row);
diff --git a/databases/py-MySQLdb/files/patch-ab b/databases/py-MySQLdb/files/patch-ab
index 12b44feae719..f468651029cd 100644
--- a/databases/py-MySQLdb/files/patch-ab
+++ b/databases/py-MySQLdb/files/patch-ab
@@ -1,13 +1,15 @@
---- setup.py.orig	Tue Oct 31 21:28:16 2000
-+++ setup.py	Wed Nov  1 13:51:41 2000
-@@ -32,8 +32,8 @@
+--- setup.py.orig	Wed Oct 17 05:17:30 2001
++++ setup.py	Tue Jan 22 00:33:59 2002
+@@ -24,9 +24,9 @@
+     libraries = [mysqlclient, "z"]
      runtime_library_dirs = []
-     extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib']
- elif os.name == "posix": # most Linux/UNIX platforms
--    include_dirs = ['/usr/include/mysql']
--    library_dirs = ['/usr/lib/mysql']
+     extra_objects = []
+-elif sys.platform in ("freebsd4", "openbsd2"): 
+-    include_dirs = ['/usr/local/include/mysql']
+-    library_dirs = ['/usr/local/lib/mysql']
++elif sys.platform[:7] in ("freebsd", "openbsd"): 
 +    include_dirs = ['%%LOCALBASE%%/include/mysql']
 +    library_dirs = ['%%LOCALBASE%%/lib/mysql']
-     # MySQL-3.23 seems to need libz
      libraries = [mysqlclient, "z"]
-     # On some platorms, this can be used to find the shared libraries
+     runtime_library_dirs = []
+     extra_objects = []