3 files changed, 95 insertions, 46 deletions

diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 6c6a7706a181..89de549b1195 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -6,73 +6,96 @@
 #
 
 PORTNAME=	sqlalchemy06
-PORTVERSION=	0.6.8
+PORTVERSION=	0.6.9
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
-COMMENT=	A Python SQL toolkit and Object Relational Mapper
+COMMENT=	A Python SQL toolkit and Object Relational Mapper (series 0.6)
+
+LICENSE=	MIT
 
 # Python3 ready
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	SQLAlchemy
-PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 PYDISTUTILS_NOEGGINFO=	yes
 
 # bypass infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
-OPTIONS=	FIREBIRD "support FireBird" off
-OPTIONS+=	MSSQL "support MS SQL Server" off
-OPTIONS+=	MYSQL "support MySql" on
-OPTIONS+=	NOSE "install Nose for unit tests" off
-OPTIONS+=	PGSQL "support PostGreSQL" on
-OPTIONS+=	SQLITE "support Sqlite" on
-OPTIONS+=	SYBASE "support Sybase" off
+OPTIONS_DEFINE=	CEXTENSIONS DOCS EXAMPLES NOSE
+
+OPTIONS_MULTI=	BACKEND
+OPTIONS_MULTI_BACKEND=	FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE
+
+OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE
+
+CEXTENSIONS_DESC=	C extension to speed up the SQL layer
+FIREBIRD_DESC=	FireBird backend
+MSSQL_DESC=	MS SQL Server backend
+NOSE_DESC=	Use Nose for unit tests
+SYBASE_DESC=	Sybase backend
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCEXTENSIONS}
+PYEASYINSTALL_ARCHDEP=	yes
+.endif
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MCEXTENSIONS} && ${PYTHON_REL} < 300
+PLIST_SUB+=	SPEEDUPS=""
+PYDISTUTILS_BUILD_TARGET=	--with-cextensions bdist_egg
+.else
+PLIST_SUB+=	SPEEDUPS="@comment "
+PYDISTUTILS_BUILD_TARGET=	--without-cextensions bdist_egg
+PYEASYINSTALL_OSARCH=
+easyinstall-setopt:
+	@${DO_NADA}
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
 AL_PORTDOCS=	*.html *.js
 AL_PORTDOCS_SUBDIR=	core dialects orm
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/kinterbasdb/__init__.py:${PORTSDIR}/databases/kinterbasdb
 .endif
 
-.if defined(WITH_MSSQL)
+.if ${PORT_OPTIONS:MMSSQL}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql
 .endif
 
-.if !defined(WITHOUT_MYSQL) && ${PYTHON_REL} < 3.0
+.if ${PORT_OPTIONS:MMYSQL} && ${PYTHON_REL} < 300
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
-.if defined(WITH_NOSE)
+.if ${PORT_OPTIONS:MNOSE}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose-1.0.0:${PORTSDIR}/devel/py-nose
 .endif
 
-.if !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-psycopg2
 .endif
 
-.if !defined(WITHOUT_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .endif
 
-.if !defined(WITHOUT_SYBASE)
+.if ${PORT_OPTIONS:MSYBASE}
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${AL_PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
@@ -83,9 +106,26 @@ post-install:
 .endfor
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
+.if ${PYTHON_REL} >= 320
+# When Python version is 3.2+ we rewrite all the filenames
+# of TMPPLIST that end with .py[co], so that they conform
+# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
+PYMAGICTAG=	${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
+add-plist-post:
+	@${AWK} '\
+		/\.py[co]$$/ && !($$0 ~ "/" pc "/") {id = match($$0, /\/[^\/]+\.py[co]$$/); if (id != 0) {d = substr($$0, 1, RSTART - 1); dirs[d] = 1}; sub(/\.py[co]$$/,  "." mt "&"); sub(/[^\/]+\.py[co]$$/, pc "/&"); print; next} \
+		/^@dirrm / {d = substr($$0, 8); if (d in dirs) {print $$0 "/" pc}; print $$0; next} \
+		{print} \
+		END {if (sp in dirs) {print "@dirrm " sp "/" pc}} \
+		' \
+		pc="__pycache__" mt="$$(${PYMAGICTAG})" sp="${PYTHON_SITELIBDIR:S,${PYTHONBASE}/,,g}" \
+		${TMPPLIST} > ${TMPPLIST}.pyc_tmp
+	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/databases/py-sqlalchemy06/distinfo b/databases/py-sqlalchemy06/distinfo
index b99cc4dd9df8..b3f945d87ce6 100644
--- a/databases/py-sqlalchemy06/distinfo
+++ b/databases/py-sqlalchemy06/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLAlchemy-0.6.8.tar.gz) = 8fb51d3cb96e9a758303ef95391a9185ef6a3326f0c33966bf04b9139a3db583
-SIZE (SQLAlchemy-0.6.8.tar.gz) = 2131737
+SHA256 (SQLAlchemy-0.6.9.tar.gz) = e383b26082bb2e0529657dbf7cdd7d02da3fdaa6b5989ccaf28165cd3915a4f1
+SIZE (SQLAlchemy-0.6.9.tar.gz) = 2174399
diff --git a/databases/py-sqlalchemy06/pkg-plist b/databases/py-sqlalchemy06/pkg-plist
index 86ceaa1107ac..b895662b9077 100644
--- a/databases/py-sqlalchemy06/pkg-plist
+++ b/databases/py-sqlalchemy06/pkg-plist
@@ -3,6 +3,7 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/native_libs.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/__init__.py
@@ -20,6 +21,14 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/connectors/zxJDBC.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/connectors/zxJDBC.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/connectors/zxJDBC.pyo
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cprocessors.py
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cprocessors.pyc
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cprocessors.pyo
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cprocessors.so
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cresultproxy.py
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cresultproxy.pyc
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cresultproxy.pyo
+%%SPEEDUPS%%%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/cresultproxy.so
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/databases/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/databases/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/databases/__init__.pyo
@@ -464,6 +473,28 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/vertical
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/versioning
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sharding
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/postgis
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/poly_assoc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nested_sets
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/large_collection
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inheritance
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/elementtree
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dynamic_dict
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/derived_attributes
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/custom_attributes
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/beaker_caching
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/association
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/adjacency_list
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/orm/extensions
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/orm
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/dialects
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/core
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql
@@ -486,25 +517,3 @@
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/orm/extensions
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/orm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/dialects
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/core
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/vertical
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/versioning
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sharding
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/postgis
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/poly_assoc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/nested_sets
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/large_collection
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inheritance
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/graphs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/elementtree
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dynamic_dict
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/derived_attributes
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/custom_attributes
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/beaker_caching
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/association
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/adjacency_list
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%