Date: Wed, 5 Jan 2005 19:05:11 -0200 (BRST) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75866: [MAINTAINER] Update port: databases/py-MySQLdb to 1.0.1 Message-ID: <20050105210511.8015420A77@corp.grupos.com.br> Resent-Message-ID: <200501052110.j05LARdY089913@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75866
>Category: ports
>Synopsis: [MAINTAINER] Update port: databases/py-MySQLdb to 1.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 05 21:10:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #37: Mon Jan 3 12:27:37 BRST 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386
>Description:
Update port: databases/py-MySQLdb to 1.0.1
- Change to 1.0.1
- Rediff patch-_mysql.c
- Install more docs
>How-To-Repeat:
>Fix:
--- py-MySQLdb.patch begins here ---
diff -ruN py-MySQLdb.old/Makefile py-MySQLdb/Makefile
--- py-MySQLdb.old/Makefile Wed Jan 5 18:39:31 2005
+++ py-MySQLdb/Makefile Wed Jan 5 18:51:52 2005
@@ -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_PYDISTUTILS= yes
USE_MYSQL= yes
-CONFLICTS= py*-MySQLdb-devel-*
+CONFLICTS= py*-MySQLdb-devel-[0-9]*
pre-fetch:
@${ECHO} ""
@@ -52,12 +52,16 @@
.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 -ruN py-MySQLdb.old/distinfo py-MySQLdb/distinfo
--- py-MySQLdb.old/distinfo Wed Jan 5 18:39:31 2005
+++ py-MySQLdb/distinfo Wed Jan 5 18:40:06 2005
@@ -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 -ruN py-MySQLdb.old/files/patch-_mysql.c py-MySQLdb/files/patch-_mysql.c
--- py-MySQLdb.old/files/patch-_mysql.c Wed Jan 5 18:39:31 2005
+++ py-MySQLdb/files/patch-_mysql.c Wed Jan 5 18:40:06 2005
@@ -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
--- py-MySQLdb.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050105210511.8015420A77>