From b9ba8b439122ff2259ebb027952700689fc1bd87 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 23 Jun 2018 22:29:48 +0000
Subject: [PATCH] fix @pkgpath marker and some makefile nits

---
 databases/py-sqlalchemy/Makefile       | 15 +++++++--------
 databases/py-sqlalchemy/pkg/PLIST-main |  5 ++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index a9769a267a6..3a3e8fd6d2c 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2018/06/23 21:39:45 landry Exp $
+# $OpenBSD: Makefile,v 1.37 2018/06/23 22:29:48 sthen Exp $
 
 COMMENT-main =		database toolkit for Python
 COMMENT-docs =		documentation and examples for sqlalchemy
@@ -9,7 +9,8 @@ FULLPKGNAME-main =	${MODPY_PY_PREFIX}sqlalchemy-${MODPY_EGG_VERSION}
 FULLPKGPATH-main =	databases/py-sqlalchemy${MODPY_FLAVOR}
 FULLPKGNAME-docs =	py-sqlalchemy-docs-${MODPY_EGG_VERSION}
 FULLPKGPATH-docs =	databases/py-sqlalchemy,-docs
-REVISION =		0
+REVISION-main =		1
+REVISION-docs =		0
 
 CATEGORIES =		databases
 
@@ -18,15 +19,13 @@ HOMEPAGE =		http://www.sqlalchemy.org/
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
 
+WANTLIB-main +=		${MODPY_WANTLIB} pthread
+
 MODULES =		lang/python
 MODPY_SETUPTOOLS =	Yes
-MODPY_PI = 		Yes
+MODPY_PI =		Yes
 
-WANTLIB +=		${MODPY_WANTLIB}
-WANTLIB +=		pthread
 RUN_DEPENDS +=		databases/py-sqlalchemy,-docs
-
-WANTLIB-docs =		#empty
 RUN_DEPENDS-docs =	#empty
 
 MULTI_PACKAGES =	-main -docs
@@ -39,7 +38,7 @@ MAKE_ENV +=		PYTHONPATH=.
 TEST_DEPENDS =		devel/py-test-xdist${MODPY_FLAVOR} \
 			devel/py-mock${MODPY_FLAVOR}
 # On python3, sqlite3 is used.
-.if empty (FLAVOR)
+.if empty(FLAVOR)
 TEST_DEPENDS +=		databases/py-sqlite2${MODPY_FLAVOR}>=2.8.3
 .endif
 
diff --git a/databases/py-sqlalchemy/pkg/PLIST-main b/databases/py-sqlalchemy/pkg/PLIST-main
index 4af72a670e2..8dfc261c5ca 100644
--- a/databases/py-sqlalchemy/pkg/PLIST-main
+++ b/databases/py-sqlalchemy/pkg/PLIST-main
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2018/06/23 21:39:45 landry Exp $
-@pkgpath databases/py-sqlalchemy
-@pkgpath databases/py-sqlalchemy,python3
+@comment $OpenBSD: PLIST-main,v 1.2 2018/06/23 22:29:48 sthen Exp $
+@pkgpath databases/py-sqlalchemy${MODPY_FLAVOR}
 lib/python${MODPY_VERSION}/site-packages/SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/SQLAlchemy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt