From 1facc4f17056764f60fe51cbf8c47e4a75ba5267 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 1 Mar 2019 06:50:08 +0100 Subject: [PATCH] Framework: sync with upstream Taken from: HardenedBSD --- CHANGES | 4 ---- MOVED | 1 + Mk/bsd.sites.mk | 2 +- README | 2 -- UPDATING | 11 ++--------- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index 2eda0e2f346..d5d1694ced5 100644 --- a/CHANGES +++ b/CHANGES @@ -282,7 +282,6 @@ AUTHOR: kde@FreeBSD.org to USES=cmake:,noninja - 20170417: AUTHOR: kwm@FreeBSD.org @@ -1882,7 +1881,6 @@ AUTHOR: makc@FreeBSD.org In-source build (equivalent to plain USE_CMAKE=yes) can be used if project doesn't support out-of-source build. - 20130319: AUTHOR: bapt@FreeBSD.org @@ -2806,7 +2804,6 @@ AUTHOR: edwin@FreeBSD.org Use "make -V MASTER_SITES" to see the differences. - 20050313: AUTHOR: ahze@FreeBSD.org, kwm@FreeBSD.org The following changes were committed: @@ -3416,7 +3413,6 @@ AUTHOR: gnome@FreeBSD.org Hopefully galeon2 can catch up to peoples' expectations from galeon1 soon, and we can remove the GTK1 ports altogether. - 20040204: AUTHOR: portmgr@FreeBSD.org The bsd.php.mk file has been moved out of the lang/php4 port diff --git a/MOVED b/MOVED index 214177b017f..9852fbc2aa9 100644 --- a/MOVED +++ b/MOVED @@ -11644,3 +11644,4 @@ net/ceph|net/ceph12|2019-02-27|Make room for other ceph versions devel/rubygem-grape0|devel/rubygem-grape|2019-02-28|Has expired: Use devel/rubygem-grape instead www/rubygem-jwt1|www/rubygem-jwt|2019-02-28|Has expired: Use www/rubygem-jwt instead www/rubygem-rack-cors0|www/rubygem-rack-cors|2019-02-28|Has expired: Use www/rubygem-rack-cors instead +databases/py-sqlparse01|databases/py-sqlparse020|2019-02-28|Removed: Use databases/py-sqlparse020, if you need sqlparse for py-twext diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk index 7791428640e..00102e5c57d 100644 --- a/Mk/bsd.sites.mk +++ b/Mk/bsd.sites.mk @@ -365,7 +365,7 @@ DEV_WARNING+= "MASTER_SITES contains ${MASTER_SITES:M*/github.com/*/archive/*}, # GH_TAGNAME - name of the tag to download (2.0.1, hash, ...) # Using the name of a branch here is incorrect. It is # possible to do GH_TAGNAME= GIT_HASH to do a snapshot. -# default: ${DISTVERSION} +# default: ${DISTVERSIONFULL} # # GH_SUBDIR - directory relative to WRKSRC where to move this distfile's # content after extracting. diff --git a/README b/README index 6f03390f2ee..1ec2b7681f5 100644 --- a/README +++ b/README @@ -16,7 +16,6 @@ These will explain how to use ports and packages. If you would like to search for a port, you can do so easily by saying (in /usr/ports): - make search name="" or: make search key="" @@ -37,4 +36,3 @@ and the individual ports will also use up lots of space in their work subdirectories unless you remember to "make clean" after you're done building a given port. /usr/ports/distfiles can also be periodically cleaned without ill-effect. - diff --git a/UPDATING b/UPDATING index 009038fdd65..ce8dac4552d 100644 --- a/UPDATING +++ b/UPDATING @@ -111,9 +111,9 @@ you update your ports collection, before attempting any port upgrades. in the FreeBSD ports tree. It will also replace the previous 2.18 LTR in the QGIS package repositories in February 2019 [1]. - Beside, the latest QT4 version 4.8.7 has been EOL since December 2015 + Beside, the latest Qt4 version 4.8.7 has been EOL since December 2015 and its expiration date on FreeBSD is set to March, 15th 2019. - Because QGIS 2 is based on QT4 and Python2, it was decided to not create + Because QGIS 2 is based on Qt4 and Python2, it was decided to not create a legacy port for QGIS 2, after graphics/qgis changed to QGIS 3. For users moving over from the 2.18 LTR there is a huge list of new @@ -123,7 +123,6 @@ you update your ports collection, before attempting any port upgrades. done so, take a look at the changelogs from versions 3.0, 3.2, and 3.4 [2][3][4] to understand the full scope of changes in the 3.x release. - [1] https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule [2] http://changelog.qgis.org/en/qgis/version/3.0.0/ [3] http://changelog.qgis.org/en/qgis/version/3.2.0/ @@ -660,7 +659,6 @@ you update your ports collection, before attempting any port upgrades. Application key [base64:P62La9V........qw=] set successfully. - 20180901: AFFECTS: users of samba46 AUTHOR: antoine@FreeBSD.org @@ -2689,7 +2687,6 @@ you update your ports collection, before attempting any port upgrades. version of OpenSSL or LibreSSL that supports the AES256 and SHA256 algorithms. - 20170120: AFFECTS: users of databases/mysql56-server AUTHOR: feld@FreeBSD.org @@ -5708,7 +5705,6 @@ you update your ports collection, before attempting any port upgrades. This is all that is needed to continue using an existing Fedora 10 Linux base and userland. - 20141208: AFFECTS: users of ports-mgmt/poudriere, ports-mgmt/poudriere-devel AUTHOR: bdrewery@FreeBSD.org @@ -9422,7 +9418,6 @@ you update your ports collection, before attempting any port upgrades. or # pkg install -fR lang/ghc - 20121218: AFFECTS: users of icu AUTHOR: bapt@FreeBSD.org @@ -10461,7 +10456,6 @@ you update your ports collection, before attempting any port upgrades. or # portupgrade -fr lang/ghc - 20120531: AFFECTS: users of graphics/png AUTHOR: dinoex@FreeBSD.org @@ -12306,7 +12300,6 @@ or the library with "FETCH" support, this would cause libldap to depend on FreeBSD's libfetch.so library. - As of 20110402, a local change have been introduced so OpenLDAP libraries link against libfetch.so when FETCH is enabled. Normally, no further user interaction would be required.