Replace broken py-mysql with py-mysqldb

7 files changed, 2 insertions, 57 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 5948b55de8f..f7b1a1d7dda 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/02/25 01:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2000/02/26 18:48:22 tsarna Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/30 11:47:51 tg Exp 
 #
 
@@ -23,7 +23,7 @@
     SUBDIR += pgaccess
     SUBDIR += postgresql
     SUBDIR += py-gdbm
-    SUBDIR += py-mysql
+    SUBDIR += py-mysqldb
     SUBDIR += py-postgresql
     SUBDIR += rrdtool
     SUBDIR += sdbm
diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile
deleted file mode 100644
index 89d2914bb49..00000000000
--- a/databases/py-mysql/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2000/02/15 09:26:19 agc Exp $
-
-DISTNAME=	MySQLmodule-1.4
-PKGNAME=	py-mysql-1.4
-CATEGORIES=	databases
-MASTER_SITES=	http://snail.earthlight.co.nz/mysql/
-DISTFILES=	MySQLmodule-1.4${EXTRACT_SUFX} \
-		Mysqldb.py mysqlshelve.py
-
-MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://snail.earthlight.co.nz/projects.html
-
-DEPENDS+=	python-1.5.2:../../lang/python
-DEPENDS+=	mysql-client-3.22.32:../../databases/mysql-client
-
-EXTRACT_ONLY=	MySQLmodule-1.4${EXTRACT_SUFX}
-ALL_TARGET=	default
-
-do-configure:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/Setup.in \
-		>${WRKSRC}/Setup.in
-	${CP} ${PREFIX}/lib/python1.5/config/Makefile.pre.in ${WRKSRC}
-	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
-	${CP} ${DISTDIR}/Mysqldb.py ${DISTDIR}/mysqlshelve.py ${WRKSRC}
-
-post-build:
-	(cd ${WRKSRC}; python ${PREFIX}/lib/python1.5/compileall.py .)
-	(cd ${WRKSRC}; python -O ${PREFIX}/lib/python1.5/compileall.py .)
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${WRKSRC}/*.py[co] \
-		${PREFIX}/lib/python1.5/site-packages
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-mysql/files/Setup.in b/databases/py-mysql/files/Setup.in
deleted file mode 100644
index e5b6d8b903f..00000000000
--- a/databases/py-mysql/files/Setup.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: Setup.in,v 1.4 1999/04/25 20:10:00 tsarna Exp $
-#
-*shared*
-MySQL MySQLmodule.c -L@PREFIX@/lib/mysql -R@PREFIX@/lib/mysql \
-	-lmysqlclient -I@PREFIX@/include/mysql
diff --git a/databases/py-mysql/files/md5 b/databases/py-mysql/files/md5
deleted file mode 100644
index 25acc3d0f2b..00000000000
--- a/databases/py-mysql/files/md5
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: md5,v 1.3 1998/10/19 16:56:35 tsarna Exp $
-
-MD5 (MySQLmodule-1.4.tar.gz) = 5da13c9806450e085060e80b4e60a51e
-MD5 (Mysqldb.py) = d95698475a55a27555f2261d9eac4373
-MD5 (mysqlshelve.py) = 4b96e4b84468994fbecef03737e1daee
diff --git a/databases/py-mysql/pkg/COMMENT b/databases/py-mysql/pkg/COMMENT
deleted file mode 100644
index 4f701048e9b..00000000000
--- a/databases/py-mysql/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-MySQL interface for Python
diff --git a/databases/py-mysql/pkg/DESCR b/databases/py-mysql/pkg/DESCR
deleted file mode 100644
index 28bb3b87d47..00000000000
--- a/databases/py-mysql/pkg/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-MySQLmodule 1.1.0 is a Python interace to the MySQL client library,
-allowing Python programs to access MySQL databases.
diff --git a/databases/py-mysql/pkg/PLIST b/databases/py-mysql/pkg/PLIST
deleted file mode 100644
index 75928545c18..00000000000
--- a/databases/py-mysql/pkg/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 1998/06/22 21:53:10 tron Exp $
-lib/python1.5/site-packages/MySQLmodule.so
-lib/python1.5/site-packages/Mysqldb.py
-lib/python1.5/site-packages/Mysqldb.pyc
-lib/python1.5/site-packages/Mysqldb.pyo
-lib/python1.5/site-packages/mysqlshelve.py
-lib/python1.5/site-packages/mysqlshelve.pyc
-lib/python1.5/site-packages/mysqlshelve.pyo