[Midnightbsd-cvs] mports [16176] trunk/databases/py-MySQLdb: update

[laffer1 at midnightbsd.org]

Revision: 16176
          http://svnweb.midnightbsd.org/mports/?rev=16176
Author:   laffer1
Date:     2014-04-12 14:16:07 -0400 (Sat, 12 Apr 2014)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/databases/py-MySQLdb/Makefile
    trunk/databases/py-MySQLdb/distinfo

Added Paths:
-----------
    trunk/databases/py-MySQLdb/files/
    trunk/databases/py-MySQLdb/files/patch-_mysql.c

Modified: trunk/databases/py-MySQLdb/Makefile
===================================================================
--- trunk/databases/py-MySQLdb/Makefile	2014-04-12 18:14:04 UTC (rev 16175)
+++ trunk/databases/py-MySQLdb/Makefile	2014-04-12 18:16:07 UTC (rev 16176)
@@ -2,6 +2,7 @@
 
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,32 +12,32 @@
 COMMENT=	Access a MySQL database through Python
 LICENSE=	gpl2
 
-USE_PYTHON=		-2.7
-USE_PYDISTUTILS=	easy_install
+USE_PYTHON=		2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 USE_MYSQL=		yes
-PYDISTUTILS_PKGNAME=	MySQL-python
-PYEASYINSTALL_ARCHDEP=	yes
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]*
+CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]*
 
 PORTDOCS=	*
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS=	MYSQLCLIENT_R "Use libmysqlclient_r (thread safe)" on
+OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
+OPTIONS_DEFAULT=	DOCS MYSQLCLIENT_R
+MYSQLCLIENT_R_DESC=	Use libmysqlclient_r (thread safe)
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
+.if ${PORT_OPTIONS:MMYSQLCLIENT_R}
 pre-configure:
-.if defined(WITHOUT_MYSQLCLIENT_R)
 	@${REINPLACE_CMD} -E -e "s|(threadsafe.*)True|\1 False|" \
 		${WRKSRC}/site.cfg
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/databases/py-MySQLdb/distinfo
===================================================================
--- trunk/databases/py-MySQLdb/distinfo	2014-04-12 18:14:04 UTC (rev 16175)
+++ trunk/databases/py-MySQLdb/distinfo	2014-04-12 18:16:07 UTC (rev 16176)
@@ -1,3 +1,2 @@
 SHA256 (MySQL-python-1.2.3.tar.gz) = 7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e
-RMD160 (MySQL-python-1.2.3.tar.gz) = e394e7bf08127068795aeebfbaea7dc3b2127c86
 SIZE (MySQL-python-1.2.3.tar.gz) = 70305

Added: trunk/databases/py-MySQLdb/files/patch-_mysql.c
===================================================================
--- trunk/databases/py-MySQLdb/files/patch-_mysql.c	                        (rev 0)
+++ trunk/databases/py-MySQLdb/files/patch-_mysql.c	2014-04-12 18:16:07 UTC (rev 16176)
@@ -0,0 +1,13 @@
+--- _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
+ #endif
+ 
++#if MYSQL_VERSION_ID >= 50500
++#define HAVE_OPENSSL 1
++#endif
++
+ PyObject *
+ _mysql_Exception(_mysql_ConnectionObject *c)
+ {