pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: use PYTHON_VERSION instead of _PYTHON_VERSION
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Wed Mar 29 11:31:36 2023 +0200
Changeset: 1ec228111b76010138b7ec099953d10df1ec014f
Modified Files:
chirp/Makefile
py-PySide2/Makefile
py-backports.entry_points_selectable/Makefile
py-bsddb/Makefile
py-mdformat/Makefile
py-pandera/Makefile
py-trollius/Makefile
rtv/Makefile
translate-toolkit/options.mk
Removed Files:
py-bsddb/patches/patch-aa
Log Message:
*: use PYTHON_VERSION instead of _PYTHON_VERSION
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1ec228111b76010138b7ec099953d10df1ec014f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
chirp/Makefile | 4 +-
py-PySide2/Makefile | 2 -
py-backports.entry_points_selectable/Makefile | 3 +-
py-bsddb/Makefile | 8 +-
py-bsddb/patches/patch-aa | 115 --------------------------
py-mdformat/Makefile | 4 +-
py-pandera/Makefile | 3 +-
py-trollius/Makefile | 2 +-
rtv/Makefile | 2 +-
translate-toolkit/options.mk | 4 +-
10 files changed, 14 insertions(+), 133 deletions(-)
diffs:
diff --git a/chirp/Makefile b/chirp/Makefile
index 0c5f7e574f..b83aae23da 100644
--- a/chirp/Makefile
+++ b/chirp/Makefile
@@ -31,8 +31,10 @@ DEPENDS+= ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
DEPENDS+= ${PYPKGPREFIX}-requests>=2.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-future>=0.18.0:../../devel/py-future
+
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} < 310
+
+.if ${PYTHON_VERSION} < 310
DEPENDS+= ${PYPKGPREFIX}-importlib-resources>=1.4.0:../../devel/py-importlib-resources
.endif
# py-yattag
diff --git a/py-PySide2/Makefile b/py-PySide2/Makefile
index 32b6fa5bbe..ce0abe997c 100644
--- a/py-PySide2/Makefile
+++ b/py-PySide2/Makefile
@@ -14,8 +14,6 @@ HOMEPAGE= https://www.pyside.org/
#LICENSE= some kind of GPL
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-.endif
.include "../../lang/python/egg.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtcharts/buildlink3.mk"
diff --git a/py-backports.entry_points_selectable/Makefile b/py-backports.entry_points_selectable/Makefile
index e63e8f4242..f89c582ab0 100644
--- a/py-backports.entry_points_selectable/Makefile
+++ b/py-backports.entry_points_selectable/Makefile
@@ -11,7 +11,8 @@ COMMENT= Compatibility shim providing selectable entry points
LICENSE= mit
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} < 38
+
+.if ${PYTHON_VERSION} < 308
DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata
.endif
diff --git a/py-bsddb/Makefile b/py-bsddb/Makefile
index 18bbd24c7c..415bcab9c2 100644
--- a/py-bsddb/Makefile
+++ b/py-bsddb/Makefile
@@ -15,7 +15,7 @@ PYBINMODULE= yes
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_bsddb.c
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION:M2[67]}
+.if ${PYTHON_VERSION:M2}
EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/bsddb.h
.endif
@@ -23,12 +23,6 @@ PY_SETUP_SUBST+= BLPREFIX=${PREFIX}
PY_SETUP_SUBST+= DBRTPREFIX=${BUILDLINK_PREFIX.db4}
PY_SETUP_SUBST+= DBPREFIX=${BUILDLINK_PREFIX.db4}
-# XXX: a dirty hack used to append more patches which are not in
-# the pkgsrc tree yet - required by Python <= 2.6
-.if ${_PYTHON_VERSION} != "27"
-pkgsrc_extra_patches= ${:!echo ${.CURDIR}/patches/patch-*!:N*\*}
-.endif
-
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
(cd ${WRKSRC}; \
diff --git a/py-bsddb/patches/patch-aa b/py-bsddb/patches/patch-aa
deleted file mode 100644
index 7e02035673..0000000000
--- a/py-bsddb/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2011/04/04 11:09:47 bubuchka Exp $
-
-XXX: to be moved into lang/python26/patches
-Fixed in python27, works for python26, untested on python2[45]
-
-Python commit log: pybsddb 4.8.4 integration. Please, comment in issue #8156
-http://svn.python.org/view/python/trunk/Modules/_bsddb.c?r1=78563&r2=78974&view=patch
-
---- Modules/_bsddb.c 2010/03/01 20:45:01 78563
-+++ Modules/_bsddb.c 2010/03/15 12:46:18 78974
-@@ -215,6 +215,10 @@
- #define DB_BUFFER_SMALL ENOMEM
- #endif
-
-+#if (DBVER < 48)
-+#define DB_GID_SIZE DB_XIDDATASIZE
-+#endif
-+
-
- /* --------------------------------------------------------------------- */
- /* Structure definitions */
-@@ -4501,7 +4505,11 @@
- DBTxnObject *txn;
- #define PREPLIST_LEN 16
- DB_PREPLIST preplist[PREPLIST_LEN];
-+#if (DBVER < 48)
- long retp;
-+#else
-+ u_int32_t retp;
-+#endif
-
- CHECK_ENV_NOT_CLOSED(self);
-
-@@ -4522,7 +4530,7 @@
- flags=DB_NEXT; /* Prepare for next loop pass */
- for (i=0; i<retp; i++) {
- gid=PyBytes_FromStringAndSize((char *)(preplist[i].gid),
-- DB_XIDDATASIZE);
-+ DB_GID_SIZE);
- if (!gid) {
- Py_DECREF(list);
- return NULL;
-@@ -5047,6 +5055,7 @@
- }
-
-
-+#if (DBVER < 48)
- static PyObject*
- DBEnv_set_rpc_server(DBEnvObject* self, PyObject* args, PyObject* kwargs)
- {
-@@ -5068,6 +5077,7 @@
- RETURN_IF_ERR();
- RETURN_NONE();
- }
-+#endif
-
- static PyObject*
- DBEnv_set_verbose(DBEnvObject* self, PyObject* args)
-@@ -5949,9 +5959,9 @@
- if (!PyArg_ParseTuple(args, "s#:prepare", &gid, &gid_size))
- return NULL;
-
-- if (gid_size != DB_XIDDATASIZE) {
-+ if (gid_size != DB_GID_SIZE) {
- PyErr_SetString(PyExc_TypeError,
-- "gid must be DB_XIDDATASIZE bytes long");
-+ "gid must be DB_GID_SIZE bytes long");
- return NULL;
- }
-
-@@ -6541,8 +6551,10 @@
- #endif
- {"set_get_returns_none",(PyCFunction)DBEnv_set_get_returns_none, METH_VARARGS},
- {"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS},
-+#if (DBVER < 48)
- {"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server,
- METH_VARARGS||METH_KEYWORDS},
-+#endif
- {"set_verbose", (PyCFunction)DBEnv_set_verbose, METH_VARARGS},
- #if (DBVER >= 42)
- {"get_verbose", (PyCFunction)DBEnv_get_verbose, METH_VARARGS},
-@@ -7091,6 +7103,7 @@
- ADD_INT(d, DB_MAX_PAGES);
- ADD_INT(d, DB_MAX_RECORDS);
-
-+#if (DBVER < 48)
- #if (DBVER >= 42)
- ADD_INT(d, DB_RPCCLIENT);
- #else
-@@ -7098,7 +7111,11 @@
- /* allow apps to be written using DB_RPCCLIENT on older Berkeley DB */
- _addIntToDict(d, "DB_RPCCLIENT", DB_CLIENT);
- #endif
-+#endif
-+
-+#if (DBVER < 48)
- ADD_INT(d, DB_XA_CREATE);
-+#endif
-
- ADD_INT(d, DB_CREATE);
- ADD_INT(d, DB_NOMMAP);
-@@ -7115,7 +7132,13 @@
- ADD_INT(d, DB_INIT_TXN);
- ADD_INT(d, DB_JOINENV);
-
-+#if (DBVER >= 48)
-+ ADD_INT(d, DB_GID_SIZE);
-+#else
- ADD_INT(d, DB_XIDDATASIZE);
-+ /* Allow new code to work in old BDB releases */
-+ _addIntToDict(d, "DB_GID_SIZE", DB_XIDDATASIZE);
-+#endif
-
- ADD_INT(d, DB_RECOVER);
- ADD_INT(d, DB_RECOVER_FATAL);
diff --git a/py-mdformat/Makefile b/py-mdformat/Makefile
index d57bc7a71c..0646f17ff9 100644
--- a/py-mdformat/Makefile
+++ b/py-mdformat/Makefile
@@ -17,11 +17,11 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} < 37
+.if ${PYTHON_VERSION} < 307
DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=3.7.4:../../devel/py-typing-extensions
.endif
-.if ${_PYTHON_VERSION} < 310
+.if ${PYTHON_VERSION} < 310
DEPENDS+= ${PYPKGPREFIX}-importlib-metadata>=3.6.0:../../devel/py-importlib-metadata
.endif
diff --git a/py-pandera/Makefile b/py-pandera/Makefile
index 27b07f7af7..5aea06af4d 100644
--- a/py-pandera/Makefile
+++ b/py-pandera/Makefile
@@ -20,7 +20,8 @@ DEPENDS+= ${PYPKGPREFIX}-black>=2.8:../../textproc/py-black
DEPENDS+= ${PYPKGPREFIX}-yaml>=5.3.1:../../textproc/py-yaml
.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} < 38
+
+.if ${PYTHON_VERSION} < 308
DEPENDS+= ${PYPKGPREFIX}-typing-inspect>=0.6.0:../../devel/py-typing-inspect
.endif
diff --git a/py-trollius/Makefile b/py-trollius/Makefile
index e9fe758d87..550a706b89 100644
--- a/py-trollius/Makefile
+++ b/py-trollius/Makefile
@@ -15,7 +15,7 @@ PLIST_VARS+= pre33
.include "../../lang/python/egg.mk"
-.if ${_PYTHON_VERSION} < 33
+.if ${PYTHON_VERSION} == 207
DEPENDS+= ${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures
PLIST.pre33= yes
.endif
diff --git a/rtv/Makefile b/rtv/Makefile
index 9b5083fe09..ecabfdc146 100644
--- a/rtv/Makefile
+++ b/rtv/Makefile
@@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
.include "../../lang/python/egg.mk"
-.if ${_PYTHON_VERSION} == 27
+.if ${PYTHON_VERSION} == 207
DEPENDS+= ${PYPKGPREFIX}-mailcap-fix-[0-9]*:../../wip/py-mailcap-fix
.endif
diff --git a/translate-toolkit/options.mk b/translate-toolkit/options.mk
index fc5fa8e7f0..061c8d7ac3 100644
--- a/translate-toolkit/options.mk
+++ b/translate-toolkit/options.mk
@@ -33,13 +33,13 @@ DEPENDS+= ${PYPKGPREFIX}-vobject>=0.9.6:../../textproc/py-vobject
.endif
.if !empty(PKG_OPTIONS:Mini)
-. if empty(_PYTHON_VERSION:M3*)
+. if empty(PYTHON_VERSION:M3*)
DEPENDS+= ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
. endif
.endif
.if !empty(PKG_OPTIONS:Mcsv)
-. if empty(_PYTHON_VERSION:M3*)
+. if empty(PYTHON_VERSION:M3*)
DEPENDS+= ${PYPKGPREFIX}-backports.csv>=1.0.6:../../wip/py-backports.csv
PLIST.csv= yes
. endif
Home |
Main Index |
Thread Index |
Old Index