From 281a81cea206fa80f0b8201735288347dde9cd6b Mon Sep 17 00:00:00 2001
From: kmos <kmos@openbsd.org>
Date: Tue, 26 Nov 2019 16:11:34 +0000
Subject: [PATCH] Move testing instances using uname -r with backticks to the
 better OSREV

---
 databases/py-psycopg2/Makefile | 6 +++---
 devel/py-editdist/Makefile     | 4 ++--
 geo/py-shapely/Makefile        | 4 ++--
 math/py-numexpr/Makefile       | 4 ++--
 math/py-scikit-learn/Makefile  | 4 ++--
 textproc/py-ICU/Makefile       | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 57bb548c81f..37610b23ce9 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2019/06/23 14:32:22 danj Exp $
+# $OpenBSD: Makefile,v 1.37 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT =		PostgreSQL database adapter for Python
 
@@ -49,10 +49,10 @@ TEST_ENV =	PSYCOPG2_TESTDB=${PSYCOPG2_TESTDB} \
 		PSYCOPG2_TESTDB_PASSWORD=${PSYCOPG2_TESTDB_PASSWORD} \
 		PYTHON_VERSION=${MODPY_VERSION} \
 		PYTHON=python${MODPY_VERSION} \
-		PYTHONPATH=./lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}
+		PYTHONPATH=./lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
 
 post-build:
-	cd ${WRKSRC}/doc/src && PYTHONPATH=${WRKSRC}/lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION} \
+	cd ${WRKSRC}/doc/src && PYTHONPATH=${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION} \
 		${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N . _build/html
 
 post-install:
diff --git a/devel/py-editdist/Makefile b/devel/py-editdist/Makefile
index d5c940e925e..2354771bcd0 100644
--- a/devel/py-editdist/Makefile
+++ b/devel/py-editdist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2019/11/25 21:25:31 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT=		calculate Levenshtein distance between two strings
 
@@ -22,7 +22,7 @@ MODULES=		lang/python
 MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	test.py
 
-TESTLIBDIR =		lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}/
+TESTLIBDIR =		lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}/
 TEST_ENV =		PYTHONPATH=${WRKSRC}/${TESTLIBDIR}
 
 .include <bsd.port.mk>
diff --git a/geo/py-shapely/Makefile b/geo/py-shapely/Makefile
index d61b8bfdc75..eba72a1fd5d 100644
--- a/geo/py-shapely/Makefile
+++ b/geo/py-shapely/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2019/11/25 20:26:22 kmos Exp $
+# $OpenBSD: Makefile,v 1.10 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT =	manipulation and analysis of planar geometric objects
 
@@ -31,7 +31,7 @@ BUILD_DEPENDS +=${RUN_DEPENDS} \
 LIB_DEPENDS =	geo/geos
 WANTLIB =	geos_c pthread ${MODPY_WANTLIB}
 
-TESTLIBDIR =	lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}/shapely/
+TESTLIBDIR =	lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}/shapely/
 
 post-patch:
 	${SUBST_CMD} ${WRKSRC}/setup.py
diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile
index 6f61d0fc11a..864afc31e85 100644
--- a/math/py-numexpr/Makefile
+++ b/math/py-numexpr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2019/11/25 20:12:19 kmos Exp $
+# $OpenBSD: Makefile,v 1.11 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT =		fast numerical expression evaluator for NumPy
 
@@ -22,7 +22,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	${TESTLIBDIR}
 
-TESTLIBDIR =	lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}/numexpr/
+TESTLIBDIR =	lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}/numexpr/
 
 TEST_ENV =	PYTHONPATH=${WRKSRC}/${TESTLIBDIR}
 
diff --git a/math/py-scikit-learn/Makefile b/math/py-scikit-learn/Makefile
index 9b0da8f0e57..1ef7945cf85 100644
--- a/math/py-scikit-learn/Makefile
+++ b/math/py-scikit-learn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2019/08/13 08:30:05 pirofti Exp $
+# $OpenBSD: Makefile,v 1.2 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT =	set of python modules for machine learning and data mining
 
@@ -19,7 +19,7 @@ MODULES =		lang/python
 
 MODPY_PI =		Yes
 MODPY_PYTEST =		Yes
-MODPY_TEST_DIR = ${WRKSRC}/lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}
+MODPY_TEST_DIR = ${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
 MODPY_SETUPTOOLS = 	Yes
 MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
 
diff --git a/textproc/py-ICU/Makefile b/textproc/py-ICU/Makefile
index c703c439472..85592d58fab 100644
--- a/textproc/py-ICU/Makefile
+++ b/textproc/py-ICU/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2019/11/26 00:54:05 kmos Exp $
+# $OpenBSD: Makefile,v 1.22 2019/11/26 16:11:34 kmos Exp $
 
 COMMENT=		Python extension wrapping the ICU C++ API
 
@@ -31,7 +31,7 @@ LIB_DEPENDS=		textproc/icu4c
 TEST_DEPENDS=		devel/py-six${MODPY_FLAVOR} \
 			devel/py-test${MODPY_FLAVOR}
 
-TESTLIBDIR=	${WRKSRC}/lib.openbsd-`uname -r`-${ARCH}-${MODPY_VERSION}/
+TESTLIBDIR=	${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}/
 TEST_ENV=	PYTHONPATH=${TESTLIBDIR}
 
 pre-configure: