[34153] trunk/dports/python/py-mysql

[ryandesign at macports.org]

Revision: 34153
          http://trac.macosforge.org/projects/macports/changeset/34153
Author:   ryandesign at macports.org
Date:     2008-02-15 16:03:24 -0800 (Fri, 15 Feb 2008)

Log Message:
-----------
py-mysql: merge r31502 from py25-mysql to fix #13818 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/python/py-mysql/Portfile

Added Paths:
-----------
    trunk/dports/python/py-mysql/files/patch-_mysql.c

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2008-02-15 23:53:07 UTC (rev 34152)
+++ trunk/dports/python/py-mysql/Portfile	2008-02-16 00:03:24 UTC (rev 34153)
@@ -15,7 +15,7 @@
 master_sites		sourceforge:mysql-python
 distname			MySQL-python-${version}
 checksums			md5 532268f02870bea18c1d465e88afff30
-patchfiles		patch-setup_posix.py
+patchfiles		patch-setup_posix.py patch-_mysql.c
 
 depends_lib-append	port:mysql5
 

Copied: trunk/dports/python/py-mysql/files/patch-_mysql.c (from rev 31502, trunk/dports/python/py25-mysql/files/patch-_mysql.c)
===================================================================
--- trunk/dports/python/py-mysql/files/patch-_mysql.c	                        (rev 0)
+++ trunk/dports/python/py-mysql/files/patch-_mysql.c	2008-02-16 00:03:24 UTC (rev 34153)
@@ -0,0 +1,23 @@
+--- _mysql.c.orig	2007-02-27 18:35:56.000000000 -0800
++++ _mysql.c	2007-11-25 21:54:09.000000000 -0800
+@@ -34,9 +34,6 @@
+ #else
+ #include "my_config.h"
+ #endif
+-#ifndef uint
+-#define uint unsigned int
+-#endif
+ #include "mysql.h"
+ #include "mysqld_error.h"
+ #include "errmsg.h"
+@@ -481,8 +478,8 @@
+ #endif
+ 	char *host = NULL, *user = NULL, *passwd = NULL,
+ 		*db = NULL, *unix_socket = NULL;
+-	uint port = MYSQL_PORT;
+-	uint client_flag = 0;
++	unsigned int port = MYSQL_PORT;
++	unsigned int client_flag = 0;
+ 	static char *kwlist[] = { "host", "user", "passwd", "db", "port",
+ 				  "unix_socket", "conv",
+ 				  "connect_timeout", "compress",

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080215/1cc29a90/attachment.html