Browse Source

config: remove notion of version "3" Python, it's the default

pull/182/head
Franco Fichtner 8 months ago
parent
commit
603330a8f6
10 changed files with 42 additions and 43 deletions
  1. +3
    -4
      Makefile
  2. +1
    -1
      build/common.sh
  3. +1
    -1
      build/distfiles.sh
  4. +1
    -1
      build/ports.sh
  5. +1
    -1
      config/20.1/build.conf
  6. +3
    -3
      config/20.1/make.conf
  7. +14
    -14
      config/20.1/ports.conf
  8. +1
    -1
      config/20.7/build.conf
  9. +3
    -3
      config/20.7/make.conf
  10. +14
    -14
      config/20.7/ports.conf

+ 3
- 4
Makefile View File

@ -90,15 +90,14 @@ PORTSREFURL?= https://git-01.md.hardenedbsd.org/HardenedBSD/hardenedbsd-ports.gi
PORTSREFDIR?= /usr/hardenedbsd-ports
PORTSREFBRANCH?=master
PLUGINSENV?= PLUGIN_PHP=${PHP} PLUGIN_ABI=${SETTINGS} \
PLUGIN_PYTHON=${PYTHON3}
PLUGINSENV?= PLUGIN_PHP=${PHP} PLUGIN_ABI=${SETTINGS} PLUGIN_PYTHON=${PYTHON}
PLUGINSDIR?= /usr/plugins
PLUGINSBRANCH?= master
PORTSDIR?= /usr/ports
PORTSBRANCH?= master
COREDIR?= /usr/core
COREBRANCH?= master
COREENV?= CORE_PHP=${PHP} CORE_ABI=${SETTINGS} CORE_PYTHON=${PYTHON3}
COREENV?= CORE_PHP=${PHP} CORE_ABI=${SETTINGS} CORE_PYTHON=${PYTHON}
SRCDIR?= /usr/src
SRCBRANCH?= master
@ -132,7 +131,7 @@ VERBOSE_FLAGS= -x
VERBOSE_HIDDEN= @
.endif
.for _VERSION in PERL PHP PYTHON3 RUBY
.for _VERSION in PERL PHP PYTHON RUBY
VERSIONS+= PRODUCT_${_VERSION}=${${_VERSION}}
.endfor

+ 1
- 1
build/common.sh View File

@ -192,7 +192,7 @@ PRODUCT_SPEED
PRODUCT_SERVER
PRODUCT_PHP
PRODUCT_PERL
PRODUCT_PYTHON3
PRODUCT_PYTHON
PRODUCT_RUBY
PRODUCT_KERNEL
PRODUCT_GITBASE

+ 1
- 1
build/distfiles.sh View File

@ -88,7 +88,7 @@ echo "${PORTS_LIST}" | while read PORT_ORIGIN; do
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
PRODUCT_PERL=${PRODUCT_PERL}
PRODUCT_PHP=${PRODUCT_PHP}
PRODUCT_PYTHON3=${PRODUCT_PYTHON3}
PRODUCT_PYTHO3=${PRODUCT_PYTHON}
PRODUCT_RUBY=${PRODUCT_RUBY}
UNAME_r=\$(freebsd-version)
"

+ 1
- 1
build/ports.sh View File

@ -106,7 +106,7 @@ PRODUCT_ARCH=${PRODUCT_ARCH}
PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}
PRODUCT_PERL=${PRODUCT_PERL}
PRODUCT_PHP=${PRODUCT_PHP}
PRODUCT_PYTHON3=${PRODUCT_PYTHON3}
PRODUCT_PYTHON=${PRODUCT_PYTHON}
PRODUCT_RUBY=${PRODUCT_RUBY}
UNAME_r=\$(freebsd-version)
"

+ 1
- 1
config/20.1/build.conf View File

@ -1,6 +1,6 @@
PERL?= 5.30
PHP?= 72
PYTHON3?= 37
PYTHON?= 37
RUBY?= 26
COREBRANCH?= stable/20.1

