diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile index 8d6de82241d..bdb0a5bb02b 100644 --- a/databases/py-mysql/Makefile +++ b/databases/py-mysql/Makefile @@ -1,27 +1,26 @@ -# $OpenBSD: Makefile,v 1.14 2002/05/13 18:50:38 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2002/09/15 10:54:19 shell Exp $ -COMMENT= "python interface to MySQL" +COMMENT= "python interface to MySQL" -VERSION= 0.9.1 -DISTNAME= MySQL-python-${VERSION} -PKGNAME= py-mysql-${VERSION} -CATEGORIES= databases -NEED_VERSION= 1.515 +VERSION= 0.9.2 +DISTNAME= MySQL-python-${VERSION} +PKGNAME= py-mysql-${VERSION} +CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysql-python/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mysql-python/} -HOMEPAGE= http://dustman.net/andy/python/MySQLdb/ +HOMEPAGE= http://sourceforge.net/projects/mysql-python -MAINTAINER= Shell Hung +MAINTAINER= Shell Hung PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql +LIB_DEPENDS= lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql -PYTHON_VER= 2.1 +PYTHON_VER= 2.2 RUN_DEPENDS+= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} BUILD_DEPENDS= ${RUN_DEPENDS} diff --git a/databases/py-mysql/distinfo b/databases/py-mysql/distinfo index 1d81bf531ea..e201ba56fc0 100644 --- a/databases/py-mysql/distinfo +++ b/databases/py-mysql/distinfo @@ -1,3 +1,3 @@ -MD5 (MySQL-python-0.9.1.tar.gz) = 802e271d46e3d845045ce0378f82fd85 -RMD160 (MySQL-python-0.9.1.tar.gz) = 6259574658ba9b2807e07e9433cfcf0936ba295f -SHA1 (MySQL-python-0.9.1.tar.gz) = 5bb5d9430d91a31116122861afd66c2fdfdd23b8 +MD5 (MySQL-python-0.9.2.tar.gz) = afef758f56289f98408dd9f379d8fc8d +RMD160 (MySQL-python-0.9.2.tar.gz) = f7ef371e8f2c0a3b6979a99bfa368e4342aa4080 +SHA1 (MySQL-python-0.9.2.tar.gz) = b6959ee5e28847e557229ddc318b097f10144ff2 diff --git a/databases/py-mysql/patches/patch-setup_py b/databases/py-mysql/patches/patch-setup_py index a0931a1fd0a..23edec61218 100644 --- a/databases/py-mysql/patches/patch-setup_py +++ b/databases/py-mysql/patches/patch-setup_py @@ -1,16 +1,21 @@ -$OpenBSD: patch-setup_py,v 1.3 2001/10/07 01:19:40 naddy Exp $ ---- setup.py.orig Sun Oct 7 03:06:43 2001 -+++ setup.py Sun Oct 7 03:07:19 2001 -@@ -24,9 +24,9 @@ if sys.platform == "linux-i386": # Red H - 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'] -+elif sys.platform in ("freebsd4", "openbsd3"): -+ include_dirs = ['%%LOCALBASE%%/include/mysql'] -+ library_dirs = ['%%LOCALBASE%%/lib/mysql'] - libraries = [mysqlclient, "z"] - runtime_library_dirs = [] - extra_objects = [] +$OpenBSD: patch-setup_py,v 1.4 2002/09/15 10:54:19 shell Exp $ +--- setup.py.orig Sun Sep 15 18:49:41 2002 ++++ setup.py Sun Sep 15 18:50:42 2002 +@@ -20,7 +20,7 @@ thread_safe_library = YES + name = "MySQL-%s" % os.path.basename(sys.executable) + version = "0.9.2" + +-mysqlclient = thread_safe_library and "mysqlclient_r" or "mysqlclient" ++mysqlclient = "mysqlclient" + + # include files and library locations should cover most platforms + include_dirs = [ +@@ -52,7 +52,7 @@ 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') ++ LOCALBASE = os.environ.get('LOCALBASE', '%%LOCALBASE%%') + include_dirs = ['%s/include/mysql' % LOCALBASE] + library_dirs = ['%s/lib/mysql' % LOCALBASE] + elif sys.platform == "sunos5": # Solaris 2.8 + gcc