4 files changed, 33 insertions, 8 deletions

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 7642b7c926ba..9c3c0b966964 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.6
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +15,7 @@ DISTNAME=	SQLAlchemy-${DISTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Python SQL toolkit and Object Relational Mapper
 
+# Python3 ready
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	SQLAlchemy
@@ -27,7 +28,7 @@ OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 OPTIONS=	FIREBIRD "support FireBird" off
 OPTIONS+=	MSSQL "support MS SQL Server" off
-OPTIONS+=	MYSQL "support MySql" on
+OPTIONS+=	MYSQL "support MySQL" on
 OPTIONS+=	NOSE "install Nose for unit tests" off
 OPTIONS+=	PGSQL "support PostGreSQL" on
 OPTIONS+=	SQLITE "support Sqlite" on
@@ -51,8 +52,14 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/kinterbasdb/__init__.py:${PORTSDIR}/databases
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pymssql.py:${PORTSDIR}/databases/py-mssql
 .endif
 
-.if !defined(WITHOUT_MYSQL) && ${PYTHON_VER} < 3.0
+.if !defined(WITHOUT_MYSQL)
+.if ${PYTHON_VER} < 3.0
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
+#.else
+# At the moment databases/py-pymysql does not build with Python3
+# See https://github.com/petehunt/PyMySQL#python-3-0-support
+#RUN_DEPENDS+=	pymysql>=0.5:${PORTSDIR}/databases/py-pymysql
+.endif
 .endif
 
 .if defined(WITH_NOSE)
@@ -75,11 +82,11 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${AL_PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	    ${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
 
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index 96ee7102fdf1..f7f938077711 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLAlchemy-0.7.3.tar.gz) = 54e6e9fb30bef740b036c69cffbcb369cae2e61f95b69af4c086fca9c15308fa
-SIZE (SQLAlchemy-0.7.3.tar.gz) = 2463979
+SHA256 (SQLAlchemy-0.7.6.tar.gz) = 606a48a2d53ad959043347dec1d9f9cc561d9b66d79f463a7a8fe302058119e5
+SIZE (SQLAlchemy-0.7.6.tar.gz) = 2597214
diff --git a/databases/py-sqlalchemy/files/patch-setup.py b/databases/py-sqlalchemy/files/patch-setup.py
new file mode 100644
index 000000000000..f4633df01c88
--- /dev/null
+++ b/databases/py-sqlalchemy/files/patch-setup.py
@@ -0,0 +1,12 @@
+$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/pkg-plist b/databases/py-sqlalchemy/pkg-plist
index ef221c9d5611..12db2c4941e1 100644
--- a/databases/py-sqlalchemy/pkg-plist
+++ b/databases/py-sqlalchemy/pkg-plist
@@ -295,6 +295,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/mapper.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/mapper.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/mapper.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/persistence.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/persistence.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/persistence.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/properties.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/properties.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/properties.pyo
@@ -455,6 +458,8 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/custom_management.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/listen_for_events.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/declarative_reflection/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/declarative_reflection/declarative_reflection.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/dynamic_dict.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/elementtree/__init__.py
@@ -500,6 +505,7 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/generic_associations
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/elementtree
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dynamic_dict
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/declarative_reflection
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/custom_attributes
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/beaker_caching
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/association