Update to 0.3.0b1.

4 files changed, 42 insertions, 18 deletions

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index fcfc4e98ddb1..c3af7b1588eb 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -6,31 +6,29 @@
 #
 
 PORTNAME=	py-MySQLdb
-PORTVERSION=	0.2.2
+PORTVERSION=	0.3.0b1
 CATEGORIES=	databases python
-MASTER_SITES=	http://dustman.net/andy/python/MySQLdb/${PORTVERSION}/
-DISTNAME=	MySQLdb-${PORTVERSION}
+MASTER_SITES=	http://dustman.net/andy/python/MySQLdb/0.3.0/
+DISTNAME=	MySQL-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
+BUILD_DEPENDS=	${PYDISTUTILS}
 LIB_DEPENDS=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 
-USE_PYTHON=	yes
-ALL_TARGET=	_mysqlmodule.o
+WRKSRC=		${WRKDIR}/MySQLdb-${PORTVERSION}
 
-pre-configure:
-	@${LN} -s ${LOCALBASE}/lib/${PYTHON_VERSION}/config/Makefile.pre.in ${WRKSRC}/
+USE_PYTHON=	yes
+SETUP_CMD=	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
 
 do-configure:
-	@cd ${WRKSRC} && ${MAKE} -f Makefile.pre.in boot
+	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
-post-build:
-	@-${LOCALBASE}/bin/python \
-		${LOCALBASE}/lib/${PYTHON_VERSION}/compileall.py ${WRKSRC} 2>/dev/null
+do-build:
+	${SETUP_CMD} build
 
-post-install:
-	@${INSTALL_DATA} \
-		${WRKSRC}/MySQLdb.pyc ${PREFIX}/lib/${PYTHON_VERSION}/site-packages
+do-install:
+	${SETUP_CMD} install
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/py-MySQLdb/examples
 	@${INSTALL_MAN} ${WRKSRC}/doc/* ${PREFIX}/share/doc/py-MySQLdb
diff --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo
index 035ddcf080ae..2046eeb34218 100644
--- a/databases/py-MySQLdb/distinfo
+++ b/databases/py-MySQLdb/distinfo
@@ -1 +1 @@
-MD5 (MySQLdb-0.2.2.tar.gz) = 660b2868484a619f5cfc60fd521c06be
+MD5 (MySQL-0.3.0b1.tar.gz) = 5e6180772cff2a90d2e6a701f2f4d8ab
diff --git a/databases/py-MySQLdb/files/patch-ab b/databases/py-MySQLdb/files/patch-ab
new file mode 100644
index 000000000000..3892458d0db6
--- /dev/null
+++ b/databases/py-MySQLdb/files/patch-ab
@@ -0,0 +1,26 @@
+--- setup.py.orig	Fri Oct 27 04:09:37 2000
++++ setup.py	Mon Oct 30 11:24:59 2000
+@@ -9,10 +9,10 @@
+ # You may need to edit this script to point to the location of your
+ # MySQL installation.  It should be sufficient to change the value of
+ # the MYSQL_DIR variable below.
+-MYSQL_INCLUDE_DIR = '/usr/include/mysql'
+-MYSQL_LIB_DIR = '/usr/lib/mysql'
+-#mysqlclient = "mysqlclient"   # maybe not thread-safe
+-mysqlclient = "mysqlclient_r" # thread-safe
++MYSQL_INCLUDE_DIR = '/usr/local/include/mysql'
++MYSQL_LIB_DIR = '/usr/local/lib/mysql'
++mysqlclient = "mysqlclient"   # maybe not thread-safe
++#mysqlclient = "mysqlclient_r" # thread-safe
+ 
+ 
+ setup (# Distribution meta-data
+@@ -32,7 +32,7 @@
+                 sources=['_mysqlmodule.c'],
+                 include_dirs=[MYSQL_INCLUDE_DIR],
+ 		# maybe comment to force dynamic libraries
+-                #library_dirs=[MYSQL_LIB_DIR],
++                library_dirs=[MYSQL_LIB_DIR],
+ 		# uncomment if linking against dynamic libraries
+ 		#runtime_library_dirs=[MYSQL_LIB_DIR],
+                 libraries=[
diff --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
index 89e042b3270b..e428681309de 100644
--- a/databases/py-MySQLdb/pkg-plist
+++ b/databases/py-MySQLdb/pkg-plist
@@ -1,12 +1,12 @@
+lib/%%PYTHON_VERSION%%/site-packages/MySQLdb.py
 lib/%%PYTHON_VERSION%%/site-packages/MySQLdb.pyc
+lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.py
+lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.pyc
 lib/%%PYTHON_VERSION%%/site-packages/_mysqlmodule.so
 share/doc/py-MySQLdb/MySQLdb-1.html
 share/doc/py-MySQLdb/MySQLdb-2.html
 share/doc/py-MySQLdb/MySQLdb-3.html
 share/doc/py-MySQLdb/MySQLdb-4.html
-share/doc/py-MySQLdb/MySQLdb-5.html
-share/doc/py-MySQLdb/MySQLdb-6.html
-share/doc/py-MySQLdb/MySQLdb-7.html
 share/doc/py-MySQLdb/MySQLdb-FAQ-1.html
 share/doc/py-MySQLdb/MySQLdb-FAQ-2.html
 share/doc/py-MySQLdb/MySQLdb-FAQ-3.html