Update py-mysql to 1.2.5, from frantisek holop, thanks !

databases/py-mysql/Makefile

@@ -1,37 +1,49 @@
-# $OpenBSD: Makefile,v 1.44 2013/06/12 20:36:33 brad Exp $
+# $OpenBSD: Makefile,v 1.45 2014/09/03 13:43:39 benoit Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	Python interface to MySQL
 
-MODPY_EGG_VERSION =	1.2.3
+MODPY_EGG_VERSION = 1.2.5
 DISTNAME =	MySQL-python-${MODPY_EGG_VERSION}
 PKGNAME =	py-mysql-${MODPY_EGG_VERSION}
-REVISION =	4
 
 CATEGORIES =	databases
 
-HOMEPAGE =	http://mysql-python.sourceforge.net/
+HOMEPAGE =	https://github.com/farcepest/MySQLdb1
 
 MAINTAINER =	Benoit Lecocq <benoit@openbsd.org>
 
 # GPL
-PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB =	crypto m pthread ssl z ${MODPY_WANTLIB}
+EXTRACT_SUFX =	.zip
+
+WANTLIB +=	crypto m pthread ssl z ${MODPY_WANTLIB}
 WANTLIB +=	lib/mysql/mysqlclient_r>=14
 
-MASTER_SITES =  ${MASTER_SITE_SOURCEFORGE:=mysql-python/}
+MASTER_SITES =	${MASTER_SITE_PYPI:=M/MySQL-python/}
 
 MODULES =	lang/python
+BUILD_DEPENDS =	textproc/py-sphinx
 LIB_DEPENDS =	databases/mysql
 
 NO_TEST =	Yes
 
 MODPY_SETUPTOOLS = Yes
 
+post-extract:
+	chmod -R go-w ${WRKSRC}
+
+DOCSRC =	${WRKSRC}/doc
+
+post-build:
+	cd ${DOCSRC} && ${LOCALBASE}/bin/sphinx-build -N . _build/html
+
+DOCS =		${PREFIX}/share/doc/py-mysql
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-mysql
-	${INSTALL_DATA} ${WRKBUILD}/doc/*.txt ${PREFIX}/share/doc/py-mysql/
+	${INSTALL_DATA_DIR} ${DOCS}
+	cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
 
 .include <bsd.port.mk>

databases/py-mysql/distinfo

@@ -1,5 +1,2 @@
-MD5 (MySQL-python-1.2.3.tar.gz) = IV7dtthT9vS+W0r8QVQpLw==
-RMD160 (MySQL-python-1.2.3.tar.gz) = 45TnvwgScGh5Wu6/uup9w7ISfIY=
-SHA1 (MySQL-python-1.2.3.tar.gz) = NRG7jFfGAW7q+lMdXD6ktUiRXjw=
-SHA256 (MySQL-python-1.2.3.tar.gz) = feZvu/kjY058llrq76dGQrp1riDuHO/O/DAJWVt6fm4=
-SIZE (MySQL-python-1.2.3.tar.gz) = 70305
+SHA256 (MySQL-python-1.2.5.zip) = gRBAtkfl1WhvhNtBXv1pfmJQAIsRK2kJunesBZ4UDHQ=
+SIZE (MySQL-python-1.2.5.zip) = 108935

databases/py-mysql/patches/patch-_mysql_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-_mysql_c,v 1.3 2010/11/14 08:57:17 benoit Exp $
---- _mysql.c.orig	Thu Jun 17 09:21:56 2010
-+++ _mysql.c	Sun Nov 14 09:30:49 2010
-@@ -1878,7 +1878,7 @@ _mysql_ConnectionObject_shutdown(
- 	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)
- 		, SHUTDOWN_DEFAULT
- #endif
- 		);
+$OpenBSD: patch-_mysql_c,v 1.4 2014/09/03 13:43:39 benoit Exp $
+--- _mysql.c.orig	Thu Jan  2 13:52:50 2014
++++ _mysql.c	Wed Sep  3 13:57:17 2014
+@@ -2079,7 +2079,7 @@
+ 	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)
+ 		, SHUTDOWN_DEFAULT
+ #endif
+ 		);

databases/py-mysql/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2010/11/14 08:57:19 benoit Exp $
+@comment $OpenBSD: PLIST,v 1.12 2014/09/03 13:43:39 benoit Exp $
 lib/python${MODPY_VERSION}/site-packages/MySQL_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/MySQL_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/MySQL_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -35,6 +35,46 @@ 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/py-mysql/
-share/doc/py-mysql/FAQ.txt
-share/doc/py-mysql/MySQLdb.txt
+share/doc/${MODPY_PY_PREFIX}mysql/
+share/doc/${MODPY_PY_PREFIX}mysql/FAQ.html
+share/doc/${MODPY_PY_PREFIX}mysql/MySQLdb.constants.html
+share/doc/${MODPY_PY_PREFIX}mysql/MySQLdb.html
+share/doc/${MODPY_PY_PREFIX}mysql/_mysql.html
+share/doc/${MODPY_PY_PREFIX}mysql/_mysql_exceptions.html
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/FAQ.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/MySQLdb.constants.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/MySQLdb.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/_mysql.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/_mysql_exceptions.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/index.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/modules.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_sources/user_guide.txt
+share/doc/${MODPY_PY_PREFIX}mysql/_static/
+share/doc/${MODPY_PY_PREFIX}mysql/_static/ajax-loader.gif
+share/doc/${MODPY_PY_PREFIX}mysql/_static/basic.css
+share/doc/${MODPY_PY_PREFIX}mysql/_static/comment-bright.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/comment-close.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/comment.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/default.css
+share/doc/${MODPY_PY_PREFIX}mysql/_static/doctools.js
+share/doc/${MODPY_PY_PREFIX}mysql/_static/down-pressed.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/down.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/file.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/jquery.js
+share/doc/${MODPY_PY_PREFIX}mysql/_static/minus.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/plus.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/pygments.css
+share/doc/${MODPY_PY_PREFIX}mysql/_static/searchtools.js
+share/doc/${MODPY_PY_PREFIX}mysql/_static/sidebar.js
+share/doc/${MODPY_PY_PREFIX}mysql/_static/underscore.js
+share/doc/${MODPY_PY_PREFIX}mysql/_static/up-pressed.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/up.png
+share/doc/${MODPY_PY_PREFIX}mysql/_static/websupport.js
+share/doc/${MODPY_PY_PREFIX}mysql/genindex.html
+share/doc/${MODPY_PY_PREFIX}mysql/index.html
+share/doc/${MODPY_PY_PREFIX}mysql/modules.html
+share/doc/${MODPY_PY_PREFIX}mysql/objects.inv
+share/doc/${MODPY_PY_PREFIX}mysql/search.html
+share/doc/${MODPY_PY_PREFIX}mysql/searchindex.js
+share/doc/${MODPY_PY_PREFIX}mysql/user_guide.html