From owner-svn-ports-all@FreeBSD.ORG Wed Jul 18 00:59:21 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B9C4106564A; Wed, 18 Jul 2012 00:59:21 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B4F58FC0A; Wed, 18 Jul 2012 00:59:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6I0xKqH012518; Wed, 18 Jul 2012 00:59:20 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6I0xKPZ012514; Wed, 18 Jul 2012 00:59:20 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201207180059.q6I0xKPZ012514@svn.freebsd.org> From: Diane Bruce Date: Wed, 18 Jul 2012 00:59:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301054 - head/databases/py-MySQLdb X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2012 00:59:21 -0000 Author: db Date: Wed Jul 18 00:59:20 2012 New Revision: 301054 URL: http://svn.freebsd.org/changeset/ports/301054 Log: - modify port to install the egg file as an unzipped archive otherwise www/google-appengine 1.7.0 will fail Submitted by: nivit Reviewed by: tj Obtained from: email via tj Modified: head/databases/py-MySQLdb/Makefile (contents, props changed) head/databases/py-MySQLdb/pkg-plist (contents, props changed) Modified: head/databases/py-MySQLdb/Makefile ============================================================================== --- head/databases/py-MySQLdb/Makefile Wed Jul 18 00:42:10 2012 (r301053) +++ head/databases/py-MySQLdb/Makefile Wed Jul 18 00:59:20 2012 (r301054) @@ -7,7 +7,7 @@ PORTNAME= MySQLdb DISTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases python MASTER_SITES= SF/mysql-python/mysql-python/${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,6 +19,7 @@ COMMENT= Access a MySQL database through USE_PYTHON= -2.7 USE_PYDISTUTILS= easy_install USE_MYSQL= yes +PYDISTUTILS_INSTALLARGS= -O 1 -N -Z -S ${PYTHON_SITELIBDIR} -d ${PYEASYINSTALL_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG} PYDISTUTILS_PKGNAME= MySQL-python PYEASYINSTALL_ARCHDEP= yes @@ -28,18 +29,22 @@ PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options -OPTIONS= MYSQLCLIENT_R "Use libmysqlclient_r (thread safe)" on +OPTIONS_DEFINE= DOCS MYSQLCLIENT_R +OPTIONS_DEFAULT= DOCS MYSQLCLIENT_R +MYSQLCLIENT_R_DESC= Use libmysqlclient_r (thread safe) + +.include .include +.if ${PORT_OPTIONS:MMYSQLCLIENT_R} pre-configure: -.if defined(WITHOUT_MYSQLCLIENT_R) @${REINPLACE_CMD} -E -e "s|(threadsafe.*)True|\1 False|" \ ${WRKSRC}/site.cfg .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} Modified: head/databases/py-MySQLdb/pkg-plist ============================================================================== --- head/databases/py-MySQLdb/pkg-plist Wed Jul 18 00:42:10 2012 (r301053) +++ head/databases/py-MySQLdb/pkg-plist Wed Jul 18 00:59:20 2012 (r301054) @@ -1 +1,57 @@ -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% +@comment $FreeBSD$ +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/zip-safe +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/connections.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CLIENT.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/CR.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/ER.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FIELD_TYPE.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/FLAG.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/REFRESH.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants/__init__.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/converters.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/cursors.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/release.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/times.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.pyo +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql.so +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.py +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.pyc +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/_mysql_exceptions.pyo +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb/constants +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/MySQLdb +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO +@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%