From ed3d69c69ee004bcf3fda3e9406a3ff6eec118ac Mon Sep 17 00:00:00 2001
From: Diane Bruce <db@FreeBSD.org>
Date: Wed, 18 Jul 2012 00:59:20 +0000
Subject: [PATCH] - modify port to install the egg file as an unzipped archive 
  otherwise www/google-appengine 1.7.0 will fail

Submitted by:	nivit
Reviewed by:	tj
Obtained from:	email via tj
---
 databases/py-MySQLdb/Makefile  | 13 +++++---
 databases/py-MySQLdb/pkg-plist | 58 +++++++++++++++++++++++++++++++++-
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 44e083b1f16f..3779d513cc83 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,6 +19,7 @@ COMMENT=	Access a MySQL database through Python
 USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	easy_install
 USE_MYSQL=		yes
+PYDISTUTILS_INSTALLARGS=	-O 1 -N -Z -S ${PYTHON_SITELIBDIR} -d ${PYEASYINSTALL_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG}
 PYDISTUTILS_PKGNAME=	MySQL-python
 PYEASYINSTALL_ARCHDEP=	yes
 
@@ -28,18 +29,22 @@ 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.options.mk>
 
 .include <bsd.port.pre.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)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
diff --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
index ddf68a1c022f..f880c4f40f07 100644
--- a/databases/py-MySQLdb/pkg-plist
+++ b/databases/py-MySQLdb/pkg-plist
@@ -1 +1,57 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.so
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%