Infrastructure: sync with upstream

Taken from: FreeBSD

LEGAL

@@ -251,7 +251,6 @@ ventrilo_srv-*		audio/ventrilo-server	May not be redistributed.  For personal us
 vice-*			emulators/vice		ROMs are copyrighted by Commodore Business Machines
 VMware-vSphere-Perl*	net/vmware-vsphere-cli	May not be redistributed.  Must accept license to download.
 vpnc-*			security/vpnc		Redistribution is not allowed if linked against OpenSSL
-vst_sdk2_3.zip		audio/ardour		Redistribution of the VST PlugIns SDK is not allowed
 vwnc7.3.1/*		lang/visualworks	Do not redistribute
 waeijiro-fpw-*		japanese/waeijiro-fpw	The original dictionary is not free
 webcopy-*		www/webcopy		This program cannot be distributed if modified in any way.  Don't sell for profit without written permission

Mk/Uses/cpe.mk

@@ -22,9 +22,9 @@
 _INCLUDE_USES_CPE_MK=    yes
 
 CPE_PART	?= a
-CPE_PRODUCT	?= ${PORTNAME}
+CPE_PRODUCT	?= ${PORTNAME:tl}
 CPE_VENDOR	?= ${CPE_PRODUCT}
-CPE_VERSION	?= ${PORTVERSION}
+CPE_VERSION	?= ${PORTVERSION:tl}
 CPE_UPDATE	?=
 CPE_EDITION	?=
 CPE_LANG	?=

Mk/bsd.sites.mk

@@ -386,6 +386,11 @@ MASTER_SITE_FEDORA_LINUX+= \
 	ftp://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_FARSIGHT)
+MASTER_SITE_FARSIGHT+= \
+	https://dl.farsightsecurity.com/dist/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_FESTIVAL)
 MASTER_SITE_FESTIVAL+= \
 	http://www.festvox.org/packed/festival/%SUBDIR%/ \
@@ -1337,6 +1342,7 @@ MASTER_SITES_SUBDIRS=	APACHE_JAKARTA:${PORTNAME:S,-,/,}/source \
 			BERLIOS:${PORTNAME:tl}.berlios \
 			CHEESESHOP:source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/} \
 			DEBIAN:pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME} \
+			FARSIGHT:${PORTNAME} \
 			GCC:releases/${DISTNAME} \
 			GITHUB:${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/ \
 			GITHUB_CLOUD:${GH_ACCOUNT}/${GH_PROJECT}/ \