5 files changed, 18 insertions, 77 deletions

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index c8f058f5afdb..55bbaa507e40 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	MySQLdb
 DISTVERSION=	1.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
 MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,23 +13,20 @@ MAINTAINER=	tj@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
 USE_PYTHON=		2
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 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
 
-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_DEFINE=	DOCS MYSQLCLIENT_R
+OPTIONS_DEFINE=		DOCS MYSQLCLIENT_R
 OPTIONS_DEFAULT=	DOCS MYSQLCLIENT_R
 MYSQLCLIENT_R_DESC=	Use libmysqlclient_r (thread safe)
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQLCLIENT_R}
@@ -39,10 +36,8 @@ pre-configure:
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
deleted file mode 100644
index 567df32281fe..000000000000
--- a/databases/py-MySQLdb/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-%%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%%
diff --git a/databases/py-MySQLdb51/Makefile b/databases/py-MySQLdb51/Makefile
index cc9dab958b26..43a1a9f81d87 100644
--- a/databases/py-MySQLdb51/Makefile
+++ b/databases/py-MySQLdb51/Makefile
@@ -5,11 +5,7 @@ PKGNAMESUFFIX=	51
 
 COMMENT=	Access a MySQL database through Python (Using MySQL 5.1 Client)
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
-
 WANT_MYSQL_VER=	51
-
 MASTERDIR=	${.CURDIR}/../py-MySQLdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/py-MySQLdb55/Makefile b/databases/py-MySQLdb55/Makefile
index dc788bf2db8c..90dce717a3f0 100644
--- a/databases/py-MySQLdb55/Makefile
+++ b/databases/py-MySQLdb55/Makefile
@@ -5,11 +5,7 @@ PKGNAMESUFFIX=	55
 
 COMMENT=	Access a MySQL database through Python (Using MySQL 5.5 Client)
 
-CONFLICTS=	py*-MySQLdb-devel-[0-9]* py*-MySQLdb-[0-9]* py*-MySQLdb[45][0-9]-[0-9]*
-
 WANT_MYSQL_VER=	55
-
 MASTERDIR=	${.CURDIR}/../py-MySQLdb
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/py-MySQLdb56/Makefile b/databases/py-MySQLdb56/Makefile
new file mode 100644
index 000000000000..92fdf301b06c
--- /dev/null
+++ b/databases/py-MySQLdb56/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	56
+
+COMMENT=	Access a MySQL database through Python (Using MySQL 5.5 Client)
+
+WANT_MYSQL_VER=	56
+MASTERDIR=	${.CURDIR}/../py-MySQLdb
+
+.include "${MASTERDIR}/Makefile"