+ 3
- 3
config/20.1/make.conf View File

@ -20,15 +20,15 @@ PRODUCT_PHP?= ${_PRODUCT_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
# XXX hardcoded for now
PRODUCT_LUA?= 5.3
PRODUCT_PERL?= 5.30
PRODUCT_PYTHON3?= 37
PRODUCT_PYTHON?= 37
PRODUCT_RUBY?= 26
PRODUCT_GSSAPI?= GSSAPI_MIT
# global options
OPTIONS_UNSET= DOCS EXAMPLES GCC GSSAPI_BASE NLS OPENGL WAYLAND X11
DEFAULT_VERSIONS= python=${PRODUCT_PYTHON3:C/^./&./}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON3:C/^./&./}
DEFAULT_VERSIONS= python=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= ruby=${PRODUCT_RUBY:C/^./&./}
DEFAULT_VERSIONS+= mysql=5.6 # i386 requirement
DEFAULT_VERSIONS+= ssl=${PRODUCT_FLAVOUR:tl}

+ 14
- 14
config/20.1/ports.conf View File

@ -11,7 +11,7 @@ databases/hiredis arm,arm64
databases/pecl-mongodb arm,arm64,i386
databases/php${PRODUCT_PHP}-mysqli arm,arm64
databases/php${PRODUCT_PHP}-sqlite3
databases/py-sqlite3@py${PRODUCT_PYTHON3}
databases/py-sqlite3@py${PRODUCT_PYTHON}
databases/pymongo arm,arm64,i386
databases/redis arm,arm64
databases/rrdtool
@ -35,9 +35,9 @@ devel/php${PRODUCT_PHP}-gettext
devel/php${PRODUCT_PHP}-json
devel/phpunit7@php${PRODUCT_PHP}
devel/pkgconf
devel/py-Jinja2@py${PRODUCT_PYTHON3}
devel/py-pycodestyle@py${PRODUCT_PYTHON3}
devel/py-ujson@py${PRODUCT_PYTHON3}
devel/py-Jinja2@py${PRODUCT_PYTHON}
devel/py-pycodestyle@py${PRODUCT_PYTHON}
devel/py-ujson@py${PRODUCT_PYTHON}
devel/scons
dns/bind-tools
dns/bind914 arm,arm64
@ -46,8 +46,8 @@ dns/dnscrypt-proxy2 arm,arm64,i386
dns/dnsmasq
dns/getdns arm,arm64
dns/maradns arm,arm64
dns/py-dns-lexicon@py${PRODUCT_PYTHON3}
dns/py-dnspython@py${PRODUCT_PYTHON3}
dns/py-dns-lexicon@py${PRODUCT_PYTHON}
dns/py-dnspython@py${PRODUCT_PYTHON}
dns/unbound
editors/emacs@nox
editors/joe
@ -62,7 +62,7 @@ ftp/wget arm,arm64
lang/luajit arm,arm64
lang/perl${PRODUCT_PERL}
lang/php${PRODUCT_PHP}
lang/python${PRODUCT_PYTHON3}
lang/python${PRODUCT_PYTHON}
lang/ruby${PRODUCT_RUBY} arm,arm64
mail/fetchmail arm,arm64
mail/pecl-mailparse arm,arm64
@ -74,7 +74,7 @@ math/php${PRODUCT_PHP}-bcmath arm,arm64
misc/getopt
misc/gnu-watch arm,arm64
misc/help2man
net-im/py-telepot@py${PRODUCT_PYTHON3} arm,arm64
net-im/py-telepot@py${PRODUCT_PYTHON} arm,arm64
net-mgmt/bandwidthd arm,arm64
net-mgmt/bwm-ng arm,arm64
net-mgmt/choparp
@ -119,8 +119,8 @@ net/php${PRODUCT_PHP}-soap arm,arm64
net/php${PRODUCT_PHP}-sockets
net/pimd arm,arm64
net/proxy-suite
net/py-netaddr@py${PRODUCT_PYTHON3}
net/py-speedtest-cli@py${PRODUCT_PYTHON3}
net/py-netaddr@py${PRODUCT_PYTHON}
net/py-speedtest-cli@py${PRODUCT_PYTHON}
net/radvd
net/relayd arm,arm64
net/rsync arm,arm64
@ -168,7 +168,7 @@ security/openvpn
security/php${PRODUCT_PHP}-filter
security/php${PRODUCT_PHP}-hash
security/php${PRODUCT_PHP}-openssl
security/py-fail2ban@py${PRODUCT_PYTHON3}
security/py-fail2ban@py${PRODUCT_PYTHON}
security/snuffleupagus@php${PRODUCT_PHP}
security/softether arm,arm64
security/strongswan
@ -180,7 +180,7 @@ security/vault arm,arm64,i386
security/wazuh-agent arm,arm64,i386
security/wpa_supplicant
security/yara arm,arm64
sysutils/ansible@py${PRODUCT_PYTHON3} arm,arm64
sysutils/ansible@py${PRODUCT_PYTHON} arm,arm64
sysutils/apcupsd arm,arm64
sysutils/beadm arm,arm64
sysutils/beats arm,arm64,i386
@ -227,8 +227,8 @@ www/phalcon4@php${PRODUCT_PHP}
www/php${PRODUCT_PHP}-opcache
www/php${PRODUCT_PHP}-session
www/privoxy arm,arm64
www/py-boto3@py${PRODUCT_PYTHON3} arm,arm64
www/py-requests@py${PRODUCT_PYTHON3}
www/py-boto3@py${PRODUCT_PYTHON} arm,arm64
www/py-requests@py${PRODUCT_PYTHON}
www/sarg arm,arm64
www/squid
www/tinyproxy arm,arm64

+ 1
- 1
config/20.7/build.conf View File

@ -1,6 +1,6 @@
PERL?= 5.30
PHP?= 72
PYTHON3?= 37
PYTHON?= 37
RUBY?= 26
SUFFIX?= -devel

+ 3
- 3
config/20.7/make.conf View File

@ -20,15 +20,15 @@ PRODUCT_PHP?= ${_PRODUCT_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
# XXX hardcoded for now
PRODUCT_LUA?= 5.3
PRODUCT_PERL?= 5.30
PRODUCT_PYTHON3?= 37
PRODUCT_PYTHON?= 37
PRODUCT_RUBY?= 26
PRODUCT_GSSAPI?= GSSAPI_MIT
# global options
OPTIONS_UNSET= DOCS EXAMPLES GCC GSSAPI_BASE NLS OPENGL WAYLAND X11
DEFAULT_VERSIONS= python=${PRODUCT_PYTHON3:C/^./&./}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON3:C/^./&./}
DEFAULT_VERSIONS= python=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= python3=${PRODUCT_PYTHON:C/^./&./}
DEFAULT_VERSIONS+= mysql=5.6 # LibreSSL requirement
DEFAULT_VERSIONS+= ruby=${PRODUCT_RUBY:C/^./&./}
DEFAULT_VERSIONS+= ssl=${PRODUCT_FLAVOUR:tl}

+ 14
- 14
config/20.7/ports.conf View File

