this is an update to py-mysql 1.2.5
there doesn't seem to be much movement on this project's
github page, but i've seen the version number 1.2.5
pop up on the internet from time to time, and it seems
to be the last stable release (says pypi, but not
sourceforge...)
i have run all the included test and they passed, but i
left the NO_TESTS in the makefile as it needs a running
mysql server and a custom .cnf file.
i am a docs junkie so i also added sphinx dependency
and the generated html docs.
please test and commit.
-f
--
no matter how cynical i get, i still can't keep up...
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-mysql/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 12 Jun 2013 20:36:33 -0000 1.44
+++ Makefile 18 Jun 2014 19:09:13 -0000
@@ -4,14 +4,14 @@ 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
+EXTRACT_SUFX = .zip
CATEGORIES = databases
-HOMEPAGE = http://mysql-python.sourceforge.net/
+HOMEPAGE = https://github.com/farcepest/MySQLdb1
MAINTAINER = Benoit Lecocq <[email protected]>
@@ -21,17 +21,27 @@ PERMIT_PACKAGE_CDROM= Yes
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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-mysql/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 14 Nov 2010 08:57:16 -0000 1.7
+++ distinfo 18 Jun 2014 19:09:13 -0000
@@ -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
Index: patches/patch-_mysql_c
===================================================================
RCS file: /cvs/ports/databases/py-mysql/patches/patch-_mysql_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-_mysql_c
--- patches/patch-_mysql_c 14 Nov 2010 08:57:17 -0000 1.3
+++ patches/patch-_mysql_c 18 Jun 2014 19:09:13 -0000
@@ -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
- );
+--- _mysql.c.orig Thu Jan 2 13:52:50 2014
++++ _mysql.c Wed Jun 18 20:34:40 2014
+@@ -2079,7 +2079,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
+ );
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/py-mysql/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 14 Nov 2010 08:57:19 -0000 1.11
+++ pkg/PLIST 18 Jun 2014 19:09:13 -0000
@@ -35,6 +35,47 @@ lib/python${MODPY_VERSION}/site-packages
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/${MODPY_PY_PREFIX}modindex.html
+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
