From owner-svn-ports-all@FreeBSD.ORG Mon Mar 3 10:39:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46BC93E6; Mon, 3 Mar 2014 10:39:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 282C8654; Mon, 3 Mar 2014 10:39:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23AdcBQ055485; Mon, 3 Mar 2014 10:39:38 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23Adcpl055484; Mon, 3 Mar 2014 10:39:38 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201403031039.s23Adcpl055484@svn.freebsd.org> From: Ruslan Makhmatkhanov Date: Mon, 3 Mar 2014 10:39:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346877 - head/databases/py-sqlalchemy-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 03 Mar 2014 10:39:38 -0000 Author: rm Date: Mon Mar 3 10:39:37 2014 New Revision: 346877 URL: http://svnweb.freebsd.org/changeset/ports/346877 QAT: https://qat.redports.org/buildarchive/r346877/ Log: databases/py-sqlalchemy-devel: support staging and do general clean-up - do not use easy_install for installation and convert to auto-generated packing list - remove options descriptions, that already presented in bsd.options.desc.mk - utilize options helpers - install docs and examples into staging area uncoditionally - remove inclusion of devel/py-virtualenv/files/py3k-fix-pkg-plist.inc - it's implemented in bsd.python.mk - bump PORTREVISION because of package change Approved by: nivit (maintainer, explicitly for such changes in his ports) Deleted: head/databases/py-sqlalchemy-devel/pkg-plist Modified: head/databases/py-sqlalchemy-devel/Makefile Modified: head/databases/py-sqlalchemy-devel/Makefile ============================================================================== --- head/databases/py-sqlalchemy-devel/Makefile Mon Mar 3 10:33:07 2014 (r346876) +++ head/databases/py-sqlalchemy-devel/Makefile Mon Mar 3 10:39:37 2014 (r346877) @@ -3,6 +3,7 @@ PORTNAME= sqlalchemy PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,58 +18,44 @@ LICENSE= MIT TEST_DEPENDS:= ${RUN_DEPENDS} \ ${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose -# Python3 ready USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --no-diffs --nobackups --verbose --write -PYDISTUTILS_INSTALLARGS= --always-unzip \ - --install-dir ${PYEASYINSTALL_SITELIBDIR} \ - --no-deps \ - --optimize 2 \ - --quiet \ - --script-dir ${PYEASYINSTALL_BINDIR} \ - --site-dir ${PYEASYINSTALL_SITELIBDIR} \ - ${WRKSRC}/dist/${PYEASYINSTALL_EGG} -PYDISTUTILS_PKGNAME= SQLAlchemy -PYDISTUTILS_PKGVERSION= ${DISTVERSION} -PYDISTUTILS_NOEGGINFO= yes -PYEASYINSTALL_ARCHDEP= yes OPTIONS_DEFINE= DOCS EXAMPLES TESTS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE OPTIONS_DEFAULT= SQLITE -FIREBIRD_DESC= Firebird backend -MSSQL_DESC= MS SQL Server backend SYBASE_DESC= Sybase backend TESTS_DESC= Include nose for unit tests # bypass infrastructure bug OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -NO_STAGE= yes -.include +FIREBIRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kinterbasdb>0:${PORTSDIR}/databases/kinterbasdb +MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>0:${PORTSDIR}/databases/py-mssql +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 +SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase +TESTS_BUILD_DEPENDS:= ${TEST_DEPENDS} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} +PORTDOCS= * +PORTEXAMPLES= * +.include .include .if ${PORT_OPTIONS:MDOCS} -AL_PORTDOCS= *.html *.js +AL_PORTDOCS= *.html *.js AL_PORTDOCS_SUBDIR= core dialects orm .endif -.if ${PORT_OPTIONS:MFIREBIRD} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/kinterbasdb/__init__.py:${PORTSDIR}/databases/kinterbasdb -.endif - -.if ${PORT_OPTIONS:MMSSQL} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql -.endif - .if ${PORT_OPTIONS:MMYSQL} .if ${PYTHON_VER} < 3.0 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb @@ -79,24 +66,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MyS .endif .endif -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2 -.endif - -.if ${PORT_OPTIONS:MSQLITE} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 -.endif - -.if ${PORT_OPTIONS:MSYBASE} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase -.endif - -.if ${PORT_OPTIONS:MTESTS} -BUILD_DEPENDS:= ${TEST_DEPENDS} -.endif - .if ${PYTHON_REL} < 330 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock .endif .if ${PYTHON_REL} >= 300 @@ -105,42 +76,24 @@ pre-build: .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .if ${PYTHON_REL} >= 300 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc + ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc .endif + .for i in ${AL_PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in ${AL_PORTDOCS_SUBDIR} - @${MKDIR} ${DOCSDIR}/${i} - cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${DOCSDIR}/${i} + @${MKDIR} ${DOCSDIR}/${i} + (cd ${WRKSRC}/doc/${i} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${i}) .endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .if ${PYTHON_REL} >= 300 - @${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples -.endif - cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR} -.endif - -.if ${PYTHON_REL} < 300 -PLIST_SUB+= SPEEDUPS="" -.else -# C extensions are not supported in py3k -PLIST_SUB+= SPEEDUPS="@comment " -PYEASYINSTALL_OSARCH= - -easyinstall-setopt: - ${DO_NADA} -.endif - -.if ${PYTHON_REL} >= 320 -.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" + ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples .endif + (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) regression-test: build .if ${PYTHON_REL} >= 300