From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 8 03:30:15 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C2C316A4CE for ; Tue, 8 Feb 2005 03:30:15 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E12DB43D53 for ; Tue, 8 Feb 2005 03:30:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j183UEGs079380 for ; Tue, 8 Feb 2005 03:30:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j183UELh079379; Tue, 8 Feb 2005 03:30:14 GMT (envelope-from gnats) Resent-Date: Tue, 8 Feb 2005 03:30:14 GMT Resent-Message-Id: <200502080330.j183UELh079379@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcus Grando Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC63316A4CE for ; Tue, 8 Feb 2005 03:23:06 +0000 (GMT) Received: from gwmail1.grupos.com.br (gwmail1.grupos.com.br [66.90.64.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2535143D2F for ; Tue, 8 Feb 2005 03:23:06 +0000 (GMT) (envelope-from root@corp.grupos.com.br) Received: from corp.grupos.com.br (unknown [150.162.166.55]) by gwmail1.grupos.com.br (Postfix) with ESMTP id E19FB3CDCA for ; Tue, 8 Feb 2005 01:22:45 -0200 (BRST) Received: by corp.grupos.com.br (Postfix, from userid 0) id 2D65B20A57; Tue, 8 Feb 2005 01:22:45 -0200 (BRST) Message-Id: <20050208032245.2D65B20A57@corp.grupos.com.br> Date: Tue, 8 Feb 2005 01:22:45 -0200 (BRST) From: Marcus Grando To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/77245: [MAINTAINER] Update port: databases/py-MySQLdb to 1.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Marcus Grando List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Feb 2005 03:30:15 -0000 >Number: 77245 >Category: ports >Synopsis: [MAINTAINER] Update port: databases/py-MySQLdb to 1.2.0 >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: Tue Feb 08 03:30:14 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 #40: Fri Jan 28 13:42:33 BRST 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386 >Description: Update port: databases/py-MySQLdb to 1.2.0 - Update to 1.2.0 - Remove options SSL and CRYPTO, because now detect automatically - Install more Docs - Update pkg-plist - Remove files/patch-_mysql.c >How-To-Repeat: >Fix: --- py-MySQLdb.patch begins here --- 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 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 --- py-MySQLdb.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: