3 files changed, 61 insertions, 89 deletions

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 866bb79ac3b7..abdf6cab95c7 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	MySQLdb
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+DISTVERSION=	1.2.1_p2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysql-python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	MySQL-python-${PORTVERSION}
+DISTNAME=	MySQL-python-${DISTVERSION}
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
@@ -23,41 +22,23 @@ USE_MYSQL=		yes
 
 CONFLICTS=	py*-MySQLdb-devel-[0-9]*
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "You may use the following build options:"
-	@${ECHO} ""
-	@${ECHO} "	WITHOUT_MYSQLCLIENT_R=yes	Don't use mysqlclient_r lib"
-	@${ECHO} "					but is not guarantee thread-safe."
-	@${ECHO} ""
-	@${ECHO} "	Default use mysqlclient_r"
-	@${ECHO} ""
+PORTDOCS=	*
 
-.if defined(WITHOUT_MYSQLCLIENT_R)
-MAKE_ENV+=	mysqlclient="mysqlclient"
-.endif
+OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
+OPTIONS=	MYSQLCLIENT_R "Use libmysqlclient_r (thread safe)" on
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	*
+.include <bsd.port.pre.mk>
+
+post-patch:
+.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}/doc/*.html ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/doc
-	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.html ${DOCSDIR}/doc
-	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.css ${DOCSDIR}/doc
-	@${MKDIR} ${DOCSDIR}/doc/public
-	@${INSTALL_DATA} ${WRKSRC}/doc/doc/public/* ${DOCSDIR}/doc/public
-	@${MKDIR} ${DOCSDIR}/doc/private
-	@${INSTALL_DATA} ${WRKSRC}/doc/doc/private/* ${DOCSDIR}/doc/private
-	@${MKDIR} ${DOCSDIR}/public
-	@${INSTALL_DATA} ${WRKSRC}/doc/public/* ${DOCSDIR}/public
-	@${MKDIR} ${DOCSDIR}/private
-	@${INSTALL_DATA} ${WRKSRC}/doc/private/* ${DOCSDIR}/private
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo
index 313721fe782c..533f9cfac8b1 100644
--- a/databases/py-MySQLdb/distinfo
+++ b/databases/py-MySQLdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (MySQL-python-1.2.0.tar.gz) = b0eb974cc3c917276e015275e1ec996f
-SHA256 (MySQL-python-1.2.0.tar.gz) = 816ddb8c13085923f5cf7afba745cf5e740c35b16d5204747ce62fb8d6482161
-SIZE (MySQL-python-1.2.0.tar.gz) = 252290
+MD5 (MySQL-python-1.2.1_p2.tar.gz) = e6b9ea21fd91cb4a5663304da727bb70
+SHA256 (MySQL-python-1.2.1_p2.tar.gz) = 59f44cd53cfa1189dcaa5bf2c48662d5765f347b03827feb807f4cd0ef18943e
+SIZE (MySQL-python-1.2.1_p2.tar.gz) = 65201
diff --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
index ac609b618e15..9c98167ebbac 100644
--- a/databases/py-MySQLdb/pkg-plist
+++ b/databases/py-MySQLdb/pkg-plist
@@ -1,54 +1,45 @@
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/connections.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/connections.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/connections.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CLIENT.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CLIENT.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CLIENT.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CR.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CR.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/CR.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/ER.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/ER.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/ER.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FIELD_TYPE.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FIELD_TYPE.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FIELD_TYPE.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FLAG.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FLAG.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/FLAG.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/REFRESH.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/REFRESH.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/REFRESH.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/converters.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/converters.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/converters.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/cursors.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/cursors.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/cursors.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/mxdatetimes.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/mxdatetimes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/mxdatetimes.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/pytimes.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/pytimes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/pytimes.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/sets.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/sets.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/sets.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/stringtimes.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/stringtimes.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/stringtimes.pyo
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/times.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/times.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/times.pyo
-lib/%%PYTHON_VERSION%%/site-packages/_mysql.so
-lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.py
-lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.pyc
-lib/%%PYTHON_VERSION%%/site-packages/_mysql_exceptions.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/constants
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/MySQLdb
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/__init__.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.pyo
+%%PYTHON_SITELIBDIR%%/_mysql.so
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.pyc
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/MySQLdb/constants
+@dirrm %%PYTHON_SITELIBDIR%%/MySQLdb