Update to 1.1.0. Now uses MySQLmodule rather than mySQLmodule by default

and so no longer needs patch to work with the py-mysql pkg.

3 files changed, 10 insertions, 55 deletions

diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index bdd6617a22e..0d267c02637 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/12/19 18:39:25 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 1998/12/23 06:49:44 tsarna Exp $
 #
 
-DISTNAME=	ZmySQLDA-1.0.5-nonbin
-PKGNAME=	zope-mysql-1.0.5
+DISTNAME=	ZMySQLDA-1.1.0-nonbin
+PKGNAME=	zope-mysql-1.1.0
 CATEGORIES=	www
-MASTER_SITES=   http://www.zope.org/Download/ZmySQLDA/
+MASTER_SITES=   http://www.zope.org/Download/ZMySQLDA/
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.zope.org/
 
-DEPENDS+=	zope-1.9.0b3:../../www/zope
+DEPENDS+=	zope-1.9.0:../../www/zope
 DEPENDS+=	py-mysql-1.4:../../databases/py-mysql
 
 WRKSRC=		${WRKDIR}/lib
@@ -17,15 +17,14 @@ WRKSRC=		${WRKDIR}/lib
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 ZOPEDIR=	${PREFIX}/zope
-DAPATH=		lib/python/Products/ZmySQLDA
+DAPATH=		lib/python/Products/ZMySQLDA
 
 do-configure:
-	(cd ${WRKDIR}/${DAPATH}; ${RM} -f Makefile* *.pyc *.orig Setup)
+	(cd ${WRKDIR}/${DAPATH}; ${RM} -rf Makefile* *.pyc *.orig src Setup)
 
 do-build:
 	(cd ${WRKDIR}/${DAPATH} ; \
-	${PREFIX}/bin/python ${PREFIX}/lib/python1.5/compileall.py . ; \
-	${PREFIX}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py . ; )
+	${PREFIX}/bin/python ${PREFIX}/lib/python1.5/compileall.py . ; )
 	
 do-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
diff --git a/databases/zope-mysql/files/md5 b/databases/zope-mysql/files/md5
index f6e975990b8..2390f2d8629 100644
--- a/databases/zope-mysql/files/md5
+++ b/databases/zope-mysql/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1998/12/19 18:39:25 tsarna Exp $
+$NetBSD: md5,v 1.2 1998/12/23 06:49:44 tsarna Exp $
 
-MD5 (ZmySQLDA-1.0.5-nonbin.tar.gz) = 88c63bc4f5396c144e79cfe06d1e18db
+MD5 (ZMySQLDA-1.1.0-nonbin.tar.gz) = 5f1bae0ae74064d30bf181726e723eeb
diff --git a/databases/zope-mysql/patches/patch-aa b/databases/zope-mysql/patches/patch-aa
deleted file mode 100644
index 14f0eb591d4..00000000000
--- a/databases/zope-mysql/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/12/19 18:39:25 tsarna Exp $
-
---- python/Products/ZmySQLDA/db.py.orig	Fri Dec 18 14:54:28 1998
-+++ python/Products/ZmySQLDA/db.py	Sat Dec 19 12:02:01 1998
-@@ -97,7 +97,7 @@
- """Db connection implementation"""
- __version__='$Revision: 1.1.1.1 $'[11:-2]
- 
--import mySQL, regex, sys
-+import MySQL, regex, sys
- from string import strip, split, find, join
- from time import gmtime, strftime
- 
-@@ -118,7 +118,7 @@
-         "timestamp": "d", "varchar": "t", "string": "t",
-         }
- 
--    Database_Error=mySQL.error
-+    Database_Error=MySQL.error
- 
-     def __init__(self,connection):
-         self.connection=connection
-@@ -132,7 +132,7 @@
-                 if len(dbhost) == 1: db, host = dbhost[0], 'localhost'
-                 else: [db, host] = dbhost
-                 
--                c=mySQL.connect(host,user,pw)
-+                c=MySQL.connect(host,user,pw)
-                 c.selectdb(db)
-                 self.db=c
-                 return
-@@ -161,10 +161,10 @@
-             if not queries: raise 'Query Error', 'empty query'
-             result=()
-             for qs in queries:
--                c=db.querycursor(qs)
-+                c=db.query(qs)
-                 try:
-                     desc=c.fields()
--                    r=c.fetchmany(max_rows)
-+                    r=c.fetchrows()
-                 except: r=None
-                 if not r: continue
-                 if result: