4 files changed, 18 insertions, 42 deletions

diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 35dc88c5d948..0016689b0bb1 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -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 @@ pre-fetch:
 	@${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_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 --git a/databases/py-MySQLdb/distinfo b/databases/py-MySQLdb/distinfo
index d4a1a3d4b8fd..93bd3530bd6f 100644
--- a/databases/py-MySQLdb/distinfo
+++ b/databases/py-MySQLdb/distinfo
@@ -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 --git a/databases/py-MySQLdb/files/patch-_mysql.c b/databases/py-MySQLdb/files/patch-_mysql.c
deleted file mode 100644
index f5ad3b5a938a..000000000000
--- a/databases/py-MySQLdb/files/patch-_mysql.c
+++ /dev/null
@@ -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 --git a/databases/py-MySQLdb/pkg-plist b/databases/py-MySQLdb/pkg-plist
index 76303cb1df5b..ac609b618e15 100644
--- a/databases/py-MySQLdb/pkg-plist
+++ b/databases/py-MySQLdb/pkg-plist
@@ -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