Attachment 50737 Details for Bug 77245 – py-MySQLdb.patch

[patch] py-MySQLdb.patch

py-MySQLdb.patch (text/plain), 3.50 KB, created by Marcus Grando on 2005-02-08 03:30:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Grando

Created: 2005-02-08 03:30:14 UTC

Size: 3.50 KB

patch

obsolete

>diff -ruN py-MySQLdb.old/Makefile py-MySQLdb/Makefile
>--- py-MySQLdb.old/Makefile	Thu Jan 13 01:00:53 2005
>+++ py-MySQLdb/Makefile	Tue Feb  8 01:04:00 2005
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	MySQLdb
>-PORTVERSION=	1.0.1
>+PORTVERSION=	1.2.0
> PORTREVISION=	0
> CATEGORIES=	databases python
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>@@ -28,8 +28,6 @@
> 	@${ECHO} "You may use the following build options:"
> 	@${ECHO} ""
> 	@${ECHO} "	WITH_MYSQLCLIENT_R=yes	Use mysqlclient_r lib"
>-	@${ECHO} "	WITH_MYSQLSSL=yes	Use SSL support"
>-	@${ECHO} "	WITH_MYSQLCRYPTO=yes	Use CRYPTO support"
> 	@${ECHO} ""
> 
> .if defined(WITH_MYSQLCLIENT_R)
>@@ -38,32 +36,27 @@
> MAKE_ENV+=	mysqlclient="mysqlclient"
> .endif
> 
>-.if defined(WITH_MYSQLSSL)
>-.if defined(WITH_MYSQLCRYPTO)
>-MAKE_ENV+=	mysqloptlibs="ssl crypto"
>-.else
>-MAKE_ENV+=	mysqloptlibs="ssl"
>-.endif
>-.else
>-.if defined(WITH_MYSQLCRYPTO)
>-MAKE_ENV+=	mysqloptlibs="crypto"
>-.else
>-MAKE_ENV+=	mysqloptlibs=""
>-.endif
>-.endif
>-
> .if !defined(NOPORTDOCS)
> PORTDOCS=	*
> .endif
> 
>-.if !defined(NOPORTDOCS)
> post-install:
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/MANIFEST ${DOCSDIR}
>-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>-.for FILE in ${WRKSRC}/doc/*
>-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
>-.endfor
>+	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
>+	@${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DOCSDIR}
>+	@${MKDIR} ${DOCSDIR}/doc
>+	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.html ${DOCSDIR}/doc
>+	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.css ${DOCSDIR}/doc
>+	@${MKDIR} ${DOCSDIR}/doc/public
>+	@${INSTALL_DATA} ${WRKSRC}/doc/doc/public/* ${DOCSDIR}/doc/public
>+	@${MKDIR} ${DOCSDIR}/doc/private
>+	@${INSTALL_DATA} ${WRKSRC}/doc/doc/private/* ${DOCSDIR}/doc/private
>+	@${MKDIR} ${DOCSDIR}/public
>+	@${INSTALL_DATA} ${WRKSRC}/doc/public/* ${DOCSDIR}/public
>+	@${MKDIR} ${DOCSDIR}/private
>+	@${INSTALL_DATA} ${WRKSRC}/doc/private/* ${DOCSDIR}/private
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN py-MySQLdb.old/distinfo py-MySQLdb/distinfo
>--- py-MySQLdb.old/distinfo	Thu Jan 13 01:00:53 2005
>+++ py-MySQLdb/distinfo	Tue Feb  8 01:02:10 2005
>@@ -1,2 +1,2 @@
>-MD5 (MySQL-python-1.0.1.tar.gz) = dbdc534cbf95b788d201857d8a3082c8
>-SIZE (MySQL-python-1.0.1.tar.gz) = 68580
>+MD5 (MySQL-python-1.2.0.tar.gz) = b0eb974cc3c917276e015275e1ec996f
>+SIZE (MySQL-python-1.2.0.tar.gz) = 252290
>diff -ruN py-MySQLdb.old/files/patch-_mysql.c py-MySQLdb/files/patch-_mysql.c
>--- py-MySQLdb.old/files/patch-_mysql.c	Thu Jan 13 01:00:53 2005
>+++ py-MySQLdb/files/patch-_mysql.c	Wed Dec 31 21:00:00 1969
>@@ -1,14 +0,0 @@
>---- _mysql.c.orig	Sat Jan  1 15:40:13 2005
>-+++ _mysql.c	Wed Jan  5 18:35:18 2005
>-@@ -1542,7 +1542,11 @@
>- 	if (!PyArg_ParseTuple(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);
>diff -ruN py-MySQLdb.old/pkg-plist py-MySQLdb/pkg-plist
>--- py-MySQLdb.old/pkg-plist	Sat Jul 10 01:00:36 2004
>+++ py-MySQLdb/pkg-plist	Tue Feb  8 01:02:10 2005
>@@ -1,6 +1,3 @@
>-lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.py
>-lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.pyc
>-lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.pyo
> lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.py
> lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyc
> lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyo

Actions: View | Diff

Attachments on bug 77245: 50737 | 50738