py-mysqldb: Update to version 1.3.10

- Python 3 support
- bug fixes

4 files changed, 23 insertions, 32 deletions

diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index 243c7257bfd..f8ce489e6e0 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.51 2021/07/27 23:21:23 tron Exp $
+# $NetBSD: Makefile,v 1.52 2021/10/06 18:00:12 tron Exp $
 
-DISTNAME=	MySQL-python-1.2.5
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/MySQL-python/mysqldb/}
-PKGREVISION=	2
+DISTNAME=	mysqlclient-1.3.10
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/mysqlclient/mysqldb/}
 CATEGORIES=	databases python
-MASTER_SITES=	${MASTER_SITE_PYPI:=M/MySQL-python/}
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	${MASTER_SITE_PYPI:=m/mysqlclient/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/farcepest/MySQLdb1/
+HOMEPAGE=	https://pypi.org/project/mysqlclient/1.3.10/
 COMMENT=	MySQL interface for Python
 LICENSE=	gnu-gpl-v2
 
-PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 1.2.5
-
 USE_LANGUAGES=		c
 
-# These files must not be world-writable.
-pre-configure:
-	${CHMOD} go-w ${WRKSRC}/MySQL_python.egg-info/*
+PYPKGVER=	${PYPKGPREFIX:S/py//}
+
+post-install:
+	cd ${DESTDIR}${PREFIX}/${PYSITELIB}/MySQLdb/__pycache__ && \
+	${RM} -f compat.cpython-${PYPKGVER}.opt-1.pyc \
+	    compat.cpython-${PYPKGVER}.pyc
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/mysql.buildlink3.mk"
diff --git a/databases/py-mysqldb/PLIST b/databases/py-mysqldb/PLIST
index c4d76767b66..6a8f0e199d8 100644
--- a/databases/py-mysqldb/PLIST
+++ b/databases/py-mysqldb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/10/16 07:39:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2021/10/06 18:00:12 tron Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -6,6 +6,7 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/MySQLdb/__init__.py
 ${PYSITELIB}/MySQLdb/__init__.pyc
 ${PYSITELIB}/MySQLdb/__init__.pyo
+${PYSITELIB}/MySQLdb/compat.py
 ${PYSITELIB}/MySQLdb/connections.py
 ${PYSITELIB}/MySQLdb/connections.pyc
 ${PYSITELIB}/MySQLdb/connections.pyo
diff --git a/databases/py-mysqldb/distinfo b/databases/py-mysqldb/distinfo
index f2262e8a25b..3d266397cb5 100644
--- a/databases/py-mysqldb/distinfo
+++ b/databases/py-mysqldb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2021/07/27 23:21:23 tron Exp $
+$NetBSD: distinfo,v 1.15 2021/10/06 18:00:12 tron Exp $
 
-SHA1 (MySQL-python-1.2.5.zip) = b935a26b3cf80338bcc21b8a991081d83eb9c3ae
-RMD160 (MySQL-python-1.2.5.zip) = f6638f1bda4c6a3f721c05a5f0029951d07430a9
-SHA512 (MySQL-python-1.2.5.zip) = 37521c6fd855c4cde495cc8ec085aca79c2d441a6e3710759385bf2e2c17f43d3311cf1166663892829d2e3999c419443c358c7031cdda225ac44611ced188d0
-Size (MySQL-python-1.2.5.zip) = 108935 bytes
-SHA1 (patch-_mysql.c) = ebe33a112bb16de85d0bbc4e090c51527cbcdc1d
+SHA1 (mysqlclient-1.3.10.tar.gz) = 2159b38d2a26db7b2c80e47f0c37546832ad2aa5
+RMD160 (mysqlclient-1.3.10.tar.gz) = bcd390694527a5ea71fc3da2d91acd121826a099
+SHA512 (mysqlclient-1.3.10.tar.gz) = 05924b363431e1208c39d4ee39199b06f29025e4fb2abdba5b85e2755d7a69ff921752754700ad34118ce6502ab654eb3e46192b5085f5fb5dca1ac46eaa412e
+Size (mysqlclient-1.3.10.tar.gz) = 82102 bytes
+SHA1 (patch-_mysql.c) = b11be19fbfb3182c218d6186f9ff4890b0f51cfb
diff --git a/databases/py-mysqldb/patches/patch-_mysql.c b/databases/py-mysqldb/patches/patch-_mysql.c
index 3b9aaa667c7..255f7d3d206 100644
--- a/databases/py-mysqldb/patches/patch-_mysql.c
+++ b/databases/py-mysqldb/patches/patch-_mysql.c
@@ -1,19 +1,10 @@
-$NetBSD: patch-_mysql.c,v 1.1 2021/07/27 23:21:23 tron Exp $
+$NetBSD: patch-_mysql.c,v 1.2 2021/10/06 18:00:12 tron Exp $
 
 Use official MySQL API to fix build with latest version of MariaDB
 
---- _mysql.c.orig	2014-01-02 13:52:50.000000000 +0000
-+++ _mysql.c	2021-07-28 00:17:13.849678370 +0100
-@@ -40,8 +40,6 @@
- #include "structmember.h"
- #if defined(MS_WINDOWS)
- #include <config-win.h>
--#else
--#include "my_config.h"
- #endif
- #include "mysql.h"
- #include "mysqld_error.h"
-@@ -2002,7 +2000,11 @@
+--- _mysql.c.orig	2017-01-04 12:47:08.000000000 +0000
++++ _mysql.c	2021-10-06 18:21:05.978598645 +0100
+@@ -1908,7 +1908,11 @@
  	int r, reconnect = -1;
  	if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
  	check_connection(self);