Date: Tue, 8 Feb 2005 22:30:27 GMT From: Marcus Grando <marcus@corp.grupos.com.br> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/77245: [MAINTAINER] Update port: databases/py-MySQLdb to 1.2.0 Message-ID: <200502082230.j18MURWM046950@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/77245; it has been noted by GNATS.
From: Marcus Grando <marcus@corp.grupos.com.br>
To: freebsd-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/77245: [MAINTAINER] Update port: databases/py-MySQLdb to
1.2.0
Date: Tue, 08 Feb 2005 20:20:53 -0200
This is a multi-part message in MIME format.
--------------010507010201070502030101
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Please, apply this new one.
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
- Now use mysqlclient_r by default. WITHOUT_MYSQLCLIENT_R=yes change
this.
- Remove files/patch-_mysql.c
Attached.
--
Marcus Grando
Grupos Internet S/A
marcus(at)corp.grupos.com.br
--------------010507010201070502030101
Content-Type: text/plain;
name="py-MySQLdb.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="py-MySQLdb.patch"
diff -ruN py-MySQLdb.old/Makefile py-MySQLdb/Makefile
--- py-MySQLdb.old/Makefile Wed Jan 12 20:13:42 2005
+++ py-MySQLdb/Makefile Tue Feb 8 20:13:48 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}
@@ -27,43 +27,37 @@
@${ECHO} ""
@${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} " WITHOUT_MYSQLCLIENT_R=yes Don't use mysqlclient_r lib"
+ @${ECHO} " but is not guarantee thread-safe."
+ @${ECHO} ""
+ @${ECHO} " Default is mysqlclient_r"
@${ECHO} ""
-.if defined(WITH_MYSQLCLIENT_R)
-MAKE_ENV+= mysqlclient="mysqlclient_r"
-.else
+.if defined(WITHOUT_MYSQLCLIENT_R)
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 Wed Jan 12 20:13:42 2005
+++ py-MySQLdb/distinfo Tue Feb 8 20:04:52 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 Wed Jan 12 20:13:43 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 Fri Jul 9 05:34:09 2004
+++ py-MySQLdb/pkg-plist Tue Feb 8 20:04:52 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
--------------010507010201070502030101--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502082230.j18MURWM046950>