From 847c248501537d395f59426d2c11e06b4fd8b3f1 Mon Sep 17 00:00:00 2001
From: lippe <lippe@FreeBSD.org>
Date: Mon, 4 Mar 2013 18:17:28 +0000
Subject: - Update to 0.7.9

PR:		ports/172898
Submitted by:	Kubilay Kocak <koobs.freebsd@gmail.com>
Approved by:	maintainer timeout (4+ months)
---
 databases/py-sqlalchemy/Makefile  | 30 +++++++++++++++++-------------
 databases/py-sqlalchemy/distinfo  |  4 ++--
 databases/py-sqlalchemy/pkg-plist |  1 +
 3 files changed, 20 insertions(+), 15 deletions(-)

(limited to 'databases/py-sqlalchemy')

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 4dfde209811b..d38b84a4fa8d 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.7.8
+PORTVERSION=	0.7.9
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,29 +13,30 @@ COMMENT=	A Python SQL toolkit and Object Relational Mapper
 
 LICENSE=	MIT
 
+TEST_DEPENDS:=	${RUN_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+
 # Python3 ready
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	SQLAlchemy
 PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 PYDISTUTILS_NOEGGINFO=	yes
 PYEASYINSTALL_ARCHDEP=	yes
 
-# bypass infrastructure bug
-OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
-
-OPTIONS_DEFINE=	DOCS EXAMPLES NOSE
-
-OPTIONS_MULTI=	BACKEND
+OPTIONS_DEFINE=		DOCS EXAMPLES TESTS
+OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	FIREBIRD MSSQL MYSQL PGSQL SQLITE SYBASE
-
 OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE
 
 FIREBIRD_DESC=	Firebird backend
 MSSQL_DESC=	MS SQL Server backend
-NOSE_DESC=	Use Nose for unit tests
+TESTS_DESC=	Include nose for unit tests
 SYBASE_DESC=	Sybase backend
 
+# bypass infrastructure bug
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
 .include <bsd.port.options.mk>
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
@@ -66,8 +67,8 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MyS
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MNOSE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose-1.0.0:${PORTSDIR}/devel/py-nose
+.if ${PORT_OPTIONS:MTESTS}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
@@ -75,7 +76,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-ps
 .endif
 
 .if ${PORT_OPTIONS:MSQLITE}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MSYBASE}
@@ -127,4 +128,7 @@ add-plist-post:
 	@${MV} ${TMPPLIST}.pyc_tmp ${TMPPLIST}
 .endif
 
+regression-test: build
+	@cd ${WRKSRC} && ${PYTHON_CMD} sqla_nose.py
+
 .include <bsd.port.post.mk>
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index 2c384ecd9019..e39b73557c26 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLAlchemy-0.7.8.tar.gz) = 13daccf34a660ab4708766bb18f49b50368bdbd6a1a8b409104f725f7f562dc8
-SIZE (SQLAlchemy-0.7.8.tar.gz) = 2611374
+SHA256 (SQLAlchemy-0.7.9.tar.gz) = 4a89556cb55275d1af694dc4d5700d8bf0f83690bac16ab30340092ff25bb4d7
+SIZE (SQLAlchemy-0.7.9.tar.gz) = 2649932
diff --git a/databases/py-sqlalchemy/pkg-plist b/databases/py-sqlalchemy/pkg-plist
index 3a0719061c70..7699aef3c25e 100644
--- a/databases/py-sqlalchemy/pkg-plist
+++ b/databases/py-sqlalchemy/pkg-plist
@@ -415,6 +415,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/dialects/sqlite.html
 %%PORTDOCS%%%%DOCSDIR%%/dialects/sybase.html
 %%PORTDOCS%%%%DOCSDIR%%/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/collections.html
-- 
cgit