Commit 219052de authored by Matthias Fechner's avatar Matthias Fechner

Update to r530872.

parent 1c777e3d

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -707,7 +707,7 @@ scop = Ville Skyttä <scop@FreeBSD.org>
scottl = Scott Long <scottl@FreeBSD.org>
scottph = D Scott Phillips <scottph@FreeBSD.org>
scrappy = Marc G. Fournier <scrappy@FreeBSD.org>
se = Stefan Esser <se@FreeBSD.org>
se = Stefan Eßer <se@FreeBSD.org>
sean = Sean Vickery <sean@FreeBSD.org>
seanc = Sean Chittenden <seanc@FreeBSD.org>
sef = Sean Eric Fagan <sef@FreeBSD.org>
......
# Creator: Jordan Hubbard
# $FreeBSD: head/LEGAL 528886 2020-03-21 23:03:05Z 0mp $
# $FreeBSD: head/LEGAL 530792 2020-04-05 15:09:56Z rodrigo $
#
# **********************************************************************
# *** NOTE TO COMMITTERS ***
......@@ -25,6 +25,7 @@
#
# Dist Port Why
# ------------------------------------------------------------------------------
makemkv-* multimedia/makemkv MAKEMKV licenses don't allow 't allow distributing the package as it contains a modified version of the makemkvcon binary
*-for-1.4.tgz net/dgd-lpmud May not be used for monetary gain
*_MegaCLI.zip sysutils/megacli Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/lookup/License.aspx
26410-800.zip audio/libaacplus unclear legal status, probably need licenses from 3GPP, Via Licensing and Coding Technologies
......
#
# MOVED -- A list of (recently) moved or removed ports
#
# $FreeBSD: head/MOVED 529961 2020-03-31 11:26:12Z rene $
# $FreeBSD: head/MOVED 530634 2020-04-04 10:14:41Z madpilot $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
......@@ -9129,7 +9129,6 @@ security/py-crits||2017-04-19|Has expired: Does not build with py-django18 see p
www/py-cactus||2017-04-19|Removed, depends on expired Django version
devel/py-django16-tastypie-mongoengine|devel/py-django-tastypie-mongoengine|2017-04-19|Removed, uses expired Django version
devel/freeocl|lang/pocl|2017-04-19|Has expired: Unfetchable for more than six months (google code has gone away); use lang/pocl instead
net/librsync|net/librsync2|2017-04-28|Unmaintained, CVE-2014-8242, use net/librsync2 instead
devel/stormlib-ghost++||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
devel/py-coil||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
devel/py-cmdln||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
......@@ -11788,7 +11787,6 @@ games/jag||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/kardsgt||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/kcheckers||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/openpref||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/pokerth||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/qgo||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/qtads||2019-03-16|Has expired: Qt4 has been EOL since december 2015
games/quackle||2019-03-16|Has expired: Qt4 has been EOL since december 2015
......@@ -14518,3 +14516,9 @@ lang/ruby24|lang/ruby26|2020-03-31|Has expired: Move to a new version (lang/ruby
databases/pgpool|databases/pgpool-II-35|2020-03-31|Has expired: Reached EOL at 2019-10-31, please use pgpool-II-35 or higher
net/pygopherd||2020-03-31|Has expired: Unmaintained, uses EOLed python27
databases/mongodb34-tools|databases/mongodb36-tools|2020-03-31|Removed, part of expired MongoDB 3.4
databases/py-pypuppetdb03|databases/py-pypuppetdb|2020-04-01|Has expired: Use databases/py-pypuppetdb instead
www/py-puppetboard02|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead
www/py-puppetboard03|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead
net/librsync2|net/librsync|2020-04-02|Remove PKGNAMESUFFIX 3 years after librsync removal
lang/beignet|lang/intel-compute-runtime|2020-04-02|Has expired: Deprecated upstream, use lang/intel-compute-runtime
devel/rubygem-cucumber-tag_expressions|devel/rubygem-cucumber-tag-expressions|2020-04-04|Renamed by upstream
# $FreeBSD: head/Mk/Uses/cargo.mk 528945 2020-03-23 03:57:26Z tobik $
# $FreeBSD: head/Mk/Uses/cargo.mk 530623 2020-04-04 07:40:38Z tobik $
#
# This file contains logic to ease porting of Rust packages or
# binaries using the `cargo` command.
......@@ -187,6 +187,10 @@ DEV_WARNING+= "CARGO_CRATES=openssl-0.10.3 or older do not support OpenSSL 1.1.1
.undef _openssl_VER
.endif
.if ${CARGO_CRATES:Mopenssl-src-[0-9]*}
DEV_WARNING+= "Please make sure this port uses the system OpenSSL and consider removing CARGO_CRATES=${CARGO_CRATES:Mopenssl-src-[0-9]*} (a vendored copy of OpenSSL) from the build, e.g., by patching Cargo.toml appropriately."
.endif
.if ${CARGO_CRATES:Mopenssl-sys-[0-9]*}
# Make sure that openssl-sys can find the correct version of OpenSSL
CARGO_ENV+= OPENSSL_LIB_DIR=${OPENSSLLIB} \
......
# $FreeBSD: head/Mk/Uses/go.mk 528031 2020-03-08 13:30:32Z dmgk $
# $FreeBSD: head/Mk/Uses/go.mk 530388 2020-04-02 17:39:14Z dmgk $
#
# This file contains logic to ease porting of Go binaries using the
# `go` command.
......@@ -107,7 +107,8 @@ GO_BUILDFLAGS+= -mod=vendor
GO_TESTFLAGS+= -mod=vendor
GO_WRKSRC= ${WRKSRC}
GO_ENV+= GOPATH="" \
GOBIN="${GO_WRKDIR_BIN}"
GOBIN="${GO_WRKDIR_BIN}" \
GO_NO_VENDOR_CHECKS=1
.else
GO_WRKSRC= ${WRKDIR}/src/${GO_PKGNAME}
GO_ENV+= GOPATH="${WRKDIR}" \
......
# $FreeBSD: head/Mk/Uses/python.mk 530162 2020-03-31 23:17:32Z sunpoet $
# $FreeBSD: head/Mk/Uses/python.mk 530200 2020-04-01 06:46:47Z antoine $
#
# Provide support for Python related ports. This includes detecting Python
# interpreters, ports providing package and modules for python as well as
......@@ -640,11 +640,9 @@ PY_TYPING=
.if ${PYTHON_REL} < 3400
PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR}
PY_ENUM_COMPAT= ${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR}
PY_PATHLIB= ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR}
.else
PY_ENUM34=
PY_ENUM_COMPAT=
PY_PATHLIB=
.endif
......
......@@ -27,51 +27,40 @@
# If you are wondering what your port exactly does, use "make test-gcc"
# to see some debugging.
#
# $FreeBSD: head/Mk/bsd.gcc.mk 528279 2020-03-12 09:03:04Z gerald $
# $FreeBSD: head/Mk/bsd.gcc.mk 530527 2020-04-03 21:46:40Z gerald $
GCC_Include_MAINTAINER= gerald@FreeBSD.org
# All GCC versions supported by the ports framework. Keep them in
# ascending order and in sync with the table below.
# When updating this, keep Mk/bsd.default-versions.mk in sync.
GCCVERSIONS= 040200 040800 070000 080000 090000
GCCVERSIONS= 040800 070000 080000 090000
# The first field is the OSVERSION in which it disappeared from the base.
# The second field is the version as USE_GCC would use.
GCCVERSION_040200= 9999999 4.2
GCCVERSION_040800= 0 4.8
GCCVERSION_070000= 0 7
GCCVERSION_080000= 0 8
GCCVERSION_090000= 0 9
# The right side is the version as USE_GCC uses it.
_GCCVERSION_040800_V= 4.8
_GCCVERSION_070000_V= 7
_GCCVERSION_080000_V= 8
_GCCVERSION_090000_V= 9
# No configurable parts below this. ####################################
#
.if defined(USE_GCC) && ${USE_GCC} == yes
USE_GCC= ${GCC_DEFAULT}+
.endif
# Extract the fields from GCCVERSION_...
.for v in ${GCCVERSIONS}
. for j in ${GCCVERSION_${v}}
. if !defined(_GCCVERSION_${v}_R)
_GCCVERSION_${v}_R= ${j}
. elif !defined(_GCCVERSION_${v}_V)
_GCCVERSION_${v}_V= ${j}
. endif
. endfor
.endfor
.if defined(USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
. if ${USE_GCC} == any
# Enable the clang-is-cc workaround. Default to the last GCC imported
# into base.
_USE_GCC:= 4.2
_GCC_ORLATER:= true
.if ${USE_GCC} == any && exists(/usr/bin/gcc)
CC:= gcc
CXX:= g++
. if exists(/usr/bin/gcpp)
CPP:= gcpp
. else
CPP:= cpp
. endif
.else # The regular approach, not using the age-old base compiler.
. else # ${USE_GCC} == any
# Handle USE_GCC=yes and USE_GCC=any.
.if ${USE_GCC} == yes || ${USE_GCC} == any
USE_GCC= ${GCC_DEFAULT}+
.endif
# See if we can use a later version or exclusively the one specified.
_USE_GCC:= ${USE_GCC:S/+//}
......@@ -79,8 +68,6 @@ _USE_GCC:= ${USE_GCC:S/+//}
_GCC_ORLATER:= true
.endif
. endif # ${USE_GCC} == any
# See whether we have the specific version requested installed already
# and save that into _GCC_FOUND. In parallel, check if USE_GCC refers
# to a valid version to begin with.
......@@ -89,8 +76,6 @@ _GCC_ORLATER:= true
_GCCVERSION_OKAY= true
. if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
_GCC_FOUND:= ${_USE_GCC}
. elif ${OSVERSION} < ${_GCCVERSION_${v}_R} && exists(/usr/bin/gcc)
_GCC_FOUND:= ${_USE_GCC}
. endif
. endif
.endfor
......@@ -107,44 +92,25 @@ _USE_GCC:= ${GCC_DEFAULT}
. endif
.endif # defined(_GCC_ORLATER)
.endif # defined(USE_GCC)
.if defined(_USE_GCC)
# A concrete version has been selected. Determine if the installed OS
# features this version in the base, and if not then set proper ports
# dependencies, CC, CXX, CPP, and flags.
.for v in ${GCCVERSIONS}
. if ${_USE_GCC} == ${_GCCVERSION_${v}_V}
. if ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
V:= ${_GCCVERSION_${v}_V:S/.//}
# A concrete version has been selected. Set proper ports dependencies,
# CC, CXX, CPP, and flags.
V:= ${_USE_GCC:S/.//}
_GCC_PORT_DEPENDS:= gcc${V}
_GCC_PORT:= gcc${V}
CC:= gcc${V}
CXX:= g++${V}
CPP:= cpp${V}
_GCC_RUNTIME:= ${LOCALBASE}/lib/gcc${V}
. if ${PORTNAME} == gcc
. if ${PORTNAME} == gcc
# We don't want the rpath stuff while building GCC itself
# so we do not set the FLAGS as done in the else part.
# When building a GCC, we want the target libraries to be used and not the
# host GCC libraries.
. else
. else
CFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
CXXFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME}
. endif
. else # Use GCC in base.
CC:= gcc
CXX:= g++
. if exists(/usr/bin/gcpp)
CPP:= gcpp
. else
CPP:= cpp
. endif
. endif # Use GCC in base.
. endif # ${_USE_GCC} == ${_GCCVERSION_${v}_V}
.endfor
. endif
.undef V
# Now filter unsupported flags for CC and CXX.
......@@ -158,6 +124,9 @@ RUN_DEPENDS+= ${_GCC_PORT_DEPENDS}:lang/${_GCC_PORT}
# build leverages this as well.
USE_BINUTILS= yes
.endif
.endif # USE_GCC=any
.endif # defined(_USE_GCC) && !defined(FORCE_BASE_CC_FOR_TESTING)
......
......@@ -3,7 +3,7 @@
#
# Created by: Akinori MUSHA <knu@FreeBSD.org>
#
# $FreeBSD: head/Mk/bsd.ruby.mk 529959 2020-03-31 11:13:55Z rene $
# $FreeBSD: head/Mk/bsd.ruby.mk 530363 2020-04-02 12:20:36Z sunpoet $
#
.if !defined(Ruby_Include)
......@@ -148,7 +148,7 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
#