diff options
author | joerg <joerg> | 2007-05-29 10:16:42 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-05-29 10:16:42 +0000 |
commit | c5d0d4e1d6ab12d512cfdfc296b4788b1d4d546d (patch) | |
tree | c14732e1a39b8fdfe15fae673abfe54f8c87872c /databases | |
parent | e59c1072d5b96419b09f73dd67ea6f7bdab3603d (diff) | |
download | pkgsrc-c5d0d4e1d6ab12d512cfdfc296b4788b1d4d546d.tar.gz |
Remove Zope 2.2 and related pieces:
databases/zope-mysql
lang/py-extclass
textproc/py-dtml
www/py-pcgi
www/py-zpublisher
www/zope
No objection from pkgsrc-users.
cVS: ----------------------------------------------------------------------
Diffstat (limited to 'databases')
-rw-r--r-- | databases/Makefile | 3 | ||||
-rw-r--r-- | databases/zope-mysql/DESCR | 1 | ||||
-rw-r--r-- | databases/zope-mysql/Makefile | 44 | ||||
-rw-r--r-- | databases/zope-mysql/PLIST.pre | 1 | ||||
-rw-r--r-- | databases/zope-mysql/distinfo | 6 | ||||
-rw-r--r-- | databases/zope-mysql/patches/patch-aa | 145 |
6 files changed, 1 insertions, 199 deletions
diff --git a/databases/Makefile b/databases/Makefile index e49e5613ec6..5c3dc01ff13 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.229 2007/05/23 22:11:38 kristerw Exp $ +# $NetBSD: Makefile,v 1.230 2007/05/29 10:16:42 joerg Exp $ # COMMENT= Databases @@ -203,6 +203,5 @@ SUBDIR+= unixodbc-DataManager SUBDIR+= unixodbc-ODBCConfig SUBDIR+= xsqlmenu SUBDIR+= yasql -SUBDIR+= zope-mysql .include "../mk/bsd.pkg.subdir.mk" diff --git a/databases/zope-mysql/DESCR b/databases/zope-mysql/DESCR deleted file mode 100644 index 3f4a7c68c99..00000000000 --- a/databases/zope-mysql/DESCR +++ /dev/null @@ -1 +0,0 @@ -Zope Database Adaptor for MySQL diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile deleted file mode 100644 index c6a0df9176a..00000000000 --- a/databases/zope-mysql/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:20 wiz Exp $ -# - -DISTNAME= ZMySQLDA-1.1.3-nonbin -PKGNAME= zope-mysql-1.1.3 -PKGREVISION= 4 -CATEGORIES= databases www -MASTER_SITES= http://www.zope.org/Members/MikeP/ZMySQLDA/ - -MAINTAINER= tsarna@NetBSD.org -HOMEPAGE= http://www.zope.org/Members/MikeP/ZMySQLDA -COMMENT= Zope Database Adaptor for MySQL - -DEPENDS+= zope-2.*:../../www/zope -DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb - -WRKSRC= ${WRKDIR}/lib - -PLIST_SRC= ${WRKDIR}/.PLIST_SRC - -ZOPEDIR= ${PREFIX}/lib/zope -DAPATH= lib/python/Products/ZMySQLDA -PYTHON_VERSIONS_ACCEPTED= 20 # XXX for now - -INSTALLATION_DIRS= lib - -do-configure: - (cd ${WRKDIR}/${DAPATH}; ${RM} -rf Makefile* *.pyc *.orig src Setup) - -do-build: - ${PYTHONBIN} ${PREFIX}/lib/python2.0/compileall.py \ - ${WRKDIR}/${DAPATH} - ${PYTHONBIN} -O ${PREFIX}/lib/python2.0/compileall.py \ - ${WRKDIR}/${DAPATH} - -do-install: - ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR} - ${CHMOD} -R a+rX ${ZOPEDIR}/${DAPATH} - (cd ${PREFIX}; ${FIND} lib/zope/${DAPATH} -type f -print >>${PLIST_SRC}) - ${ECHO} "@dirrm lib/zope/${DAPATH}" >> ${PLIST_SRC} - -.include "../../lang/python/application.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/databases/zope-mysql/PLIST.pre b/databases/zope-mysql/PLIST.pre deleted file mode 100644 index 382640269df..00000000000 --- a/databases/zope-mysql/PLIST.pre +++ /dev/null @@ -1 +0,0 @@ -@comment $NetBSD: PLIST.pre,v 1.1 2001/11/01 00:16:22 zuntum Exp $ diff --git a/databases/zope-mysql/distinfo b/databases/zope-mysql/distinfo deleted file mode 100644 index 7ee32eba46d..00000000000 --- a/databases/zope-mysql/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 16:33:11 agc Exp $ - -SHA1 (ZMySQLDA-1.1.3-nonbin.tar.gz) = 9ce2b493ee3f60b8a2358925240523f6863283df -RMD160 (ZMySQLDA-1.1.3-nonbin.tar.gz) = 939fb3fe54d26d911c1a55eea7d0db5dd58d2090 -Size (ZMySQLDA-1.1.3-nonbin.tar.gz) = 31641 bytes -SHA1 (patch-aa) = d980759481eedb742d00bf0d41f41c348ace6482 diff --git a/databases/zope-mysql/patches/patch-aa b/databases/zope-mysql/patches/patch-aa deleted file mode 100644 index a568ffa4dee..00000000000 --- a/databases/zope-mysql/patches/patch-aa +++ /dev/null @@ -1,145 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2000/03/16 12:14:07 wiz Exp $ - -Patch from MySQLdb distribution to let the ZMySQL DA work with it -instead of with MySQLmodule, with patch paths modified for pkg use. - ---- - -This patch should convert ZMySQLDA from using MySQLmodule-1.4 to _mysql. -Why _mysql and not MySQLdb? Well, look at the patch. :) It's basically puny. -ZMySQLDA ends up abstracting away the Python DB API interface anyway, so why -wrap another wrapper? Plus, by default MySQLdb attempts to do type -conversions, which Zope doesn't want at this point. - -I made some changes, partially to help Zopistas, to both _mysql and MySQLdb. -The main one is removing type_conv as part of _mysql. It now needs to be -passed to _mysql.connect() as the conv keyword argument; if it is not present, -it uses an empty dictionary (return everything as strings). MySQLdb now owns -type_conv, and passes a copy if you don't supply your own converter. Thanks -to Thilo Mezger for pointing out that Zope DOES expect numbers to be returned -as numbers, so now a minimal type converter dictionary is passed. - -To apply the patch, you probably want to do something like this: - - cd ZOPEHOME # whatever that is - tar xvfz ZMySQLDA.tar.gz # the original, unadulterated version - patch -p1 <ZMySQLDA.patch # adulterate it - -Then, follow the README instructions for building MySQLdb and install -it where Python can find it. Finally, you will need to restart Zope. - -Andy Dustman <adustman@comstar.net> -1999-10-11 - -diff -ur python/Products/ZMySQLDA/DA.py python/Products/ZMySQLDA/DA.py ---- python/Products/ZMySQLDA/DA.py Mon Jan 25 10:42:45 1999 -+++ python/Products/ZMySQLDA/DA.py Wed Sep 15 20:16:32 1999 -@@ -133,18 +133,6 @@ - - def factory(self): return DB - -- def sql_quote__(self, v, escapes={ -- '\\': '\\\\', -- '\"': '\\\"', -- '\'': '\\\'', -- '\0': '\\0', -- '\n': '\\n', -- '\t': '\\t', -- '\r': '\\r', -- '\b': '\\n', -- }): -- find=string.find -- for c in "\\\"\'\0\n\t\r\b": -- if find(v,c) > -1: -- v=string.join(string.split(v,c),escapes[c]) -- return "'%s'" % v -+ def sql_quote__(self, v, escapes={}): -+ from _mysql import escape_string -+ return "'%s'" % escape_string(v) -diff -ur python/Products/ZMySQLDA/db.py python/Products/ZMySQLDA/db.py ---- python/Products/ZMySQLDA/db.py Mon Jan 25 10:42:45 1999 -+++ python/Products/ZMySQLDA/db.py Mon Oct 11 21:29:07 1999 -@@ -105,5 +105,6 @@ - --import MySQL, regex, sys -+import _mysql, regex, sys -+from _mysql import FIELD_TYPE - from string import strip, split, find, join - from time import gmtime, strftime - -@@ -118,13 +119,26 @@ - class DB: - - defs={ -- "short": "i", "long": "i", "char": "s", "double": "n", "decimal": "n", -- "float": "n", "tiny blob": "t", "medium blob": "t", "long blob": "t", -- "blob": "t", "date": "d", "time": "s", "datetime": "d", -- "timestamp": "d", "varchar": "t", "string": "t", -+ FIELD_TYPE.CHAR: "i", FIELD_TYPE.DATE: "d", -+ FIELD_TYPE.DATETIME: "d", FIELD_TYPE.DECIMAL: "n", -+ FIELD_TYPE.DOUBLE: "n", FIELD_TYPE.FLOAT: "n", FIELD_TYPE.INT24: "i", -+ FIELD_TYPE.LONG: "i", FIELD_TYPE.LONGLONG: "l", -+ FIELD_TYPE.SHORT: "i", FIELD_TYPE.TIMESTAMP: "d", -+ FIELD_TYPE.TINY: "i", FIELD_TYPE.YEAR: "i", - } - -- Database_Error=MySQL.error -+ conv={ -+ FIELD_TYPE.TINY: int, -+ FIELD_TYPE.SHORT: int, -+ FIELD_TYPE.LONG: int, -+ FIELD_TYPE.FLOAT: float, -+ FIELD_TYPE.DOUBLE: float, -+ FIELD_TYPE.LONGLONG: long, -+ FIELD_TYPE.INT24: int, -+ FIELD_TYPE.YEAR: int -+ } -+ -+ Database_Error=_mysql.Error - - def __init__(self,connection): - self.connection=connection -@@ -138,8 +152,7 @@ - if len(dbhost) == 1: db, host = dbhost[0], 'localhost' - else: [db, host] = dbhost - -- c=MySQL.connect(host,user,pw) -- c.selectdb(db) -+ c=_mysql.connect(host=host,user=user,passwd=pw,db=db,conv=self.conv) - self.db=c - return - -@@ -168,10 +181,11 @@ - result=() - desc=None - for qs in queries: -- c=db.query(qs) -+ db.query(qs) -+ c=db.store_result() - try: -- desc=c.fields() -- r=c.fetchrows() -+ desc=c.describe() -+ r=c.fetch_all_rows() - except: r=None - if not r: continue - if result: -@@ -182,15 +196,15 @@ - except self.Database_Error, mess: - raise sys.exc_type, sys.exc_value, sys.exc_traceback - -- if desc is None: return (), () -+ if not desc: return (), () - - items=[] - func=items.append - defs=self.defs - for d in desc: - item={'name': d[0], -- 'type': defs[d[2]], -- 'width': d[3], -+ 'type': defs.get(d[1],"t"), -+ 'width': d[2], - } - func(item) - return items, result |