update to 0.9.1, in response to PR pkg/15054 by jgoerzen@complete.org

4 files changed, 125 insertions, 35 deletions

diff --git a/databases/py-mysqldb/Makefile b/databases/py-mysqldb/Makefile
index 89c1f23d74d..eb179498026 100644
--- a/databases/py-mysqldb/Makefile
+++ b/databases/py-mysqldb/Makefile
@@ -1,38 +1,23 @@
-# $NetBSD: Makefile,v 1.6 2002/01/19 17:06:23 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2002/01/29 14:39:38 drochner Exp $
 
-DISTNAME=	MySQLdb-0.1.3
-PKGNAME=	${PYPKGPREFIX}-mysqldb-0.1.3
+DISTNAME=	MySQL-python-0.9.1
+PKGNAME=	${PYPKGPREFIX}-mysqldb-0.9.1
 CATEGORIES=	databases
-MASTER_SITES=	ftp://starship.python.net/pub/crew/adustman/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mysql-python/}
 
 MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://starship.python.net/crew/adustman/MySQLdb.html
+HOMEPAGE=	http://sourceforge.net/projects/mysql-python
 COMMENT=	MySQL interface for Python
 
-DEPENDS+=	mysql-client>=3.23.35:../../databases/mysql-client
-
-ALL_TARGET=	default
-
-# this pkg uses Makefile.pre.in
-PYTHON_VERSIONS_ACCEPTED=	20 21
-BUILDLINK_DEPENDS.python20=	python20>=2.0.1nb1
-BUILDLINK_DEPENDS.python21=	python21>=2.1.1nb1
-
+PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 
-do-configure:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/Setup.in \
-		>${WRKSRC}/Setup.in
-	${CP} ${PREFIX}/${PYLIB}/config/Makefile.pre.in ${WRKSRC}
-	(cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot)
-
-post-build:
-	(cd ${WRKSRC}; ${PYTHONBIN} -c "import MySQLdb")
-	(cd ${WRKSRC}; ${PYTHONBIN} -O -c "import MySQLdb")
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/MySQLdb.py ${WRKSRC}/MySQLdb.py[co] \
-		${PREFIX}/${PYSITELIB}
+post-patch:
+	${SED} -e "s|@MYSQLPREFIX@|${BUILDLINK_DIR}|" \
+		-e "s|@MYSQLRTPREFIX@|${BUILDLINK_PREFIX.mysql-client}|" \
+		<${WRKSRC}/setup.py >${WRKSRC}/setup.py.tmp
+	${MV} ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
 
+.include "../../databases/mysql-client/buildlink.mk"
 .include "../../lang/python/extension.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/py-mysqldb/PLIST b/databases/py-mysqldb/PLIST
index f9efd294154..e44f6e070a4 100644
--- a/databases/py-mysqldb/PLIST
+++ b/databases/py-mysqldb/PLIST
@@ -1,5 +1,34 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/19 17:13:20 drochner Exp $
-${PYSITELIB}/_mysqlmodule.so
-${PYSITELIB}/MySQLdb.py
-${PYSITELIB}/MySQLdb.pyc
-${PYSITELIB}/MySQLdb.pyo
+@comment $NetBSD: PLIST,v 1.3 2002/01/29 14:39:38 drochner Exp $
+${PYSITELIB}/CompatMysqldb.py
+${PYSITELIB}/CompatMysqldb.pyc
+${PYSITELIB}/MySQLdb/__init__.py
+${PYSITELIB}/MySQLdb/__init__.pyc
+${PYSITELIB}/MySQLdb/connections.py
+${PYSITELIB}/MySQLdb/connections.pyc
+${PYSITELIB}/MySQLdb/constants/CLIENT.py
+${PYSITELIB}/MySQLdb/constants/CLIENT.pyc
+${PYSITELIB}/MySQLdb/constants/CR.py
+${PYSITELIB}/MySQLdb/constants/CR.pyc
+${PYSITELIB}/MySQLdb/constants/ER.py
+${PYSITELIB}/MySQLdb/constants/ER.pyc
+${PYSITELIB}/MySQLdb/constants/FIELD_TYPE.py
+${PYSITELIB}/MySQLdb/constants/FIELD_TYPE.pyc
+${PYSITELIB}/MySQLdb/constants/FLAG.py
+${PYSITELIB}/MySQLdb/constants/FLAG.pyc
+${PYSITELIB}/MySQLdb/constants/REFRESH.py
+${PYSITELIB}/MySQLdb/constants/REFRESH.pyc
+${PYSITELIB}/MySQLdb/constants/__init__.py
+${PYSITELIB}/MySQLdb/constants/__init__.pyc
+${PYSITELIB}/MySQLdb/converters.py
+${PYSITELIB}/MySQLdb/converters.pyc
+${PYSITELIB}/MySQLdb/cursors.py
+${PYSITELIB}/MySQLdb/cursors.pyc
+${PYSITELIB}/MySQLdb/sets.py
+${PYSITELIB}/MySQLdb/sets.pyc
+${PYSITELIB}/MySQLdb/times.py
+${PYSITELIB}/MySQLdb/times.pyc
+${PYSITELIB}/_mysql.so
+${PYSITELIB}/_mysql_exceptions.py
+${PYSITELIB}/_mysql_exceptions.pyc
+@dirrm ${PYSITELIB}/MySQLdb/constants
+@dirrm ${PYSITELIB}/MySQLdb
diff --git a/databases/py-mysqldb/distinfo b/databases/py-mysqldb/distinfo
index 4d7d4bebdb0..4139f945291 100644
--- a/databases/py-mysqldb/distinfo
+++ b/databases/py-mysqldb/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/01/29 14:39:38 drochner Exp $
 
