cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatically handle ports which use the python module and have flavours

Browse Source 
other than the usual "python3/<blank>" python version selection and
remove setting MODPY_VERSION=${MODPY_DEFAULT_VERSION_3} again from the
affected ports.
This commit is contained in:
sthen 2021-02-23 22:04:35 +00:00
parent 761c9f34ff
commit 745105c362
13 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/subversion/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.187 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.188 2021/02/23 22:04:35 sthen Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@ -56,7 +56,6 @@ FLAVOR += no_perl no_python no_ruby
.endif
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
WANTLIB= expat iconv intl lz4 m pthread z

3
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.243 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.244 2021/02/23 22:04:35 sthen Exp $
USE_WXNEEDED= Yes
@ -194,7 +194,6 @@ BUILD_DEPENDS += x11/gnome/librsvg
COMPILER = base-clang ports-gcc base-gcc
MODULES+= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
# XXX can't use ${MODPY_DEFAULT_VERSION_3}, it specifically wants 3.3 and
# will try (and fail) to build its own copy if not available.

3
emulators/qemu/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.204 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.205 2021/02/23 22:04:35 sthen Exp $
ONLY_FOR_ARCHS= aarch64 amd64 arm i386 powerpc powerpc64 sparc64
DPB_PROPERTIES= parallel
@ -29,7 +29,6 @@ WANTLIB= SDL2 X11 atk-1.0 bz2 c cairo cairo-gobject capstone curl \
COMPILER= base-clang ports-gcc
MODULES= lang/python
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/gettext,-tools \

3
fonts/terminus-font/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2021/02/23 22:04:35 sthen Exp $
COMMENT = fixed width fonts especially for long hacking sessions
@ -16,7 +16,6 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
MODULES += lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
MAKE_FLAGS = INT=${MODPY_BIN}

3
graphics/sane-backends/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.99 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.100 2021/02/23 22:04:35 sthen Exp $
BROKEN-alpha= ICE hp5590.c:1141: error: unrecognizable insn
@ -25,7 +25,6 @@ MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/104f09c07d35519c
COMPILER= base-clang ports-gcc
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No

11
lang/python/python.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: python.port.mk,v 1.130 2021/02/23 20:55:02 sthen Exp $
# $OpenBSD: python.port.mk,v 1.131 2021/02/23 22:04:35 sthen Exp $
#
# python.port.mk - Xavier Santolaria <xavier@santolaria.net>
# This file is in the public domain.
@ -38,7 +38,7 @@ MODPY_DEFAULT_VERSION_3 = 3.8
.if !defined(MODPY_VERSION)
FLAVOR ?=
. if !defined(FLAVORS) || ${FLAVOR:Mpython3}
. if !defined(FLAVORS) || !${FLAVORS:Mpython3} || ${FLAVOR:Mpython3}
# for standard "python3-flavoured" ports (normal for py-* modules),
# set the default MODPY_VERSION for the usual py3 version
MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_3}
@ -55,14 +55,13 @@ MODPY_VERSION ?= ${MODPY_DEFAULT_VERSION_2}
# will set MODPY_VERSION themselves.
. endif
. endif
.endif
# verify if MODPY_VERSION forced is correct
.else
. if ${MODPY_VERSION} != "2.7" && \
# verify if MODPY_VERSION found is correct
.if ${MODPY_VERSION} != "2.7" && \
${MODPY_VERSION} != "3.8" && \
${MODPY_VERSION} != "3.9"
ERRORS += "Fatal: unknown or unsupported MODPY_VERSION: ${MODPY_VERSION}"
. endif
.endif
MODPY_MAJOR_VERSION = ${MODPY_VERSION:R}

3
net/flow-tools/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.45 2021/02/23 22:04:35 sthen Exp $
SHARED_LIBS += ft 0.0 # .0.0
@ -20,7 +20,6 @@ FLAVORS= pgsql
FLAVOR?=
MODULES= lang/python
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/flow-tools

3
net/isc-bind/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.133 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.134 2021/02/23 22:04:35 sthen Exp $
COMMENT= Berkeley Internet Name Daemon: DNS server and tools
@ -35,7 +35,6 @@ WANTLIB += c crypto iconv idn2 json-c lzma m pthread ssl unistring uv xml2 z
MASTER_SITES= ${MASTER_SITE_ISC:=bind9/$V/}
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
# used for dnssec-checkds/dnssec-coverage, but don't want to force the run dep.
MODPY_RUNDEP= No
BUILD_DEPENDS= devel/py-ply${MODPY_FLAVOR}

3
net/openconnect/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2021/02/23 21:45:50 sthen Exp $
# $OpenBSD: Makefile,v 1.61 2021/02/23 22:04:35 sthen Exp $
COMMENT= client for Cisco AnyConnect SSL VPN
@ -25,7 +25,6 @@ FLAVORS= light
FLAVOR?=
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
# groff is used to format html during build, USE_GROFF not needed

3
net/toxic/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2021/02/23 22:04:35 sthen Exp $
COMMENT = ncurses-based Tox client
@ -23,7 +23,6 @@ LIB_DEPENDS = audio/freealut \
MAKE_ENV += ENABLE_PYTHON=1 \
USER_CFLAGS="${CFLAGS}"
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
CONFIGURE_STYLE = none
FAKE_FLAGS = PREFIX="${TRUEPREFIX}" \
MANDIR="${PREFIX}/man"

3
security/sudo/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.54 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.55 2021/02/23 22:04:35 sthen Exp $
COMMENT-main= execute a command as another user
COMMENT-python= sudo Python plugin
@ -76,7 +76,6 @@ CONFIGURE_ARGS+= --disable-python
.else
CONFIGURE_ARGS+= --enable-python
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
.endif
# Don't set owner on install in fake mode

3
sysutils/u-boot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2021/02/23 21:45:50 sthen Exp $
# $OpenBSD: Makefile,v 1.80 2021/02/23 22:04:35 sthen Exp $
BROKEN-sparc64= Error: the specified option is not accepted in ISB at operand 1 -- isb sy
BROKEN-arm= lib/time.c:187:1: internal compiler error: Bus error
@ -29,7 +29,6 @@ BUILD_DEPENDS= devel/bison \
textproc/gsed
MODULES= lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
MODPY_SETUPTOOLS=Yes

3
www/kore/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2021/02/23 21:45:49 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2021/02/23 22:04:35 sthen Exp $
COMMENT = web application framework for writing scalable web APIs in C
@ -43,7 +43,6 @@ LIB_DEPENDS += databases/postgresql,-main
.if ${FLAVOR} == "python"
CONFIGURE_STYLE = none
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MAKE_ENV += PYTHON=1
WANTLIB += ${MODPY_WANTLIB} intl m util
LIB_DEPENDS += devel/gettext,-runtime