Framework: partially sync with upstream

Taken from: HardenedBSD

LEGAL

@@ -25,7 +25,6 @@
 #
 # Dist			Port			Why
 # ------------------------------------------------------------------------------
-makemkv-*       multimedia/makemkv      	MAKEMKV licenses don'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
@@ -142,6 +141,7 @@ lpac-*			audio/lpac		No commercial use
 l_cc_p*_*.*.*.tar.gz	lang/icc		No redistribution allowed
 macopix-*.tar.gz	games/macopix		Contains commercial character data
 madfufw-*		audio/madfufw		No redistribution of firmware files
+makemkv-bin-*		multimedia/makemkv	Do not sell. Do not redistribute modified binaries, but explicit permission to distribute a patched makemkvcon given by copyright owner
 malo-fw-*.tar.gz	net/malo-firmware-kmod	Marvell refuses to grant distribution rights
 mb339pan_*		games/flightgear-mb339-pan Redistribution prohibited
 mindfocus-*		games/mindfocus		Contains commercial character data

MOVED

@@ -14565,7 +14565,6 @@ biology/consed||2020-05-05|Has expired: Broken for more than 6 months
 biology/plinkseq||2020-05-05|Has expired: Broken for more than 6 months
 biology/seqtools||2020-05-05|Has expired: Broken for more than 6 months
 biology/t_coffee||2020-05-05|Has expired: Broken for more than 6 months
-biology/ugene||2020-05-05|Has expired: Broken for more than 6 months
 comms/ath3k-firmware||2020-05-05|Has expired: Broken for more than 6 months
 comms/geoid||2020-05-05|Has expired: Broken for more than 6 months
 comms/jerm||2020-05-05|Has expired: Broken for more than 6 months
@@ -14751,7 +14750,6 @@ misc/pantry||2020-05-05|Has expired: Broken for more than 6 months
 misc/phraze||2020-05-05|Has expired: Broken for more than 6 months
 misc/podsleuth||2020-05-05|Has expired: Broken for more than 6 months
 misc/py-osd||2020-05-05|Has expired: Broken for more than 6 months
-misc/rfc||2020-05-05|Has expired: Broken for more than 6 months
 misc/spamcalc||2020-05-05|Has expired: Broken for more than 6 months
 misc/us-zipcodes||2020-05-05|Has expired: Broken for more than 6 months
 misc/xtypo||2020-05-05|Has expired: Broken for more than 6 months
@@ -15008,3 +15006,8 @@ sysutils/rundeck|sysutils/rundeck2|2020-05-07|Rename to avoid confusion with sys
 x11-wm/compiz-plugins-unsupported||2020-05-07|Has expired: Broken for more than 6 months
 math/darknet|misc/darknet|2020-05-07|DarkNet is a machine learning project, not a math project
 www/rubygem-activeresource5|www/rubygem-activeresource|2020-05-08|Remove PKGNAMESUFFIX 3 years and 4 months after rubygem-activeresource removal
+finance/bitcoinnodestats||2020-05-12|Has expired: No longer maintained and not compatible with Django 2.2+
+devel/rubygem-webpacker-rails5|devel/rubygem-webpacker4-rails5|2020-05-12|Rename when rubygem-webpacker is 5.x now
+devel/rubygem-webpacker-rails50|devel/rubygem-webpacker4-rails50|2020-05-12|Rename when rubygem-webpacker is 5.x now
+net-p2p/parity-ethereum|net-p2p/openethereum|2020-05-13|Renamed upstream for transition to a DAO ownership and maintainer model
+net-im/linux-telegram-desktop|net-im/telegram-desktop|2020-05-13|Has expired: Broken for more than 6 months, use native version

Mk/Uses/gmake.mk

@@ -14,7 +14,7 @@ _INCLUDE_USES_GMAKE_MK=	yes
 IGNORE=	Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments
 .endif
 
-BUILD_DEPENDS+=		gmake:devel/gmake
+BUILD_DEPENDS+=		gmake>=4.3:devel/gmake
 CONFIGURE_ENV+=		MAKE=gmake
 MAKE_CMD=		gmake
 

Mk/Uses/python.mk

@@ -638,9 +638,11 @@ PYNUMPY=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1<1.19,1:math/py-numpy@${PY_FLAVOR}
 .if ${PYTHON_REL} < 3500
 PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR}
 PY_TYPING=	${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR}
+PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR}
 .else
 PY_PILLOW=	${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR}
 PY_TYPING=
+PY_SPHINX=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 .endif
 
 .if ${PYTHON_REL} < 3400

Templates/config.site

@@ -119,7 +119,6 @@
 : ${ac_cv_header_argz_h=no}
 : ${ac_cv_header_byteswap_h=no}
 : ${ac_cv_header_dl_h=no}
-: ${ac_cv_header_malloc_h=no}
 : ${ac_cv_header_random_h=no}
 : ${ac_cv_header_vfork_h=no}