2 files changed, 31 insertions, 24 deletions

diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index bda9f9514b8e..585c649c81e3 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	MySQLdb
 PORTVERSION=	1.1.10
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysql-python
@@ -27,12 +28,13 @@ pre-fetch:
 	@${ECHO} ""
 	@${ECHO} "You may use the following build options:"
 	@${ECHO} ""
-	@${ECHO} "	WITH_MYSQLCLIENT_R=yes	Use mysqlclient_r lib"
+	@${ECHO} "	WITHOUT_MYSQLCLIENT_R=yes	Don't use mysqlclient_r lib"
+	@${ECHO} "					but is not guarantee thread-safe."
+	@${ECHO} ""
+	@${ECHO} "	Default use mysqlclient_r"
 	@${ECHO} ""
 
-.if defined(WITH_MYSQLCLIENT_R)
-MAKE_ENV+=	mysqlclient="mysqlclient_r"
-.else
+.if defined(WITHOUT_MYSQLCLIENT_R)
 MAKE_ENV+=	mysqlclient="mysqlclient"
 .endif
 
@@ -40,20 +42,23 @@ MAKE_ENV+=	mysqlclient="mysqlclient"
 PORTDOCS=	*
 .endif
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.css
-	@${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
-.for FILE in ${WRKSRC}/doc/public/*
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/public
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/doc/public/* ${DOCSDIR}/public
 	@${MKDIR} ${DOCSDIR}/private
-.for FILE in ${WRKSRC}/doc/private/*
-	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/private
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/doc/private/* ${DOCSDIR}/private
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-MySQLdb-devel/pkg-descr b/databases/py-MySQLdb-devel/pkg-descr
index b2847a0dfe15..425e14ac002b 100644
--- a/databases/py-MySQLdb-devel/pkg-descr
+++ b/databases/py-MySQLdb-devel/pkg-descr
@@ -1,15 +1,17 @@
-You can easily access a MySQL database through the Python MySQL module.
+Python interface to MySQL
 
-This module should be mostly compatible with an older interface written by
-Joe Skinner and others. However, the older version is 
+MySQLdb is an interface to the popular MySQL database server for Python.
+The design goals are:
 
- a) not thread-friendly (database operations could cause all other threads to
-    block),
- b) written for MySQL 3.21 (does not compile against newer versions without
-    patches),
- c) apparently not actively maintained.
+- Compliance with Python database API version 2.0
+- Thread-safety
+- Thread-friendliness (threads will not block each other)
+- Compatibility with MySQL-3.22 and later
 
-MySQLdb is a completely new module, distributed free of charge under a license
-derived from the Python license. 
+This module should be mostly compatible with an older interface
+written by Joe Skinner and others. However, the older version is
+a) not thread-friendly, b) written for MySQL 3.21, c) apparently
+not actively maintained. No code from that version is used in
+MySQLdb. MySQLdb is free software.
 
 WWW: http://sourceforge.net/projects/mysql-python/