From 1754bd72caaeef674cae260b50e76293ace50750 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 19 May 2019 14:44:55 +0200 Subject: [PATCH] Framework: partially sync with upstream Taken from: HardenedBSD --- MOVED | 3 ++- Mk/bsd.gcc.mk | 5 ++--- Mk/bsd.gecko.mk | 3 ++- Tools/scripts/search_lib_depends_and_bump.sh | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MOVED b/MOVED index 8a1d76b54e4..4398e3804c2 100644 --- a/MOVED +++ b/MOVED @@ -10562,6 +10562,7 @@ science/ecs|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, m science/fvm|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, mei and ncs x11-wm/cde|x11/cde|2018-11-05|Recategorise +misc/rumprun||2018-11-06|Has expired: "fails with current compilers" security/ossec-hids-client|security/ossec-hids-agent|2018-11-09|Agent is the name used in documentation graphics/ImageMagick|graphics/ImageMagick6|2018-11-10|Port renamed graphics/ImageMagick-nox11|graphics/ImageMagick6-nox11|2018-11-10|Port renamed @@ -11700,7 +11701,6 @@ audio/qmpdclient||2019-03-16|Has expired: Qt4 has been EOL since december 2015 audio/skype-call-recorder||2019-03-16|Has expired: Qt4 has been EOL since december 2015 biology/clustalx||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/layouteditor||2019-03-16|Has expired: Qt4 has been EOL since december 2015 -cad/leocad||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/meshlab||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/qfsm||2019-03-16|Has expired: Qt4 has been EOL since december 2015 cad/qucs||2019-03-16|Has expired: Qt4 has been EOL since december 2015 @@ -12757,3 +12757,4 @@ dns/bind913|dns/bind9-devel|2019-05-16|Remove outdated development version databases/py-pg_pqueue||2019-05-16|Has expired: Upstream no longer maintained math/py-symeig|science/py-scipy|2019-05-16|Has expired: Consider using science/py-scipy as this library is included in py-scipy since 0.7 and onwards databases/py-mysql-connector-python2|databases/py-mysql-connector-python|2019-05-16|Has expired: Please consider using databases/py-mysql-connector-python which has been updated to latest upstream version +www/py-requests1||2019-05-19|Temporary port while port consumers moved to requests 2.x support and the www/py-requests port. No longer depended on by any ports diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index bda8336cd06..58ef2332f66 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -22,7 +22,7 @@ # # as defined in bsd.default-versions.mk. # USE_GCC= any # port requires GCC 4.2 or later. # USE_GCC= 7+ # port requires GCC 7 or later. -# USE_GCC= 5 # port requires GCC 5. +# USE_GCC= 6 # port requires GCC 6. # # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. @@ -35,13 +35,12 @@ GCC_Include_MAINTAINER= gerald@FreeBSD.org # ascending order and in sync with the table below. # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -GCCVERSIONS= 040200 040800 050000 060000 070000 080000 +GCCVERSIONS= 040200 040800 060000 070000 080000 # 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_050000= 0 5 GCCVERSION_060000= 0 6 GCCVERSION_070000= 0 7 GCCVERSION_080000= 0 8 diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 693239da094..4dd3835e6e7 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -236,7 +236,8 @@ MOZ_OPTIONS+= --with-system-zlib \ # http://www.chromium.org/developers/how-tos/api-keys # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. -MOZ_EXPORT+= MOZ_GOOGLE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 +MOZ_EXPORT+= MOZ_GOOGLE_LOCATION_SERVICE_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 +MOZ_EXPORT+= MOZ_GOOGLE_SAFEBROWSING_API_KEY=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 .if ${PORT_OPTIONS:MGTK2} MOZ_TOOLKIT= cairo-gtk2 diff --git a/Tools/scripts/search_lib_depends_and_bump.sh b/Tools/scripts/search_lib_depends_and_bump.sh index e033e4d17f8..568ce57bb6d 100755 --- a/Tools/scripts/search_lib_depends_and_bump.sh +++ b/Tools/scripts/search_lib_depends_and_bump.sh @@ -33,7 +33,7 @@ PORT_TO_SEARCH=${1} BASEDIR=$(pwd) # Get a list of all ports echo "Prepare a list of all ports" -ports=$(find . -name Makefile -path "./editors/*" ! -path "./Tools/* | sort") +ports=$(find . -name Makefile ! -path "./Tools/* | sort") echo "done." echo