-SHA1 (MySQLdb-0.1.3.tar.gz) = a6823691638be07c10e4eebd7975fd15e60948f4
-Size (MySQLdb-0.1.3.tar.gz) = 43190 bytes
+SHA1 (MySQL-python-0.9.1.tar.gz) = 5bb5d9430d91a31116122861afd66c2fdfdd23b8
+Size (MySQL-python-0.9.1.tar.gz) = 64073 bytes
+SHA1 (patch-aa) = 625a0cb90724bd467375358d0a1f326249e9726b
diff --git a/databases/py-mysqldb/patches/patch-aa b/databases/py-mysqldb/patches/patch-aa
new file mode 100644
index 00000000000..fbe4e426d41
--- /dev/null
+++ b/databases/py-mysqldb/patches/patch-aa
@@ -0,0 +1,75 @@
+$NetBSD: patch-aa,v 1.1 2002/01/29 14:39:39 drochner Exp $
+
+--- setup.py.orig	Wed Oct 17 05:17:30 2001
++++ setup.py	Tue Jan 29 15:29:27 2002
+@@ -18,53 +18,13 @@
+ 
+ mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient"
+ 
+-if sys.platform in ("linux-i386", "linux2"): # most Linux
+-    include_dirs = ['/usr/include/mysql']
+-    library_dirs = ['/usr/lib/mysql']
+-    libraries = [mysqlclient, "z"]
+-    runtime_library_dirs = []
+-    extra_objects = []
+-elif sys.platform in ("freebsd4", "openbsd2"): 
+-    include_dirs = ['/usr/local/include/mysql']
+-    library_dirs = ['/usr/local/lib/mysql']
+-    libraries = [mysqlclient, "z"]
+-    runtime_library_dirs = []
+-    extra_objects = []
+-elif sys.platform == "sunos5": # Solaris 2.8 
+-    include_dirs = ['/usr/local/mysql/include/mysql'] 
+-    library_dirs = ['/usr/local/mysql/lib/mysql'] 
+-    libraries = [mysqlclient, "z"] 
+-    runtime_library_dirs = ['/usr/local/lib:/usr/openwin/lib:/usr/dt/lib'] 
+-    extra_objects = [] 
+-elif sys.platform == "win32":
+-    include_dirs = [r'c:\mysql\include']
+-    library_dirs = [r'c:\mysql\lib\opt']
+-    libraries = [mysqlclient, 'zlib', 'msvcrt', 'libcmt',
+-                 'wsock32', 'advapi32']
+-    runtime_library_dirs = []
+-    extra_objects = [r'c:\mysql\lib\opt\mysqlclient.lib']
+-elif sys.platform == "darwin1": # Mac OS X
+-    include_dirs = ['/usr/local/mysql/include/mysql']
+-    library_dirs = ['/usr/local/mysql/lib/mysql']
+-    libraries = [mysqlclient, "z"]
+-    runtime_library_dirs = []
+-    extra_objects = []
+-elif os.name == "posix": # most Linux/UNIX platforms
+-    include_dirs = ['/usr/include/mysql']
+-    library_dirs = ['/usr/lib/mysql']
+-    # MySQL-3.23 needs libz
+-    libraries = [mysqlclient, "z"]
+-    # 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 = library_dirs
+-    runtime_library_dirs = []
+-    # This can be used on Linux to force use of static mysqlclient lib
+-    ## extra_objects = ['/usr/lib/mysql/libmysqlclient.a']
+-    extra_objects = []
+-else:
+-    raise "UnknownPlatform", "sys.platform=%s, os.name=%s" % \
+-          (sys.platform, os.name)
++mysqlprefix = '@MYSQLPREFIX@'
++mysqlrtprefix = '@MYSQLRTPREFIX@'
++include_dirs = [mysqlprefix + '/include/mysql']
++library_dirs = [mysqlprefix + '/lib/mysql']
++libraries = [mysqlclient, "z"]
++runtime_library_dirs = [mysqlrtprefix + '/lib/mysql']
++extra_objects = []
+     
+ long_description = \
+ """Python interface to MySQL-3.23
+@@ -93,7 +53,8 @@
+         author = "Andy Dustman",
+         author_email = "andy@dustman.net",
+         license = "GPL",
+-        platforms = "ALL",
++# "platforms" doesn't work for Python 2.0.x
++#        platforms = "ALL",
+         url = "http://sourceforge.net/projects/mysql-python",
+ 
+         # Description of the modules and packages in the distribution