Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	MySQLdb
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.2.5
+PORTREVISION=   1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -10,6 +11,9 @@
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/GPL-2.0
+
 USES=		python:2 mysql
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
@@ -16,7 +20,7 @@
 GH_ACCOUNT=	farcepest
 GH_PROJECT=	${PORTNAME}1
 
-CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-mysqlclient-[0-9]*
+CONFLICTS=	py*-MySQLdb5[0-9]-[0-9]* py*-mysqlclient-[0-9]*
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -37,5 +41,6 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/_mysql.so
 
 .include <bsd.port.mk>
Index: files/patch-_mysql.c
===================================================================
--- files/patch-_mysql.c
+++ files/patch-_mysql.c
@@ -1,7 +1,15 @@
---- _mysql.c.orig	2014-03-18 19:07:07.000000000 +0400
-+++ _mysql.c	2014-03-18 19:07:40.000000000 +0400
-@@ -102,6 +102,10 @@ static int _mysql_server_init_done = 0;
- #define check_server_init(x) if (!_mysql_server_init_done) _mysql_server_init_done = 1
+--- _mysql.c.orig	2014-01-02 19:15:03 UTC
++++ _mysql.c
+@@ -46,6 +46,7 @@ PERFORMANCE OF THIS SOFTWARE.
+ #include "mysql.h"
+ #include "mysqld_error.h"
+ #include "errmsg.h"
++#include "mysql_version.h"
+ 
+ #if PY_VERSION_HEX < 0x02020000
+ # define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n, d)
+@@ -124,6 +125,10 @@ static int _mysql_server_init_done = 0;
+ #define HAVE_MYSQL_OPT_TIMEOUTS 1
  #endif
  
 +#if MYSQL_VERSION_ID >= 50500
@@ -11,3 +19,16 @@
  PyObject *
  _mysql_Exception(_mysql_ConnectionObject *c)
  {
+@@ -2002,7 +2007,11 @@ _mysql_ConnectionObject_ping(
+ 	int r, reconnect = -1;
+ 	if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
+ 	check_connection(self);
++#if MYSQL_VERSION_ID >= 100206
++	mysql_optionsv(&(self->connection), MYSQL_OPT_RECONNECT, (void *)&reconnect);
++#else 
+ 	if ( reconnect != -1 ) self->connection.reconnect = reconnect;
++#endif
+ 	Py_BEGIN_ALLOW_THREADS
+ 	r = mysql_ping(&(self->connection));
+ 	Py_END_ALLOW_THREADS
+