- Update to 0.7.8

- Add LICENSE (MIT)
- Convert to the new options framework

3 files changed, 33 insertions, 22 deletions

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 26adecd8662e..fc6d45e6e7ca 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.7.7
+PORTVERSION=	0.7.8
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +15,8 @@ DISTNAME=	SQLAlchemy-${DISTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	A Python SQL toolkit and Object Relational Mapper
 
+LICENSE=	MIT
+
 # Python3 ready
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
@@ -26,33 +28,39 @@ PYEASYINSTALL_ARCHDEP=	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=	DOCS EXAMPLES NOSE
+
+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
+SYBASE_DESC=	Sybase backend
+
+.include <bsd.port.options.mk>
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.pre.mk>
+
+.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)
+.if ${PORT_OPTIONS:MMYSQL}
 .if ${PYTHON_VER} < 3.0
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb
 #.else
@@ -62,24 +70,24 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MyS
 .endif
 .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}
@@ -90,7 +98,7 @@ post-install:
 .endfor
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index d77da40f318c..2c384ecd9019 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLAlchemy-0.7.7.tar.gz) = b405621bba1b2c1e760e670a9b06d7315aea5f2921b3270bd417a45b415c0502
-SIZE (SQLAlchemy-0.7.7.tar.gz) = 2602780
+SHA256 (SQLAlchemy-0.7.8.tar.gz) = 13daccf34a660ab4708766bb18f49b50368bdbd6a1a8b409104f725f7f562dc8
+SIZE (SQLAlchemy-0.7.8.tar.gz) = 2611374
diff --git a/databases/py-sqlalchemy/pkg-plist b/databases/py-sqlalchemy/pkg-plist
index 12db2c4941e1..3a0719061c70 100644
--- a/databases/py-sqlalchemy/pkg-plist
+++ b/databases/py-sqlalchemy/pkg-plist
@@ -109,6 +109,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/gaerdbms.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/gaerdbms.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/gaerdbms.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/mysqlconnector.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/mysqlconnector.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/dialects/mysql/mysqlconnector.pyo