diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2005-01-12 22:13:43 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2005-01-12 22:13:43 +0000 |
| commit | 882df49ad90473155e9ab9fa311909976ef07979 (patch) | |
| tree | 69fd398a023e0abd9dd9ebc7bd6237ea72b96385 /databases/py-MySQLdb | |
| parent | [maintainer-update] fix x11/login.app build error (diff) | |
INTAINER] Update port: databases/py-MySQLdb to 1.0.1
Update port: databases/py-MySQLdb to 1.0.1
- Change to 1.0.1
- Rediff patch-_mysql.c
- Install more docs
PR: ports/75866
Submitted by: Marcus Grando <marcus@corp.grupos.com.br>
Notes
Notes:
svn path=/head/; revision=126267
Diffstat (limited to 'databases/py-MySQLdb')
| -rw-r--r-- | databases/py-MySQLdb/Makefile | 14 | ||||
| -rw-r--r-- | databases/py-MySQLdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/py-MySQLdb/files/patch-_mysql.c | 17 |
3 files changed, 16 insertions, 19 deletions
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile index 9d11b949a6b9..35dc88c5d948 100644 --- a/databases/py-MySQLdb/Makefile +++ b/databases/py-MySQLdb/Makefile @@ -6,8 +6,8 @@ # PORTNAME= MySQLdb -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.0.1 +PORTREVISION= 0 CATEGORIES= databases python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mysql-python @@ -21,7 +21,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes USE_MYSQL= yes -CONFLICTS= py*-MySQLdb-devel-* +CONFLICTS= py*-MySQLdb-devel-[0-9]* pre-fetch: @${ECHO} "" @@ -52,12 +52,16 @@ MAKE_ENV+= mysqloptlibs="" .endif .endif -PORTDOCS= MANIFEST README +.if !defined(NOPORTDOCS) +PORTDOCS= * +.endif .if !defined(NOPORTDOCS) post-install: @${MKDIR} ${DOCSDIR} -.for FILE in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/MANIFEST ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +.for FILE in ${WRKSRC}/doc/* @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor .endif diff --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo index aee6b2980af4..d4a1a3d4b8fd 100644 --- a/databases/py-MySQLdb/distinfo +++ b/databases/py-MySQLdb/distinfo @@ -1,2 +1,2 @@ -MD5 (MySQL-python-1.0.0.tar.gz) = 0f9527a3aa4111802f376cc6816cc7cf -SIZE (MySQL-python-1.0.0.tar.gz) = 53708 +MD5 (MySQL-python-1.0.1.tar.gz) = dbdc534cbf95b788d201857d8a3082c8 +SIZE (MySQL-python-1.0.1.tar.gz) = 68580 diff --git a/databases/py-MySQLdb/files/patch-_mysql.c b/databases/py-MySQLdb/files/patch-_mysql.c index 040a1b9db7ec..f5ad3b5a938a 100644 --- a/databases/py-MySQLdb/files/patch-_mysql.c +++ b/databases/py-MySQLdb/files/patch-_mysql.c @@ -1,18 +1,11 @@ -Index: MySQLdb/_mysql.c -=================================================================== -RCS file: /cvsroot/mysql-python/MySQLdb/_mysql.c,v -retrieving revision 1.49 -diff -u -r1.49 _mysql.c ---- _mysql.c 7 Jun 2004 03:44:38 -0000 1.49 -+++ _mysql.c 26 Jul 2004 16:58:29 -0000 -@@ -1542,7 +1542,13 @@ +--- _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 && MYSQL_VERSION_ID < 50000 -+ r = mysql_shutdown(&(self->connection), -+ SHUTDOWN_DEFAULT); ++#if MYSQL_VERSION_ID >= 40103 ++ r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT); +#else r = mysql_shutdown(&(self->connection)); +#endif |