diff options
author | mjl <mjl@pkgsrc.org> | 2008-08-06 17:16:49 +0000 |
---|---|---|
committer | mjl <mjl@pkgsrc.org> | 2008-08-06 17:16:49 +0000 |
commit | e7911462c9b3c1cb3767b0bdbe8aa251eb6b9945 (patch) | |
tree | b798bffc518eae963ac8fab4cfcd922e42e2fac6 /databases/py-mysqldb | |
parent | d3c2f5ef217faa33dccefd6ccdae5408d1068684 (diff) | |
download | pkgsrc-e7911462c9b3c1cb3767b0bdbe8aa251eb6b9945.tar.gz |
Update py-mysqldb to 1.2.2.
Changes are too many to list since the previous version was from 2002.
Diffstat (limited to 'databases/py-mysqldb')
-rw-r--r-- | databases/py-mysqldb/Makefile | 27 | ||||
-rw-r--r-- | databases/py-mysqldb/PLIST | 18 | ||||
-rw-r--r-- | databases/py-mysqldb/distinfo | 10 | ||||
-rw-r--r-- | databases/py-mysqldb/patches/patch-aa | 79 | ||||
-rw-r--r-- | databases/py-mysqldb/patches/patch-ab | 24 |
5 files changed, 23 insertions, 135 deletions
diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile index c22d5d73102..396351a963f 100644 --- a/databases/py-mysqldb/Makefile +++ b/databases/py-mysqldb/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.24 2008/06/12 02:14:20 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2008/08/06 17:16:49 mjl Exp $ -DISTNAME= MySQL-python-0.9.2 -PKGNAME= ${PYPKGPREFIX}-mysqldb-0.9.2 -PKGREVISION= 3 +DISTNAME= MySQL-python-${PKGVER} +PKGNAME= ${PYPKGPREFIX}-mysqldb-${PKGVER} +PKGVER= 1.2.2 +# PKGREVISION= 3 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysql-python/} @@ -13,22 +14,14 @@ COMMENT= MySQL interface for Python PKG_DESTDIR_SUPPORT= user-destdir PYDISTUTILSPKG= yes +PYBINMODULE= yes PY_PATCHPLIST= yes +PYSETUPINSTALLARGS= --single-version-externally-managed --record plist.txt +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -PYTHON_VERSIONS_ACCEPTED= 25 24 23 21 +PYTHON_VERSIONS_ACCEPTED= 25 24 23 .include "../../mk/mysql.buildlink3.mk" -.include "../../lang/python/extension.mk" - -# To pickup python version info -pre-configure: - ${SED} -e "s|@MYSQLPREFIX@|${BUILDLINK_PREFIX.mysql-client}|" \ - -e "s|@MYSQLRTPREFIX@|${BUILDLINK_PREFIX.mysql-client}|" \ - <${WRKSRC}/setup.py >${WRKSRC}/setup.py.tmp -.if ${PYPKGPREFIX:Mpy20} == "py20" - ${SED} -e "s|platforms = .ALL.|#platforms = \"ALL\"|" <${WRKSRC}/setup.py.tmp > ${WRKSRC}/setup.py.tmp2 - ${MV} ${WRKSRC}/setup.py.tmp2 ${WRKSRC}/setup.py.tmp -.endif - ${MV} ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py +.include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-mysqldb/PLIST b/databases/py-mysqldb/PLIST index b52aaea7a9f..a1f230db1c6 100644 --- a/databases/py-mysqldb/PLIST +++ b/databases/py-mysqldb/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.4 2003/09/14 16:43:48 recht Exp $ -${PYSITELIB}/CompatMysqldb.py -${PYSITELIB}/CompatMysqldb.pyc -${PYSITELIB}/CompatMysqldb.pyo +@comment $NetBSD: PLIST,v 1.5 2008/08/06 17:16:49 mjl Exp $ +${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/PKG-INFO +${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/SOURCES.txt +${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/dependency_links.txt +${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/native_libs.txt +${PYSITELIB}/MySQL_python-1.2.2-py${PYVERSSUFFIX}.egg-info/top_level.txt ${PYSITELIB}/MySQLdb/__init__.py ${PYSITELIB}/MySQLdb/__init__.pyc ${PYSITELIB}/MySQLdb/__init__.pyo @@ -35,9 +37,9 @@ ${PYSITELIB}/MySQLdb/converters.pyo ${PYSITELIB}/MySQLdb/cursors.py ${PYSITELIB}/MySQLdb/cursors.pyc ${PYSITELIB}/MySQLdb/cursors.pyo -${PYSITELIB}/MySQLdb/sets.py -${PYSITELIB}/MySQLdb/sets.pyc -${PYSITELIB}/MySQLdb/sets.pyo +${PYSITELIB}/MySQLdb/release.py +${PYSITELIB}/MySQLdb/release.pyc +${PYSITELIB}/MySQLdb/release.pyo ${PYSITELIB}/MySQLdb/times.py ${PYSITELIB}/MySQLdb/times.pyc ${PYSITELIB}/MySQLdb/times.pyo @@ -45,5 +47,3 @@ ${PYSITELIB}/_mysql.so ${PYSITELIB}/_mysql_exceptions.py ${PYSITELIB}/_mysql_exceptions.pyc ${PYSITELIB}/_mysql_exceptions.pyo -@dirrm ${PYSITELIB}/MySQLdb/constants -@dirrm ${PYSITELIB}/MySQLdb diff --git a/databases/py-mysqldb/distinfo b/databases/py-mysqldb/distinfo index 0fc8e5b6e71..358c00f12d8 100644 --- a/databases/py-mysqldb/distinfo +++ b/databases/py-mysqldb/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.7 2006/02/26 16:37:41 joerg Exp $ +$NetBSD: distinfo,v 1.8 2008/08/06 17:16:49 mjl Exp $ -SHA1 (MySQL-python-0.9.2.tar.gz) = b6959ee5e28847e557229ddc318b097f10144ff2 -RMD160 (MySQL-python-0.9.2.tar.gz) = f7ef371e8f2c0a3b6979a99bfa368e4342aa4080 -Size (MySQL-python-0.9.2.tar.gz) = 64258 bytes -SHA1 (patch-aa) = 27ab8d1f675197e1fdaf5760dbdad5ea95043f59 -SHA1 (patch-ab) = d063f5a51fef1ed20015a7370ff80f37c7317bf5 +SHA1 (MySQL-python-1.2.2.tar.gz) = 945a04773f30091ad81743f9eb0329a3ee3de383 +RMD160 (MySQL-python-1.2.2.tar.gz) = 3f3ff52102c41f86de3181d33132f15a9882a5b1 +Size (MySQL-python-1.2.2.tar.gz) = 87078 bytes diff --git a/databases/py-mysqldb/patches/patch-aa b/databases/py-mysqldb/patches/patch-aa deleted file mode 100644 index a62baef553d..00000000000 --- a/databases/py-mysqldb/patches/patch-aa +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2003/06/06 10:36:38 jmmv Exp $ ---- setup.py.orig Thu Jul 18 14:55:36 2002 -+++ setup.py Thu Nov 14 15:36:03 2002 -@@ -11,7 +11,7 @@ - NO = 0 - - # set this to YES if you have the thread-safe mysqlclient library --thread_safe_library = YES -+thread_safe_library = NO - - # You probably don't have to do anything past this point. If you - # do, please mail me the configuration for your platform. Don't -@@ -23,14 +23,10 @@ - mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient" - - # include files and library locations should cover most platforms --include_dirs = [ -- '/usr/include/mysql', '/usr/local/include/mysql', -- '/usr/local/mysql/include/mysql' -- ] --library_dirs = [ -- '/usr/lib/mysql', '/usr/local/lib/mysql', -- '/usr/local/mysql/lib/mysql' -- ] -+mysqlprefix = '@MYSQLPREFIX@' -+mysqlrtprefix = '@MYSQLRTPREFIX@' -+include_dirs = [mysqlprefix + '/include/mysql'] -+library_dirs = [mysqlprefix + '/lib/mysql'] - - # MySQL-3.23 and newer need libz - libraries = [mysqlclient, "z"] -@@ -38,7 +34,7 @@ - # On some platorms, this can be used to find the shared libraries - # at runtime, if they are in a non-standard location. Doesn't - # work for Linux gcc. --runtime_library_dirs = [] -+runtime_library_dirs = [mysqlrtprefix + '/lib/mysql'] - - # This can be used to force linking against static libraries. - extra_objects = [] -@@ -48,38 +44,6 @@ - extra_compile_args = [] - extra_link_args = [] - --if sys.platform == "netbsd1": -- include_dirs = ['/usr/pkg/include/mysql'] -- library_dirs = ['/usr/pkg/lib/mysql'] --elif sys.platform in ("freebsd4", "openbsd3"): -- LOCALBASE = os.environ.get('LOCALBASE', '/usr/local') -- include_dirs = ['%s/include/mysql' % LOCALBASE] -- library_dirs = ['%s/lib/mysql' % LOCALBASE] --elif sys.platform == "sunos5": # Solaris 2.8 + gcc -- runtime_library_dirs.append('/usr/local/lib:/usr/openwin/lib:/usr/dt/lib') -- extra_compile_args.append("-fPIC") --elif sys.platform == "win32": # Ugh -- include_dirs = [r'c:\mysql\include'] -- library_dirs = [r'c:\mysql\lib\opt'] -- libraries = [mysqlclient, 'zlib', 'msvcrt', 'libcmt', -- 'wsock32', 'advapi32'] -- extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib'] --elif sys.platform == "cygwin": -- include_dirs = ['/c/mysql/include'] -- library_dirs = ['/c/mysql/lib'] -- extra_compile_args.append('-DMS_WIN32') --elif sys.platform[:6] == "darwin": # Mac OS X -- include_dirs.append('/sw/include') -- library_dirs.append('/sw/lib') -- extra_link_args.append('-flat_namespace') --elif sys.platform == 'linux2' and os.environ.get('HOSTTYPE') == 'alpha': -- libraries.extend(['ots', 'cpml']) --elif os.name == "posix": # UNIX-ish platforms not covered above -- pass # default should work --else: -- raise "UnknownPlatform", "sys.platform=%s, os.name=%s" % \ -- (sys.platform, os.name) -- - long_description = \ - """Python interface to MySQL-3.23 - diff --git a/databases/py-mysqldb/patches/patch-ab b/databases/py-mysqldb/patches/patch-ab deleted file mode 100644 index 42e07456e90..00000000000 --- a/databases/py-mysqldb/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/02/26 16:37:41 joerg Exp $ - ---- _mysql.c.orig 2002-08-01 05:01:30.000000000 +0000 -+++ _mysql.c -@@ -39,6 +39,7 @@ PERFORMANCE OF THIS SOFTWARE. - - #include "structmember.h" - #include "mysql.h" -+#include "mysql_version.h" - #include "mysqld_error.h" - #include "errmsg.h" - -@@ -1353,7 +1354,11 @@ _mysql_ConnectionObject_shutdown( - if (!PyArg_NoArgs(args)) return NULL; - check_connection(self); - Py_BEGIN_ALLOW_THREADS -+#if MYSQL_VERSION_ID >= 40103 -+ r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT); -+#else - r = mysql_shutdown(&(self->connection)); -+#endif - Py_END_ALLOW_THREADS - if (r) return _mysql_Exception(self); - Py_INCREF(Py_None); |