2 files changed, 55 insertions, 56 deletions

diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 08b37fcaf055..b865e208e125 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -25,18 +25,17 @@ CONFLICTS=	py*-MySQLdb-[0-9]*
 
 PORTDOCS=	*
 
-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} ""
+IGNORE=		please, use databases/py-MySQLdb instead
 
+OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
+OPTIONS=	MYSQLCLIENT_R "Use libmysqlclient_r (thread safe)" on
+
+.include <bsd.port.pre.mk>
+
+post-patch:
 .if defined(WITHOUT_MYSQLCLIENT_R)
-MAKE_ENV+=	mysqlclient="mysqlclient"
+	@${REINPLACE_CMD} -E -e "s|(threadsafe.*)True|\1 False|" \
+		${WRKSRC}/site.cfg
 .endif
 
 post-install:
@@ -46,4 +45,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/py-MySQLdb-devel/pkg-plist b/databases/py-MySQLdb-devel/pkg-plist
index 2ffca2ee744c..5af0a83dc131 100644
--- a/databases/py-MySQLdb-devel/pkg-plist
+++ b/databases/py-MySQLdb-devel/pkg-plist
@@ -1,45 +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/release.py
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/release.pyc
-lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/release.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%%/MySQLdb/__init__.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/connections.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CLIENT.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/CR.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/ER.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FIELD_TYPE.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/FLAG.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/REFRESH.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/constants/__init__.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/converters.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/cursors.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/release.pyo
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.py
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.pyc
+%%PYTHON_SITELIBDIR%%/MySQLdb/times.pyo
+%%PYTHON_SITELIBDIR%%/_mysql.so
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.py
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.pyc
+%%PYTHON_SITELIBDIR%%/_mysql_exceptions.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/MySQLdb/constants
+@dirrm %%PYTHON_SITELIBDIR%%/MySQLdb