4 files changed, 58 insertions, 33 deletions

diff --git a/databases/py-sqlalchemy-devel/Makefile b/databases/py-sqlalchemy-devel/Makefile
index 723951ce74e1..5e2990db7546 100644
--- a/databases/py-sqlalchemy-devel/Makefile
+++ b/databases/py-sqlalchemy-devel/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 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=	Python SQL toolkit and Object Relational Mapper
 
 LICENSE=	MIT
 
@@ -21,6 +21,16 @@ TEST_DEPENDS:=	${RUN_DEPENDS} \
 # Python3 ready
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
+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
@@ -29,12 +39,12 @@ PYEASYINSTALL_ARCHDEP=	yes
 OPTIONS_DEFINE=		DOCS EXAMPLES TESTS
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE
-OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	SQLITE
 
 FIREBIRD_DESC=	Firebird backend
 MSSQL_DESC=	MS SQL Server backend
-TESTS_DESC=	Include nose for unit tests
 SYBASE_DESC=	Sybase backend
+TESTS_DESC=	Include nose for unit tests
 
 # bypass infrastructure bug
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
@@ -85,21 +95,36 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
 BUILD_DEPENDS:=		${TEST_DEPENDS}
 .endif
 
+.if ${PYTHON_REL} < 330
+TEST_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:${PORTSDIR}/devel/py-mock
+.endif
+
+.if ${PYTHON_REL} >= 300
+pre-build:
+	@${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/lib
+.endif
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.if ${PYTHON_REL} >= 300
+	@${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/doc
+.endif
 .for i in ${AL_PORTDOCS}
 	    ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${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} . ${DOCSDIR}/${i}
 .endfor
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+.if ${PYTHON_REL} >= 300
+	@${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples
+.endif
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
 
 .if ${PYTHON_REL} < 300
@@ -114,10 +139,13 @@ easyinstall-setopt:
 .endif
 
 .if ${PYTHON_REL} >= 320
-.include "${PORTSDIR}/devel/py-virtualenv/files/p3k-fix-pkg-plist.inc"
+.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
 .endif
 
 regression-test: build
+.if ${PYTHON_REL} >= 300
+	${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/test
+.endif
 	@cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py
 
 .include <bsd.port.post.mk>
diff --git a/databases/py-sqlalchemy-devel/distinfo b/databases/py-sqlalchemy-devel/distinfo
index e7862fc9798a..9201bb5b07f1 100644
--- a/databases/py-sqlalchemy-devel/distinfo
+++ b/databases/py-sqlalchemy-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLAlchemy-0.8.1.tar.gz) = 5646f87ab781755b116d718433637a341b74c8214999e606c2e4134279ba5bbb
-SIZE (SQLAlchemy-0.8.1.tar.gz) = 3776304
+SHA256 (SQLAlchemy-0.8.2.tar.gz) = 71ce685f0e643bae95c7d4ace7ff8d6dcb37e99605cab3cf31c2be006c17905f
+SIZE (SQLAlchemy-0.8.2.tar.gz) = 3816467
diff --git a/databases/py-sqlalchemy-devel/files/patch-setup.py b/databases/py-sqlalchemy-devel/files/patch-setup.py
deleted file mode 100644
index f4633df01c88..000000000000
--- a/databases/py-sqlalchemy-devel/files/patch-setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
---- setup.py.orig	2012-03-15 05:23:20.000000000 +0100
-+++ setup.py	2012-04-10 19:19:38.000000000 +0200
-@@ -128,7 +128,7 @@
-           package_dir={'': 'lib'},
-           license="MIT License",
-           cmdclass=cmdclass,
--
-+          zip_safe=False,
-           tests_require=['nose >= 0.11'],
-           test_suite="sqla_nose",
-           long_description=readme,
diff --git a/databases/py-sqlalchemy-devel/pkg-plist b/databases/py-sqlalchemy-devel/pkg-plist
index d9ced123d4a3..48b5284e9fdf 100644
--- a/databases/py-sqlalchemy-devel/pkg-plist
+++ b/databases/py-sqlalchemy-devel/pkg-plist
@@ -3,8 +3,8 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.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%%/EGG-INFO/zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/__init__.pyo
@@ -146,6 +146,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/constraints.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/constraints.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/constraints.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/hstore.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/hstore.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/hstore.pyo
@@ -158,6 +161,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/pypostgresql.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/pypostgresql.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/pypostgresql.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/ranges.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/ranges.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/ranges.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/zxjdbc.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/zxjdbc.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/postgresql/zxjdbc.pyo
@@ -383,9 +389,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql/visitors.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql/visitors.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql/visitors.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/__init__.pyo
@@ -410,6 +413,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/fixtures.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/fixtures.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/fixtures.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/mock.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/mock.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/mock.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/pickleable.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/pickleable.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/pickleable.pyo
@@ -461,6 +467,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/warnings.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/warnings.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/testing/warnings.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/types.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util/__init__.pyo
@@ -548,15 +557,15 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/custom_management.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/listen_for_events.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/relation_caching.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/advanced.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/caching_query.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/environment.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/model.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/helloworld.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/fixture_data.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/advanced.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/helloworld.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/local_session_caching.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/model.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/relation_caching.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/dynamic_dict.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/__init__.py