6 files changed, 28 insertions, 10 deletions

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 19063869ec37..48b8f42ba984 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.5.2
+DISTVERSION=	0.5.4p2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		CHEESESHOP
 MASTER_SITE_SUBDIR=	sqlalchemy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	SQLAlchemy-${PORTVERSION}
+DISTNAME=	SQLAlchemy-${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Python SQL toolkit and Object Relational Mapper
@@ -20,6 +20,7 @@ COMMENT=	A Python SQL toolkit and Object Relational Mapper
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	SQLAlchemy
+PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 PYDISTUTILS_NOEGGINFO=	yes
 
 # bypass infrastructure bug
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index 7f63157595cd..fe6d121d6727 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,3 +1,3 @@
-MD5 (SQLAlchemy-0.5.2.tar.gz) = d2b041f5877bf108b8ecf7a624e1bec0
-SHA256 (SQLAlchemy-0.5.2.tar.gz) = 45e30ff0791af5d3b3f005cff185ae4172d8d9c02f0a6dbbcdcb696d65440534
-SIZE (SQLAlchemy-0.5.2.tar.gz) = 1448812
+MD5 (SQLAlchemy-0.5.4p2.tar.gz) = 408dfb0868018abc1654b17a2fafaf70
+SHA256 (SQLAlchemy-0.5.4p2.tar.gz) = 8d1989e27004e4e07b3f17498587c697ddca7b76e173f564f2e425fb1c14d3c8
+SIZE (SQLAlchemy-0.5.4p2.tar.gz) = 1471063
diff --git a/databases/py-sqlalchemy/pkg-plist b/databases/py-sqlalchemy/pkg-plist
index 589f91e0e4dd..973e6a5be39c 100644
--- a/databases/py-sqlalchemy/pkg-plist
+++ b/databases/py-sqlalchemy/pkg-plist
@@ -73,6 +73,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.pyo
@@ -136,6 +139,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.pyo
@@ -210,12 +216,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/reference/dialects/sqlite.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/dialects/sybase.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/associationproxy.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ext/compiler.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/declarative.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/orderinglist.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/serializer.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/sqlsoup.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/orm/collections.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/interfaces.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/mapping.html
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 19063869ec37..48b8f42ba984 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.5.2
+DISTVERSION=	0.5.4p2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		CHEESESHOP
 MASTER_SITE_SUBDIR=	sqlalchemy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	SQLAlchemy-${PORTVERSION}
+DISTNAME=	SQLAlchemy-${DISTVERSION}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Python SQL toolkit and Object Relational Mapper
@@ -20,6 +20,7 @@ COMMENT=	A Python SQL toolkit and Object Relational Mapper
 USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	SQLAlchemy
+PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 PYDISTUTILS_NOEGGINFO=	yes
 
 # bypass infrastructure bug
diff --git a/databases/py-sqlalchemy06/distinfo b/databases/py-sqlalchemy06/distinfo
index 7f63157595cd..fe6d121d6727 100644
--- a/databases/py-sqlalchemy06/distinfo
+++ b/databases/py-sqlalchemy06/distinfo
@@ -1,3 +1,3 @@
-MD5 (SQLAlchemy-0.5.2.tar.gz) = d2b041f5877bf108b8ecf7a624e1bec0
-SHA256 (SQLAlchemy-0.5.2.tar.gz) = 45e30ff0791af5d3b3f005cff185ae4172d8d9c02f0a6dbbcdcb696d65440534
-SIZE (SQLAlchemy-0.5.2.tar.gz) = 1448812
+MD5 (SQLAlchemy-0.5.4p2.tar.gz) = 408dfb0868018abc1654b17a2fafaf70
+SHA256 (SQLAlchemy-0.5.4p2.tar.gz) = 8d1989e27004e4e07b3f17498587c697ddca7b76e173f564f2e425fb1c14d3c8
+SIZE (SQLAlchemy-0.5.4p2.tar.gz) = 1471063
diff --git a/databases/py-sqlalchemy06/pkg-plist b/databases/py-sqlalchemy06/pkg-plist
index 589f91e0e4dd..973e6a5be39c 100644
--- a/databases/py-sqlalchemy06/pkg-plist
+++ b/databases/py-sqlalchemy06/pkg-plist
@@ -73,6 +73,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/associationproxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/compiler.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/ext/declarative.pyo
@@ -136,6 +139,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/shard.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/state.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm/strategies.pyo
@@ -210,12 +216,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/reference/dialects/sqlite.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/dialects/sybase.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/associationproxy.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ext/compiler.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/declarative.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/orderinglist.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/serializer.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ext/sqlsoup.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/index.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/orm/collections.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/index.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/interfaces.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/orm/mapping.html