Framework: sync with upstream

Taken from: HardenedBSD

CHANGES

@@ -282,7 +282,6 @@ AUTHOR: [email protected]
   to
       USES=cmake:<args>,noninja
 
-
 20170417:
 AUTHOR:	[email protected]
 
@@ -1882,7 +1881,6 @@ AUTHOR: [email protected]
    In-source build (equivalent to plain USE_CMAKE=yes) can be used if
    project doesn't support out-of-source build.
 
-
 20130319:
 AUTHOR: [email protected]
 
@@ -2806,7 +2804,6 @@ AUTHOR: [email protected]
 
   Use "make -V MASTER_SITES" to see the differences.
 
-
 20050313:
 AUTHOR: [email protected], [email protected]
   The following changes were committed:
@@ -3416,7 +3413,6 @@ AUTHOR:	[email protected]
 	Hopefully galeon2 can catch up to peoples' expectations from
 	galeon1 soon, and we can remove the GTK1 ports altogether.
 
-
 20040204:
 AUTHOR:	[email protected]
 	The bsd.php.mk file has been moved out of the lang/php4 port

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

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.

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="<name>"
 	or:
 	make search key="<keyword>"
@@ -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.
-

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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]
@@ -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: [email protected]
@@ -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.