Attachment #50737 for bug #77245




#

PORTNAME=	MySQLdb
PORTVERSION=	1.2.0
PORTREVISION=	0
CATEGORIES=	databases python
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}

	@${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)

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}/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>

Lines 1-2 Link Here

(-)py-MySQLdb/distinfo (-2 / +2 lines)
1	MD5 (MySQL-python-1.0.1.tar.gz) = dbdc534cbf95b788d201857d8a3082c8	1	MD5 (MySQL-python-1.2.0.tar.gz) = b0eb974cc3c917276e015275e1ec996f
2	SIZE (MySQL-python-1.0.1.tar.gz) = 68580	2	SIZE (MySQL-python-1.2.0.tar.gz) = 252290




--- _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);

Lines 1-6 Link Here

(-)py-MySQLdb/pkg-plist (-3 lines)
1	lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.py
2	lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.pyc
3	lib/%%PYTHON_VERSION%%/site-packages/CompatMysqldb.pyo
4	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.py	1	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.py
5	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyc	2	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyc
6	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyo	3	lib/%%PYTHON_VERSION%%/site-packages/MySQLdb/__init__.pyo

Return to bug 77245

Lines 6-12 Link Here

(-)py-MySQLdb/Makefile (-23 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= MySQLdb	8	PORTNAME= MySQLdb
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.2.0
10	PORTREVISION= 0	10	PORTREVISION= 0
11	CATEGORIES= databases python	11	CATEGORIES= databases python
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 28-35 Link Here
28	@${ECHO} "You may use the following build options:"	28	@${ECHO} "You may use the following build options:"
29	@${ECHO} ""	29	@${ECHO} ""
30	@${ECHO} " WITH_MYSQLCLIENT_R=yes Use mysqlclient_r lib"	30	@${ECHO} " WITH_MYSQLCLIENT_R=yes Use mysqlclient_r lib"
31	@${ECHO} " WITH_MYSQLSSL=yes Use SSL support"
32	@${ECHO} " WITH_MYSQLCRYPTO=yes Use CRYPTO support"
33	@${ECHO} ""	31	@${ECHO} ""
34		32
35	.if defined(WITH_MYSQLCLIENT_R)	33	.if defined(WITH_MYSQLCLIENT_R)
Lines 38-69 Link Here
38	MAKE_ENV+= mysqlclient="mysqlclient"	36	MAKE_ENV+= mysqlclient="mysqlclient"
39	.endif	37	.endif
40		38
41	.if defined(WITH_MYSQLSSL)
42	.if defined(WITH_MYSQLCRYPTO)
43	MAKE_ENV+= mysqloptlibs="ssl crypto"
44	.else
45	MAKE_ENV+= mysqloptlibs="ssl"
46	.endif
47	.else
48	.if defined(WITH_MYSQLCRYPTO)
49	MAKE_ENV+= mysqloptlibs="crypto"
50	.else
51	MAKE_ENV+= mysqloptlibs=""
52	.endif
53	.endif
54
55	.if !defined(NOPORTDOCS)	39	.if !defined(NOPORTDOCS)
56	PORTDOCS= *	40	PORTDOCS= *
57	.endif	41	.endif
58		42
59	.if !defined(NOPORTDOCS)
60	post-install:	43	post-install:
		44	.if !defined(NOPORTDOCS)
61	@${MKDIR} ${DOCSDIR}	45	@${MKDIR} ${DOCSDIR}
62	@${INSTALL_DATA} ${WRKSRC}/MANIFEST ${DOCSDIR}	46	@${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
63	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	47	@${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
64	.for FILE in ${WRKSRC}/doc/*	48	@${INSTALL_DATA} ${WRKSRC}/doc/*.css ${DOCSDIR}
65	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}	49	@${MKDIR} ${DOCSDIR}/doc
66	.endfor	50	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.html ${DOCSDIR}/doc
		51	@${INSTALL_DATA} ${WRKSRC}/doc/doc/*.css ${DOCSDIR}/doc
		52	@${MKDIR} ${DOCSDIR}/doc/public
		53	@${INSTALL_DATA} ${WRKSRC}/doc/doc/public/* ${DOCSDIR}/doc/public
		54	@${MKDIR} ${DOCSDIR}/doc/private
		55	@${INSTALL_DATA} ${WRKSRC}/doc/doc/private/* ${DOCSDIR}/doc/private
		56	@${MKDIR} ${DOCSDIR}/public
		57	@${INSTALL_DATA} ${WRKSRC}/doc/public/* ${DOCSDIR}/public
		58	@${MKDIR} ${DOCSDIR}/private
		59	@${INSTALL_DATA} ${WRKSRC}/doc/private/* ${DOCSDIR}/private
67	.endif	60	.endif
68		61
69	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)py-MySQLdb/files/patch-_mysql.c (-14 lines)
1	--- _mysql.c.orig Sat Jan 1 15:40:13 2005
2	+++ _mysql.c Wed Jan 5 18:35:18 2005
3	@@ -1542,7 +1542,11 @@
4	if (!PyArg_ParseTuple(args, "")) return NULL;
5	check_connection(self);
6	Py_BEGIN_ALLOW_THREADS
7	+#if MYSQL_VERSION_ID >= 40103
8	+ r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT);
9	+#else
10	r = mysql_shutdown(&(self->connection));
11	+#endif
12	Py_END_ALLOW_THREADS
13	if (r) return _mysql_Exception(self);
14	Py_INCREF(Py_None);