@ -11,7 +11,7 @@ databases/hiredis arm,arm64
databases/pecl-mongodb arm,arm64
databases/php${PRODUCT_PHP}-mysqli arm,arm64
databases/php${PRODUCT_PHP}-sqlite3
databases/py-sqlite3@py${PRODUCT_PYTHON3}
databases/py-sqlite3@py${PRODUCT_PYTHON}
databases/pymongo arm,arm64
databases/redis arm,arm64
databases/rrdtool
@ -35,9 +35,9 @@ devel/php${PRODUCT_PHP}-gettext
devel/php${PRODUCT_PHP}-json
devel/phpunit7@php${PRODUCT_PHP}
devel/pkgconf
devel/py-Jinja2@py${PRODUCT_PYTHON3}
devel/py-pycodestyle@py${PRODUCT_PYTHON3}
devel/py-ujson@py${PRODUCT_PYTHON3}
devel/py-Jinja2@py${PRODUCT_PYTHON}
devel/py-pycodestyle@py${PRODUCT_PYTHON}
devel/py-ujson@py${PRODUCT_PYTHON}
devel/scons
dns/bind-tools
dns/bind914 arm,arm64
@ -46,8 +46,8 @@ dns/dnscrypt-proxy2 arm,arm64
dns/dnsmasq
dns/getdns arm,arm64
dns/maradns arm,arm64
dns/py-dns-lexicon@py${PRODUCT_PYTHON3}
dns/py-dnspython@py${PRODUCT_PYTHON3}
dns/py-dns-lexicon@py${PRODUCT_PYTHON}
dns/py-dnspython@py${PRODUCT_PYTHON}
dns/unbound
editors/emacs@nox
editors/joe
@ -62,7 +62,7 @@ ftp/wget arm,arm64
lang/luajit arm,arm64
lang/perl${PRODUCT_PERL}
lang/php${PRODUCT_PHP}
lang/python${PRODUCT_PYTHON3}
lang/python${PRODUCT_PYTHON}
lang/ruby${PRODUCT_RUBY} arm,arm64
mail/fetchmail arm,arm64
mail/pecl-mailparse arm,arm64
@ -74,7 +74,7 @@ math/php${PRODUCT_PHP}-bcmath arm,arm64
misc/getopt
misc/gnu-watch arm,arm64
misc/help2man
net-im/py-telepot@py${PRODUCT_PYTHON3} arm,arm64
net-im/py-telepot@py${PRODUCT_PYTHON} arm,arm64
net-mgmt/bandwidthd arm,arm64
net-mgmt/bwm-ng arm,arm64
net-mgmt/choparp
@ -119,8 +119,8 @@ net/php${PRODUCT_PHP}-soap arm,arm64
net/php${PRODUCT_PHP}-sockets
net/pimd arm,arm64
net/proxy-suite
net/py-netaddr@py${PRODUCT_PYTHON3}
net/py-speedtest-cli@py${PRODUCT_PYTHON3}
net/py-netaddr@py${PRODUCT_PYTHON}
net/py-speedtest-cli@py${PRODUCT_PYTHON}
net/radvd
net/relayd arm,arm64
net/rsync arm,arm64
@ -169,7 +169,7 @@ security/openvpn
security/php${PRODUCT_PHP}-filter
security/php${PRODUCT_PHP}-hash
security/php${PRODUCT_PHP}-openssl
security/py-fail2ban@py${PRODUCT_PYTHON3}
security/py-fail2ban@py${PRODUCT_PYTHON}
security/snuffleupagus@php${PRODUCT_PHP}
security/softether arm,arm64
security/strongswan
@ -181,7 +181,7 @@ security/vault arm,arm64
security/wazuh-agent arm,arm64
security/wpa_supplicant
security/yara arm,arm64
sysutils/ansible@py${PRODUCT_PYTHON3} arm,arm64
sysutils/ansible@py${PRODUCT_PYTHON} arm,arm64
sysutils/apcupsd arm,arm64
sysutils/beadm arm,arm64
sysutils/beats arm,arm64
@ -228,8 +228,8 @@ www/phalcon4@php${PRODUCT_PHP}
www/php${PRODUCT_PHP}-opcache
www/php${PRODUCT_PHP}-session
www/privoxy arm,arm64
www/py-boto3@py${PRODUCT_PYTHON3} arm,arm64
www/py-requests@py${PRODUCT_PYTHON3}
www/py-boto3@py${PRODUCT_PYTHON} arm,arm64
www/py-requests@py${PRODUCT_PYTHON}
www/sarg arm,arm64
www/squid
www/tinyproxy arm,arm64

Loading…
Cancel
Save