4 files changed, 8 insertions, 64 deletions

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 0432c4f69807..25390bc9381f 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	MySQLdb
-DISTVERSION=	1.2.2
+DISTVERSION=	1.2.3
 CATEGORIES=	databases python
 MASTER_SITES=	SF/mysql-python/mysql-python/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,14 +16,15 @@ MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Access a MySQL database through Python
 
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 USE_MYSQL=		yes
 PYDISTUTILS_PKGNAME=	MySQL-python
-PYDISTUTILS_PKGVERSION=	1.2.2
+PYEASYINSTALL_ARCHDEP=	yes
 
 CONFLICTS=	py*-MySQLdb-devel-[0-9]*
 
 PORTDOCS=	*
+DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS=	MYSQLCLIENT_R "Use libmysqlclient_r (thread safe)" on
diff --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo
index 09830e888797..0a607c22cbd6 100644
--- a/databases/py-MySQLdb/distinfo
+++ b/databases/py-MySQLdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (MySQL-python-1.2.2.tar.gz) = 532268f02870bea18c1d465e88afff30
-SHA256 (MySQL-python-1.2.2.tar.gz) = f4133b81e65c7b94a5921ff6a0e7bdbfb622f2a70473673103cb17d5a5be807a
-SIZE (MySQL-python-1.2.2.tar.gz) = 87078
+MD5 (MySQL-python-1.2.3.tar.gz) = 215eddb6d853f6f4be5b4afc4154292f
+SHA256 (MySQL-python-1.2.3.tar.gz) = 7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e
+SIZE (MySQL-python-1.2.3.tar.gz) = 70305
diff --git a/databases/py-MySQLdb/files/patch-setup.py b/databases/py-MySQLdb/files/patch-setup.py
deleted file mode 100644
index a2b04584d454..000000000000
--- a/databases/py-MySQLdb/files/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- setup.py.orig	Thu Apr  5 23:51:45 2007
-+++ setup.py	Thu Apr  5 23:51:58 2007
-@@ -2,8 +2,8 @@
- 
- import os
- import sys
--import ez_setup; ez_setup.use_setuptools()
--from setuptools import setup, Extension
-+from distutils.core import setup
-+from distutils.extension import Extension
- 
- if sys.version_info < (2, 3):
-     raise Error, "Python-2.3 or newer is required"
diff --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
index 9c98167ebbac..ddf68a1c022f 100644
--- a/databases/py-MySQLdb/pkg-plist
+++ b/databases/py-MySQLdb/pkg-plist
@@ -1,45 +1 @@
-%%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
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%