*/*: sync with upstream

Taken from: HardenedBSD

archivers/ark/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	ark
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	archivers kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

archivers/ark/files/patch-git_0d5952

@@ -0,0 +1,46 @@
+From 0df592524fed305d6fbe74ddf8a196bc9ffdb92f Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Wed, 29 Jul 2020 23:45:30 +0200
+Subject: [PATCH] Fix vulnerability to path traversal attacks
+
+Ark was vulnerable to directory traversal attacks because of
+missing validation of file paths in the archive.
+
+More details about this attack are available at:
+https://github.com/snyk/zip-slip-vulnerability
+
+Job::onEntry() is the only place where we can safely check the path of
+every entry in the archive. There shouldn't be a valid reason
+to have a "../" in an archive path, so we can just play safe and abort
+the LoadJob if we detect such an entry. This makes impossibile to
+extract this kind of malicious archives and perform the attack.
+
+Thanks to Albert Astals Cid for suggesting to use QDir::cleanPath()
+so that we can still allow loading of legitimate archives that
+contain "../" in their paths but still resolve inside the extraction folder.
+---
+ kerfuffle/jobs.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp
+index fdaa48695..f73b56f86 100644
+--- kerfuffle/jobs.cpp
++++ kerfuffle/jobs.cpp
+@@ -180,6 +180,14 @@ void Job::onError(const QString & message, const QString & details)
+ 
+ void Job::onEntry(Archive::Entry *entry)
+ {
++    const QString entryFullPath = entry->fullPath();
++    if (QDir::cleanPath(entryFullPath).contains(QLatin1String("../"))) {
++        qCWarning(ARK) << "Possibly malicious archive. Detected entry that could lead to a directory traversal attack:" << entryFullPath;
++        onError(i18n("Could not load the archive because it contains ill-formed entries and might be a malicious archive."), QString());
++        onFinished(false);
++        return;
++    }
++
+     emit newEntry(entry);
+ }
+ 
+-- 
+GitLab
+

astro/xearth/files/freebsd.committers.markers

@@ -11,7 +11,6 @@
 
 -41.2124,	174.8870,	"thompsa"			# Wellington, New Zealand
 -34.045657,	151.117163,	"edwin"				# Caringbah NSW, Australia
--33.55,		151.1,		"bde"				# Sydney, Australia
 -37.7,		144.9,		"     jb,benno"			# Melbourne, Vic, Australia
 -37.800152,     143.751219,	"grog"				# Dereel, VIC, Australia
  35.69,		139.92,		"metal"				# Ichikawa, Chiba, Japan
@@ -50,6 +49,7 @@
 -31.928982,	115.912435,	"lawrance"			# Perth, Australia
 -31.900,	115.855,	"woodsb02"			# Perth, WA, Australia
 -31.97908,	115.81611,	"adrian"			# Crawley, Perth, Western Australia
+ 22.278865,	114.188836,	"philip"			# Causeway Bay, Hong Kong SAR
  22.80346,	113.80578,	"wen"				# DongGuan, GuangDong, China
  22.1957,	113.549,	"vs"				# Macau, Macau SAR
  47.921386,	106.910153,	"ganbold"			# Ulaanbaatar, Mongolia
@@ -57,11 +57,12 @@
  3.130,		101.669,	"miwi"				# Kuala Lumpur, Malaysia
  55.033,	82.917,		"danfe,fjoe"			# Novosibirsk, Russia
  13.6325,	78.4552,	"jkoshy"			# Rishi Valley, India
- 28.599623,	77.314412	"ashish"			# Delhi, India
+ 28.599623,	77.314412,	"ashish"			# Delhi, India
  43.219564,	76.851597,	"bp"				# Almaty, Kazakhstan
  35.72689,	51.54698,	"mmokhi"			# Tehran, Iran
  51.33,		46.00,		"novel"				# Saratov, Russia
  48.805,	44.586,		"den"				# Volgograd, Russia
+ 48.676433,	44.473968,	"arrowd"			# Volgograd, Russia
  55.740978,	37.830851,	"sem"				# Moscow, Russia
  55.7,		37.8,		"az"				# Moscow, Russia
  55.702594,	37.784919,	"zont"				# Moscow, Russia
@@ -121,7 +122,7 @@
  48.108055,	11.635277,	"olli"				# Munich, Germany
  55.48821,	11.62152,	"pho"				# Soroe, Denmark
  48.109752,	11.572466,	"barner"			# Munich, Germany
- 55.406124,	11.3397291,	"phk"				# Slagelse, Denmark
+ 55.4064909,	11.3368464,	"phk"				# Slagelse, Denmark
  48.095,	11.296,		"harti"				# Gilching, Germany
  48.16,		11.26,		"rse"				# Dachau, Germany
  43.79142,	11.22991,	"madpilot"			# Florence, Italy
@@ -134,6 +135,7 @@
  53.56,		10.02,		"cracauer"			# Hamburg, Germany
  53.64,		9.84,		"hm"		align=left	# Rellingen, Germany
  48.336389,	9.836389,	"helbig"			# Waiblingen, Germany
+ 57.196092,	9.673923,	"debdrup"			# Kaas, Denmark
  49.00,		9.5,		"schweikh"			# Weinstadt, Germany
  51.20,		9.20,		"dinoex"			# Habichtswald, Germany
  45.467,	9.200,		"piso"				# Milano, Italy
@@ -154,8 +156,8 @@
  40.5701089,	8.32383334,	"jacula"	align=below	# Alghero, Italy
  47.23,		8.32,		"andre"				# Zurich, Switzerland
  51.68,		7.8,		"dhn"				# Hamm, Germany
+ 51.4233,	7.76057,	"flo"				# Menden, Germany
  51.533,	7.683,		"stefan"			# Unna, Germany
- 51.47670,	7.60220		"flo"				# Dortmund, Germany
  51.290484,	7.293945,	"markus"			# Dortmund, Germany
  50.73389,	7.09972,	"egypcio"			# Bonn, Germany
  51.385658,	7.007214,	"lofi"				# Essen, Germany
@@ -165,6 +167,7 @@
  51.146552,	6.86970,	"lme"				# Duesseldorf, Germany
  51.22720,	6.80959,	"pizzamig"			# Duesseldorf, Germany
  51.126809,	6.784074,	"oliver"			# Dormagen, Germany
+ 45.8766,	6.633,		"lbartoletti"			# Sallanches, France
  51.4666,	6.6166,		"ticso"				# Moers, Germany
  51.12,		6.41,		"andreas"			# Neuss, Germany
  49.612,        6.130,          "culot"                         # Luxembourg, Luxembourg
@@ -188,6 +191,7 @@
  50.7323,	3.104,		"vanhu"				# Tourcoing, France
  48.36,		2.99,		"charnier"	align=left	# Cannes Ecluse, France
  48.83,		2.36,		"antoine"			# Paris, France
+ 48.79964,	2.35058 	"bapt"				# (CORE) Villejuif, France
  48.827111,	2.347019,	"sbz"				# Paris, France
  41.6666,	2.3333,		"jesusr"			# Barcelona, Spain
  48.87,		2.33,		"dumbbell,cognet"	align=left	# Paris, France
@@ -195,9 +199,7 @@
  48.912,	2.256,		"mich"		align=left	# La Garenne-Colombes, France
  48.818344,	2.245696,	"roberto"	align=left	# Meudon, France
  48.836,	2.242,		"blackend"	align=left	# Boulogne-Billancourt, France
- 48.844,	2.213,		"bapt"				# (CORE) Saint Cloud, France
  46.75984,	1.738281,	"stephane"			# Orleans, France
- 51.33046,	1.41088,	"matthew"			# Ramsgate, UK
  51.29870,	1.07005,	"tdb"				# Canterbury, United Kingdom
  52.18,		0.19,		"markm"		align=left	# Cambridge, Cambs, UK
  52.20360,	0.14134,	"rsm"				# Cambridge, UK
@@ -213,15 +215,16 @@
  51.461916,	-1.011833,	"jesper"			# Reading, United Kingdom
  53.955666,	-1.072605,	"gavin"				# (CORE) York, United Kingdom
  52.635,	-1.135,		"hmp"				# Leicester, East Midlands, UK
+ 51.782616,     -1.373806	"matthew"			# Eynsham, UK
  48.12,		-1.60,		"martymac"			# Cesson-Sevigne, France
  48.10927,	-1.61104,	"jadawin"			# Cesson-Sevigne, France
  47.394586,	-1.658038,	"olivier"			# Heric, France
- 57.114807,	-2.179896,	"brucec"			# Aberdeen, United Kingdom
  53.466667,	-2.233333,	"makc"				# Manchester, United Kingdom
  52.188649,	-2.2341,	"crees"				# Worcester, West Midlands, United Kingdom
  42.8474,	-2.66976,	"carvay"			# Araba, Vitoria-Gasteiz, Spain
  51.49,		-3.16,		"ceri"				# Cardiff, UK
  37.1876,	-3.6149,	"cpm"				# Granada, Spain
+ 40.4445,	-3.6722,	"fernape"			# Madrid, Spain
  53.20,		-6.15,		"dwmalone"	align=left	# Dublin, Ireland
  53.286499,	-6.196429,	"flz"				# Stillorgan, Co. Dublin, Ireland
  53.65,		-6.67,		"peadar"	align=above	# Navan, Co. Meath, Ireland
@@ -250,8 +253,8 @@
  40.75,		-73.97,		"sahil"				# New York, NY, USA 
  40.86004,	-73.98038,	"jkim"				# Leonia, NJ, USA
  43,		-75,		"gnn"				# (CORE) New York, NY, USA
- 45.366,	-75.193,	"db"				# Ottawa, ON, Canada
  45.3991,	-75.6942,	"jake"				# Ottawa, ON, Canada
+ 45.36613,	-75.71911,	"db"				# Ottawa, ON, Canada
  42.26785,	-76.28954,	"pat"				# Ithaca, NY, USA
  39.046,	-76.442,	"patrick"			# Annapolis, MD, USA
  44.229844,	-76.48019,	"adamw"				# Kingston, ON, Canada
@@ -273,8 +276,9 @@
  43.48,		-80.54,		"emaste"			# (CORE) Waterloo, ON, Canada
  36.294167,	-82.4725,	"jsa"				# Jonesborough, TN, USA
  34.827667,	-82.553759,	"laszlof"			# Easley, SC, USA
- 42.28,		-83.75,		"rees"				# Ann Arbor, MI, USA
+ 42.28,		-83.75,		"rees"				# Ann Arbor, MI, USA 
  35.739974,	-83.993768,	"jhixson"			# Maryville, TN, USA
+ 42.737,	-84.484,	"nwhitehorn"			# East Lansing, MI, USA
  33.817888,	-84.485421,	"ahze"				# Smyrna, GA, USA
  39.1361,	-84.5030,	"cokane"			# Cincinnati, OH, USA
  35.555301,	-86.054649,	"rnoland"			# Manchester, TN, USA
@@ -285,7 +289,6 @@
  48.400,	-89.233,	"tabthorpe"			# Thunder Bay, ON, Canada
  43.19,		-89.38,		"jlemon"			# Madison, WI, USA
  43.02,		-89.41,		"feld"				# Madison, WI, USA
- 42.737,	-84.484,	"nwhitehorn"			# East Lansing, MI, USA
  46.012,	-92.373,	"jpaetzel"			# Danbury, WI, USA
  38.92,		-92.40,		"stephen"			# Columbia, MO, USA
  45.0676,	-92.8234,	"xride"				# Stillwater, MN, USA
@@ -293,20 +296,21 @@
  44.89,		-93.35,		"bdrewery"			# Minneapolis, MN, USA
  42.02,		-93.67,		"ghelmer"			# Ames, IA, USA
  29.834,	-95.00,		"     ,chris"			# Houston, TX, USA
- 30.715833	-95.5525,	"ade"				# Huntsville, TX, USA
+ 30.715833,	-95.5525,	"ade"				# Huntsville, TX, USA
  37.0625,	-95.677068,	"kmacy"				# Palo Alto, CA, USA
  29.7925,	-95.8225,	"dwcjr"				# Katy, TX, USA
  39.168,	-96.620,	"kevans"			# Manhattan, KS, USA
- 30.47702408	-97.64801025	"ler"				# Pflugerville, TX, USA
+ 30.47702408,	-97.64801025,	"ler"				# Pflugerville, TX, USA
  30.343,	-97.881,	"          ,linimon"		# Austin, TX, USA
  37.972,	-100.872,	"mezz"				# Garden City, KS, USA
  39.897418,	-104.981891,	"brd"				# Northglenn, CO, USA
  39.897418,	-105.074891,	"will"				# Westminster, CO, USA
  40.01942534,	-105.23914289,	"imp"				# Boulder, CO, USA
- 40.1,		-105.3,		"gibbs,ken"			# Boulder, CO, USA
+ 40.1,		-105.3,		"asomers,gibbs,ken"		# Boulder, CO, USA
  29.067,	-110.967,	"jcamou"			# Hermosillo, Sonora, Mexico
  40.298753,	-111.696486,	"jamie"				# Orem, UT, USA
- 33.3437,	-111.9344	"kbowling"			# Tempe, Arizona, USA
+ 40.615069,	-111.831064,	"bcran"				# Cottonwood Heights, UT, USA
+ 33.3437,	-111.9344,	"kbowling"			# Tempe, Arizona, USA
  51.083,	-114.13,	"davidc"			# Calgary, Alberta, Canada
  51.083,	-114.167,	"aaron"				# Calgary, Alberta, Canada
  47.74075,	-116.83366,	"jasone"			# Coeur d'Alene, ID, USA
@@ -338,7 +342,7 @@
  47.382689,	-122.227021,	"garys"				# Kent, WA, USA
  37.81875,	-122.2466,	"kientzle"			# Oakland, CA, USA
  37.84,		-122.25,	"jmg"				# Oakland, CA, USA
- 37.4703,	-122.2548	"dhw"				# Redwood City, CA, USA
+ 37.4703,	-122.2548,	"dhw"				# Redwood City, CA, USA
  37.887398,	-122.264896,	"gsutter,sam"			# Berkeley, CA, USA
  37.386666,	-122.268966,	"fenner"			# Sky Londa, CA, USA
  37.848966,	-122.288577,	"dteske"			# Emeryville, CA, USA

audio/Makefile

@@ -58,6 +58,7 @@
     SUBDIR += beets
     SUBDIR += bharvestr-lv2
     SUBDIR += bjumblr-lv2
+    SUBDIR += bliss
     SUBDIR += blop
     SUBDIR += blop-lv2
     SUBDIR += bristol

audio/bjumblr-lv2/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	bjumblr
-DISTVERSION=	1.2.2
+DISTVERSION=	1.4.0
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -25,13 +25,6 @@ USE_XORG=	x11
 
 MAKEFILE=	makefile
 
-PLIST_FILES=	lib/lv2/BJumblr.lv2/BJumblr.so \
-		lib/lv2/BJumblr.lv2/BJumblr.ttl \
-		lib/lv2/BJumblr.lv2/BJumblr_GUI.so \
-		lib/lv2/BJumblr.lv2/inc/surface.png \
-		lib/lv2/BJumblr.lv2/manifest.ttl \
-		lib/lv2/BJumblr.lv2/surface.png
-
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/lv2/BJumblr.lv2/LICENSE
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/BJumblr.lv2/BJumblr*.so

audio/bjumblr-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1592190146
-SHA256 (sjaehn-BJumblr-1.2.2_GH0.tar.gz) = f70faa76509adf50c116575271b489a444f7e18ac608da94330645e6b559c3a1
-SIZE (sjaehn-BJumblr-1.2.2_GH0.tar.gz) = 435026
+TIMESTAMP = 1595902423
+SHA256 (sjaehn-BJumblr-1.4.0_GH0.tar.gz) = 5eca74d5deb1ceac61555546bd1721aef1e9ac9f79d05c33eab2ed174ac99677
+SIZE (sjaehn-BJumblr-1.4.0_GH0.tar.gz) = 452100

audio/bjumblr-lv2/pkg-plist

@@ -0,0 +1,38 @@
+lib/lv2/BJumblr.lv2/BJumblr.so
+lib/lv2/BJumblr.lv2/BJumblr.ttl
+lib/lv2/BJumblr.lv2/BJumblr_GUI.so
+lib/lv2/BJumblr.lv2/inc/page1.png
+lib/lv2/BJumblr.lv2/inc/page10.png
+lib/lv2/BJumblr.lv2/inc/page11.png
+lib/lv2/BJumblr.lv2/inc/page12.png
+lib/lv2/BJumblr.lv2/inc/page13.png
+lib/lv2/BJumblr.lv2/inc/page14.png
+lib/lv2/BJumblr.lv2/inc/page15.png
+lib/lv2/BJumblr.lv2/inc/page16.png
+lib/lv2/BJumblr.lv2/inc/page2.png
+lib/lv2/BJumblr.lv2/inc/page3.png
+lib/lv2/BJumblr.lv2/inc/page4.png
+lib/lv2/BJumblr.lv2/inc/page5.png
+lib/lv2/BJumblr.lv2/inc/page6.png
+lib/lv2/BJumblr.lv2/inc/page7.png
+lib/lv2/BJumblr.lv2/inc/page8.png
+lib/lv2/BJumblr.lv2/inc/page9.png
+lib/lv2/BJumblr.lv2/inc/surface.png
+lib/lv2/BJumblr.lv2/manifest.ttl
+lib/lv2/BJumblr.lv2/page1.png
+lib/lv2/BJumblr.lv2/page10.png
+lib/lv2/BJumblr.lv2/page11.png
+lib/lv2/BJumblr.lv2/page12.png
+lib/lv2/BJumblr.lv2/page13.png
+lib/lv2/BJumblr.lv2/page14.png
+lib/lv2/BJumblr.lv2/page15.png
+lib/lv2/BJumblr.lv2/page16.png
+lib/lv2/BJumblr.lv2/page2.png
+lib/lv2/BJumblr.lv2/page3.png
+lib/lv2/BJumblr.lv2/page4.png
+lib/lv2/BJumblr.lv2/page5.png
+lib/lv2/BJumblr.lv2/page6.png
+lib/lv2/BJumblr.lv2/page7.png
+lib/lv2/BJumblr.lv2/page8.png
+lib/lv2/BJumblr.lv2/page9.png
+lib/lv2/BJumblr.lv2/surface.png

audio/bliss/Makefile

@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME=	bliss
+DISTVERSION=	1.2.0.20200615
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-music-analyzer
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Multithreaded C library used to compute distance between songs
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libfftw3.so:math/fftw3
+
+USES=		cmake pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	Polochon-street
+GH_TAGNAME=	fa6c62588df645b5ccee53207efc6a0d9a303b3a
+USE_LDCONFIG=	yes
+
+PLIST_FILES=	include/bliss.h \
+		lib/libbliss.so
+
+.include <bsd.port.mk>

audio/bliss/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1596086046
+SHA256 (Polochon-street-bliss-1.2.0.20200615-fa6c62588df645b5ccee53207efc6a0d9a303b3a_GH0.tar.gz) = 71985ade63fcf9ab1e0f732df6a2b69d25b790119d3eb997000edd510438920b
+SIZE (Polochon-street-bliss-1.2.0.20200615-fa6c62588df645b5ccee53207efc6a0d9a303b3a_GH0.tar.gz) = 3734783

audio/bliss/files/patch-CMakeLists.txt

@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2020-07-30 05:15:51 UTC
++++ CMakeLists.txt
+@@ -93,8 +93,8 @@ set_tests_properties(ctest_run_test_decode PROPERTIES 
+ ###################
+ # Install targets #
+ ###################
+-install(TARGETS bliss DESTINATION /usr/lib)
+-install(FILES include/bliss.h DESTINATION /usr/include)
++install(TARGETS bliss DESTINATION lib)
++install(FILES include/bliss.h DESTINATION include)
+ 
+ ##############
+ # Generators #

audio/bliss/pkg-descr

@@ -0,0 +1,8 @@
+Bliss music library is a multithreaded C library used to compute distance
+between songs. It is especially usable through MPD with Blissify. It is can be
+useful for creating "intelligent" playlists and/or continuous play, a la
+Spotify/Grooveshark Radio.
+
+Bliss is really useful when used as a plug-in for audio players.
+
+WWW: https://github.com/Polochon-street/bliss

audio/libsndfile/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libsndfile
-PORTVERSION=	1.0.28
-PORTREVISION=	2
+DISTVERSION=	1.0.29pre.20200620
 CATEGORIES=	audio
-MASTER_SITES=	http://www.mega-nerd.com/libsndfile/files/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
@@ -13,37 +11,42 @@ COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe gmake libtool localbase pkgconfig
+USES=		cmake cpe localbase pkgconfig python:build,test shebangfix
+SHEBANG_FILES=	programs/test-sndfile-metadata-set.py \
+		src/binheader_writef_check.py \
+		src/create_symbols_file.py
+
 CPE_VENDOR=	${CPE_PRODUCT}_project
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gcc-pipe \
-		--disable-sqlite \
-		--disable-alsa \
-		--disable-octave \
-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	erikd
+GH_TAGNAME=	2ccb23f
+
 USE_LDCONFIG=	yes
-TEST_TARGET=	check
-INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	CPU_CLIP EXTERNAL DOCS
+OPTIONS_DEFINE=	DOCS EXTERNAL STATIC TEST
+OPTIONS_SUB=	yes
 OPTIONS_DEFAULT=	EXTERNAL
-CPU_CLIP_DESC=	Allow machine-dependent clipping
-EXTERNAL_DESC=	Enable FLAC and Ogg Vorbis support
-
-CPU_CLIP_VARS=	MANUAL_PACKAGE_BUILD="WITH_CPU_CLIP may customize the package for the build machine"
-CPU_CLIP_CONFIGURE_OFF=	--disable-cpu-clip
+EXTERNAL_DESC=	Enable FLAC, Ogg Vorbis, Opus support
+TEST_IMPLIES=	STATIC
 
 EXTERNAL_LIB_DEPENDS=	libFLAC.so:audio/flac \
 			libogg.so:audio/libogg \
+			libopus.so:audio/opus \
 			libvorbis.so:audio/libvorbis
-EXTERNAL_CONFIGURE_OFF=	--disable-external-libs
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^SUBDIRS =/s/ doc / /g' ${WRKSRC}/Makefile.in
+STATIC_CMAKE_OFF=	-DBUILD_SHARED_LIBS:BOOL=ON
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${TAR} -C ${WRKSRC}/doc --exclude "*Makefile*" --exclude "*.in" \
-		-cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
+TEST_CMAKE_ON=	-DBUILD_TESTING:BOOL=ON
+TEST_CMAKE_OFF=	-DBUILD_TESTING:BOOL=OFF
+
+.include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MEXTERNAL}
+EXTRA_PATCHES=	${FILESDIR}/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs
+.endif
+
+do-test:
+	(cd ${TEST_WRKSRC} && CTEST_OUTPUT_ON_FAILURE=1 ctest -V)
 
 .include <bsd.port.mk>

audio/libsndfile/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1494006962
-SHA256 (libsndfile-1.0.28.tar.gz) = 1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9
-SIZE (libsndfile-1.0.28.tar.gz) = 1202833
+TIMESTAMP = 1595853607
+SHA256 (erikd-libsndfile-1.0.29pre.20200620-2ccb23f_GH0.tar.gz) = 70fee769ab60c579090edf5a43a4959a71feb14f0e531394f4e1c1a9741258c3
+SIZE (erikd-libsndfile-1.0.29pre.20200620-2ccb23f_GH0.tar.gz) = 721895

audio/libsndfile/files/extrapatch-cmake_SndFileChecks.cmake-disableexternallibs

@@ -0,0 +1,32 @@
+--- cmake/SndFileChecks.cmake.orig	2020-07-23 13:42:53 UTC
++++ cmake/SndFileChecks.cmake
+@@ -31,28 +31,7 @@ if (VCPKG_TOOLCHAIN AND (NOT CMAKE_VERSION VERSION_LES
+ 	set (CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+ endif ()
+ 
+-if (CMAKE_FIND_PACKAGE_PREFER_CONFIG)
+-	find_package (Ogg 1.3 CONFIG)
+-	find_package (Vorbis CONFIG COMPONENTS Enc)
+-	find_package (FLAC CONFIG)
+-	find_package (Opus CONFIG)
+-
+-	include (FindPackageHandleStandardArgs)
+-	find_package_handle_standard_args (Ogg CONFIG_MODE)
+-	find_package_handle_standard_args (Vorbis CONFIG_MODE)
+-	find_package_handle_standard_args (FLAC CONFIG_MODE)
+-	find_package_handle_standard_args (Opus CONFIG_MODE)
+-else ()
+-	find_package (Ogg 1.3)
+-	find_package (Vorbis COMPONENTS Enc)
+-	find_package (FLAC)
+-	find_package (Opus)
+-endif ()
+-if (Vorbis_FOUND AND FLAC_FOUND AND Opus_FOUND)
+-	set (HAVE_EXTERNAL_XIPH_LIBS 1)
+-else ()
+-	set (HAVE_EXTERNAL_XIPH_LIBS 0)
+-endif ()
++set (HAVE_EXTERNAL_XIPH_LIBS 0)
+ 
+ find_package (Speex)
+ find_package (SQLite3)

audio/libsndfile/files/patch-CMakeLists.txt

@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2020-07-23 12:41:43 UTC
++++ CMakeLists.txt
+@@ -74,8 +74,8 @@ cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_N
+ 
+ set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS})
+ set (HAVE_SQLITE3 ${BUILD_REGTEST})
+-set (HAVE_ALSA_ASOUNDLIB_H ${ALSA_FOUND})
+-set (HAVE_SNDIO_H ${SNDIO_FOUND})
++set (HAVE_ALSA_ASOUNDLIB_H 0)
++set (HAVE_SNDIO_H 0)
+ 
+ set (ENABLE_EXPERIMENTAL_CODE ${ENABLE_EXPERIMENTAL})
+ set (HAVE_SPEEX ${ENABLE_EXPERIMENTAL})

audio/libsndfile/files/patch-CVE-2017-12562

@@ -1,82 +0,0 @@
-From cf7a8182c2642c50f1cf90dddea9ce96a8bad2e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= <osmanx@problemloesungsmaschine.de>
-Date: Wed, 14 Jun 2017 12:25:40 +0200
-Subject: [PATCH] src/common.c: Fix heap buffer overflows when writing strings
- in binheader
-
-Fixes the following problems:
- 1. Case 's' only enlarges the buffer by 16 bytes instead of size bytes.
- 2. psf_binheader_writef() enlarges the header buffer (if needed) prior to the
-    big switch statement by an amount (16 bytes) which is enough for all cases
-    where only a single value gets added. Cases 's', 'S', 'p' however
-    additionally write an arbitrary length block of data and again enlarge the
-    buffer to the required amount. However, the required space calculation does
-    not take into account the size of the length field which gets output before
-    the data.
- 3. Buffer size requirement calculation in case 'S' does not account for the
-    padding byte ("size += (size & 1) ;" happens after the calculation which
-    uses "size").
- 4. Case 'S' can overrun the header buffer by 1 byte when no padding is
-    involved
-    ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;" while
-    the buffer is only guaranteed to have "size" space available).
- 5. "psf->header.ptr [psf->header.indx] = 0 ;" in case 'S' always writes 1 byte
-    beyond the space which is guaranteed to be allocated in the header buffer.
- 6. Case 's' can overrun the provided source string by 1 byte if padding is
-    involved ("memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;"
-    where "size" is "strlen (strptr) + 1" (which includes the 0 terminator,
-    plus optionally another 1 which is padding and not guaranteed to be
-    readable via the source string pointer).
-
-Closes: https://github.com/erikd/libsndfile/issues/292
---- src/common.c.orig	2017-04-02 06:33:16 UTC
-+++ src/common.c
-@@ -681,16 +681,16 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					/* Write a C string (guaranteed to have a zero terminator). */
- 					strptr = va_arg (argptr, char *) ;
- 					size = strlen (strptr) + 1 ;
--					size += (size & 1) ;
- 
--					if (psf->header.indx + (sf_count_t) size >= psf->header.len && psf_bump_header_allocation (psf, 16))
-+					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
- 						return count ;
- 
- 					if (psf->rwf_endian == SF_ENDIAN_BIG)
--						header_put_be_int (psf, size) ;
-+						header_put_be_int (psf, size + (size & 1)) ;
- 					else
--						header_put_le_int (psf, size) ;
-+						header_put_le_int (psf, size + (size & 1)) ;
- 					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size) ;
-+					size += (size & 1) ;
- 					psf->header.indx += size ;
- 					psf->header.ptr [psf->header.indx - 1] = 0 ;
- 					count += 4 + size ;
-@@ -703,16 +703,15 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					*/
- 					strptr = va_arg (argptr, char *) ;
- 					size = strlen (strptr) ;
--					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
-+					if (psf->header.indx + 4 + (sf_count_t) size + (sf_count_t) (size & 1) > psf->header.len && psf_bump_header_allocation (psf, 4 + size + (size & 1)))
- 						return count ;
- 					if (psf->rwf_endian == SF_ENDIAN_BIG)
- 						header_put_be_int (psf, size) ;
- 					else
- 						header_put_le_int (psf, size) ;
--					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + 1) ;
-+					memcpy (&(psf->header.ptr [psf->header.indx]), strptr, size + (size & 1)) ;
- 					size += (size & 1) ;
- 					psf->header.indx += size ;
--					psf->header.ptr [psf->header.indx] = 0 ;
- 					count += 4 + size ;
- 					break ;
- 
-@@ -724,7 +723,7 @@ psf_binheader_writef (SF_PRIVATE *psf, const char *format, ...)
- 					size = (size & 1) ? size : size + 1 ;
- 					size = (size > 254) ? 254 : size ;
- 
--					if (psf->header.indx + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, size))
-+					if (psf->header.indx + 1 + (sf_count_t) size > psf->header.len && psf_bump_header_allocation (psf, 1 + size))
- 						return count ;
- 
- 					header_put_byte (psf, size) ;

audio/libsndfile/files/patch-CVE-2017-14634

@@ -1,29 +0,0 @@
-From 85c877d5072866aadbe8ed0c3e0590fbb5e16788 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Thu, 28 Sep 2017 12:15:04 +0200
-Subject: [PATCH] double64_init: Check psf->sf.channels against upper bound
-
-This prevents division by zero later in the code.
-
-While the trivial case to catch this (i.e. sf.channels < 1) has already
-been covered, a crafted file may report a number of channels that is
-so high (i.e. > INT_MAX/sizeof(double)) that it "somehow" gets
-miscalculated to zero (if this makes sense) in the determination of the
-blockwidth. Since we only support a limited number of channels anyway,
-make sure to check here as well.
-
-CVE-2017-14634
-
-Closes: https://github.com/erikd/libsndfile/issues/318
-Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
---- src/double64.c.orig	2016-04-01 21:08:53 UTC
-+++ src/double64.c
-@@ -91,7 +91,7 @@ int
- double64_init	(SF_PRIVATE *psf)
- {	static int double64_caps ;
- 
--	if (psf->sf.channels < 1)
-+	if (psf->sf.channels < 1 || psf->sf.channels > SF_MAX_CHANNELS)
- 	{	psf_log_printf (psf, "double64_init : internal error : channels = %d\n", psf->sf.channels) ;
- 		return SFE_INTERNAL ;
- 		} ;

audio/libsndfile/files/patch-CVE-2017-17456_2017-17457_2018-19661_2018-19662

@@ -1,90 +0,0 @@
-From: Hugo Lefeuvre <hle@owl.eu.com>
-Date: Mon, 24 Dec 2018 06:43:48 +0100
-Subject: a/ulaw: fix multiple buffer overflows (#432)
-
-i2ulaw_array() and i2alaw_array() fail to handle ptr [count] = INT_MIN
-properly, leading to buffer underflow. INT_MIN is a special value
-since - INT_MIN cannot be represented as int.
-
-In this case round - INT_MIN to INT_MAX and proceed as usual.
-
-f2ulaw_array() and f2alaw_array() fail to handle ptr [count] = NaN
-properly, leading to null pointer dereference.
-
-In this case, arbitrarily set the buffer value to 0.
-
-This commit fixes #429 (CVE-2018-19661 and CVE-2018-19662) and
-fixes #344 (CVE-2017-17456 and CVE-2017-17457).
----
- src/alaw.c | 9 +++++++--
- src/ulaw.c | 9 +++++++--
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/alaw.c b/src/alaw.c
-index 063fd1a..4220224 100644
---- src/alaw.c
-+++ src/alaw.c
-@@ -19,6 +19,7 @@
- #include	"sfconfig.h"
- 
- #include	<math.h>
-+#include	<limits.h>
- 
- #include	"sndfile.h"
- #include	"common.h"
-@@ -326,7 +327,9 @@ s2alaw_array (const short *ptr, int count, unsigned char *buffer)
- static inline void
- i2alaw_array (const int *ptr, int count, unsigned char *buffer)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (ptr [count] == INT_MIN)
-+			buffer [count] = alaw_encode [INT_MAX >> (16 + 4)] ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = alaw_encode [ptr [count] >> (16 + 4)] ;
- 		else
- 			buffer [count] = 0x7F & alaw_encode [- ptr [count] >> (16 + 4)] ;
-@@ -346,7 +349,9 @@ f2alaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
- static inline void
- d2alaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (!isfinite (ptr [count]))
-+			buffer [count] = 0 ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = alaw_encode [lrint (normfact * ptr [count])] ;
- 		else
- 			buffer [count] = 0x7F & alaw_encode [- lrint (normfact * ptr [count])] ;
-diff --git a/src/ulaw.c b/src/ulaw.c
-index e50b4cb..b6070ad 100644
---- src/ulaw.c
-+++ src/ulaw.c
-@@ -19,6 +19,7 @@
- #include	"sfconfig.h"
- 
- #include	<math.h>
-+#include	<limits.h>
- 
- #include	"sndfile.h"
- #include	"common.h"
-@@ -827,7 +828,9 @@ s2ulaw_array (const short *ptr, int count, unsigned char *buffer)
- static inline void
- i2ulaw_array (const int *ptr, int count, unsigned char *buffer)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (ptr [count] == INT_MIN)
-+			buffer [count] = ulaw_encode [INT_MAX >> (16 + 2)] ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = ulaw_encode [ptr [count] >> (16 + 2)] ;
- 		else
- 			buffer [count] = 0x7F & ulaw_encode [-ptr [count] >> (16 + 2)] ;
-@@ -847,7 +850,9 @@ f2ulaw_array (const float *ptr, int count, unsigned char *buffer, float normfact
- static inline void
- d2ulaw_array (const double *ptr, int count, unsigned char *buffer, double normfact)
- {	while (--count >= 0)
--	{	if (ptr [count] >= 0)
-+	{	if (!isfinite (ptr [count]))
-+			buffer [count] = 0 ;
-+		else if (ptr [count] >= 0)
- 			buffer [count] = ulaw_encode [lrint (normfact * ptr [count])] ;
- 		else
- 			buffer [count] = 0x7F & ulaw_encode [- lrint (normfact * ptr [count])] ;

audio/libsndfile/files/patch-CVE-2017-6892

@@ -1,19 +0,0 @@
-From f833c53cb596e9e1792949f762e0b33661822748 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Tue, 23 May 2017 20:15:24 +1000
-Subject: [PATCH] src/aiff.c: Fix a buffer read overflow
-
-Secunia Advisory SA76717.
-
-Found by: Laurent Delosieres, Secunia Research at Flexera Software
---- src/aiff.c.orig	2017-04-01 07:18:02 UTC
-+++ src/aiff.c
-@@ -1905,7 +1905,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword)
- 		psf_binheader_readf (psf, "j", dword - bytesread) ;
- 
- 	if (map_info->channel_map != NULL)
--	{	size_t chanmap_size = psf->sf.channels * sizeof (psf->channel_map [0]) ;
-+	{	size_t chanmap_size = SF_MIN (psf->sf.channels, layout_tag & 0xffff) * sizeof (psf->channel_map [0]) ;
- 
- 		free (psf->channel_map) ;
- 

audio/libsndfile/files/patch-CVE-2017-8361

@@ -1,53 +0,0 @@
-From fd0484aba8e51d16af1e3a880f9b8b857b385eb3 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Wed, 12 Apr 2017 19:45:30 +1000
-Subject: [PATCH] FLAC: Fix a buffer read overrun
-
-Buffer read overrun occurs when reading a FLAC file that switches
-from 2 channels to one channel mid-stream. Only option is to
-abort the read.
-
-Closes: https://github.com/erikd/libsndfile/issues/230
-Addresses: CVE-2017-8361 CVE-2017-8363 CVE-2017-8365
---- src/common.h.orig	2017-04-01 09:40:45 UTC
-+++ src/common.h
-@@ -725,6 +725,7 @@ enum
- 	SFE_FLAC_INIT_DECODER,
- 	SFE_FLAC_LOST_SYNC,
- 	SFE_FLAC_BAD_SAMPLE_RATE,
-+	SFE_FLAC_CHANNEL_COUNT_CHANGED,
- 	SFE_FLAC_UNKOWN_ERROR,
- 
- 	SFE_WVE_NOT_WVE,
---- src/flac.c.orig	2018-03-01 19:51:26 UTC
-+++ src/flac.c
-@@ -434,6 +434,19 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
- 
- 	switch (metadata->type)
- 	{	case FLAC__METADATA_TYPE_STREAMINFO :
-+			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
-+			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
-+									"Nothing to be but to error out.\n" ,
-+									psf->sf.channels, metadata->data.stream_info.channels) ;
-+				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+				return ;
-+				} ;
-+
-+			if (psf->sf.channels > 0 && psf->sf.samplerate != (int) metadata->data.stream_info.sample_rate)
-+			{	psf_log_printf (psf, "Warning: FLAC stream changed sample rates from %d to %d.\n"
-+									"Carrying on as if nothing happened.",
-+									psf->sf.samplerate, metadata->data.stream_info.sample_rate) ;
-+				} ;
- 			psf->sf.channels = metadata->data.stream_info.channels ;
- 			psf->sf.samplerate = metadata->data.stream_info.sample_rate ;
- 			psf->sf.frames = metadata->data.stream_info.total_samples ;
---- src/sndfile.c.orig	2017-04-02 06:33:16 UTC
-+++ src/sndfile.c
-@@ -245,6 +245,7 @@ ErrorStruct SndfileErrors [] =
- 	{	SFE_FLAC_INIT_DECODER	, "Error : problem with initialization of the flac decoder." },
- 	{	SFE_FLAC_LOST_SYNC		, "Error : flac decoder lost sync." },
- 	{	SFE_FLAC_BAD_SAMPLE_RATE, "Error : flac does not support this sample rate." },
-+	{	SFE_FLAC_CHANNEL_COUNT_CHANGED, "Error : flac channel changed mid stream." },
- 	{	SFE_FLAC_UNKOWN_ERROR	, "Error : unknown error in flac decoder." },
- 
- 	{	SFE_WVE_NOT_WVE			, "Error : not a WVE file." },

audio/libsndfile/files/patch-CVE-2017-8362

@@ -1,44 +0,0 @@
-From ef1dbb2df1c0e741486646de40bd638a9c4cd808 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Fri, 14 Apr 2017 15:19:16 +1000
-Subject: [PATCH] src/flac.c: Fix a buffer read overflow
-
-A file (generated by a fuzzer) which increased the number of channels
-from one frame to the next could cause a read beyond the end of the
-buffer provided by libFLAC. Only option is to abort the read.
-
-Closes: https://github.com/erikd/libsndfile/issues/231
---- src/flac.c.orig 2017-04-01 09:40:45 UTC
-+++ src/flac.c
-@@ -169,6 +169,14 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 	const int32_t* const *buffer = pflac->wbuffer ;
- 	unsigned i = 0, j, offset, channels, len ;
- 
-+	if (psf->sf.channels != (int) frame->header.channels)
-+	{	psf_log_printf (psf, "Error: FLAC frame changed from %d to %d channels\n"
-+									"Nothing to do but to error out.\n" ,
-+									psf->sf.channels, frame->header.channels) ;
-+		psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
-+		return 0 ;
-+		} ;
-+
- 	/*
- 	**	frame->header.blocksize is variable and we're using a constant blocksize
- 	**	of FLAC__MAX_BLOCK_SIZE.
-@@ -202,7 +210,6 @@ flac_buffer_copy (SF_PRIVATE *psf)
- 		return 0 ;
- 		} ;
- 
--
- 	len = SF_MIN (pflac->len, frame->header.blocksize) ;
- 
- 	if (pflac->remain % channels != 0)
-@@ -436,7 +443,7 @@ sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const FLAC_
- 	{	case FLAC__METADATA_TYPE_STREAMINFO :
- 			if (psf->sf.channels > 0 && psf->sf.channels != (int) metadata->data.stream_info.channels)
- 			{	psf_log_printf (psf, "Error: FLAC stream changed from %d to %d channels\n"
--									"Nothing to be but to error out.\n" ,
-+									"Nothing to do but to error out.\n" ,
- 									psf->sf.channels, metadata->data.stream_info.channels) ;
- 				psf->error = SFE_FLAC_CHANNEL_COUNT_CHANGED ;
- 				return ;

audio/libsndfile/files/patch-CVE-2017-8363

@@ -1,22 +0,0 @@
-From cd7da8dbf6ee4310d21d9e44b385d6797160d9e8 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Wed, 12 Apr 2017 20:19:34 +1000
-Subject: [PATCH] src/flac.c: Fix another memory leak
-
-When the FLAC decoder was passed a malformed file, the associated
-`FLAC__StreamDecoder` object was not getting released.
-
-Closes: https://github.com/erikd/libsndfile/issues/233
---- src/flac.c.orig 2018-03-01 09:40:45 UTC
-+++ src/flac.c
-@@ -841,7 +841,9 @@ flac_read_header (SF_PRIVATE *psf)
- 
- 	psf_log_printf (psf, "End\n") ;
- 
--	if (psf->error == 0)
-+	if (psf->error != 0)
-+		FLAC__stream_decoder_delete (pflac->fsd) ;
-+	else
- 	{	FLAC__uint64 position ;
- 
- 		FLAC__stream_decoder_get_decode_position (pflac->fsd, &position) ;

audio/libsndfile/files/patch-CVE-2018-19758

@@ -1,31 +0,0 @@
-From: Erik de Castro Lopo <erikd@mega-nerd.com>
-Date: Tue, 1 Jan 2019 20:11:46 +1100
-Subject: src/wav.c: Fix heap read overflow
-
-This is CVE-2018-19758.
-
-Closes: https://github.com/erikd/libsndfile/issues/435
----
- src/wav.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/wav.c b/src/wav.c
-index 4b943dc..59015a1 100644
---- src/wav.c
-+++ src/wav.c
-@@ -1,5 +1,5 @@
- /*
--** Copyright (C) 1999-2016 Erik de Castro Lopo <erikd@mega-nerd.com>
-+** Copyright (C) 1999-2019 Erik de Castro Lopo <erikd@mega-nerd.com>
- ** Copyright (C) 2004-2005 David Viens <davidv@plogue.com>
- **
- ** This program is free software; you can redistribute it and/or modify
-@@ -1094,6 +1094,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
- 		psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */
- 		psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ;
- 
-+		/* Loop count is signed 16 bit number so we limit it range to something sensible. */
-+		psf->instrument->loop_count &= 0x7fff ;
- 		for (tmp = 0 ; tmp < psf->instrument->loop_count ; tmp++)
- 		{	int type ;
- 

audio/libsndfile/files/patch-Check-MAX_CHANNELS-in-sndfile-deinterleave

@@ -1,30 +0,0 @@
-From: "Brett T. Warden" <brett.t.warden@intel.com>
-Date: Tue, 28 Aug 2018 12:01:17 -0700
-Subject: Check MAX_CHANNELS in sndfile-deinterleave
-
-Allocated buffer has space for only 16 channels. Verify that input file
-meets this limit.
-
-Fixes #397
----
- programs/sndfile-deinterleave.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/programs/sndfile-deinterleave.c b/programs/sndfile-deinterleave.c
-index e27593e..cb497e1 100644
---- programs/sndfile-deinterleave.c
-+++ programs/sndfile-deinterleave.c
-@@ -89,6 +89,13 @@ main (int argc, char **argv)
- 		exit (1) ;
- 		} ;
- 
-+	if (sfinfo.channels > MAX_CHANNELS)
-+	{	printf ("\nError : Input file '%s' has too many (%d) channels. Limit is %d.\n",
-+			argv [1], sfinfo.channels, MAX_CHANNELS) ;
-+		exit (1) ;
-+		} ;
-+
-+
- 	state.channels = sfinfo.channels ;
- 	sfinfo.channels = 1 ;
- 

audio/libsndfile/files/patch-cmake_SndFileChecks.cmake

@@ -0,0 +1,14 @@
+--- cmake/SndFileChecks.cmake.orig	2020-06-20 08:18:11 UTC
++++ cmake/SndFileChecks.cmake
+@@ -22,11 +22,6 @@ else ()
+ endif ()
+ set (SF_COUNT_MAX 0x7fffffffffffffffll)
+ 
+-if (NOT WIN32)
+-	find_package (ALSA)
+-	find_package (Sndio)
+-endif ()
+-
+ if (VCPKG_TOOLCHAIN AND (NOT CMAKE_VERSION VERSION_LESS 3.15))
+ 	set (CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+ endif ()

audio/libsndfile/files/patch-rf64_arm

@@ -1,49 +0,0 @@
-From: Erik de Castro Lopez <erikd@mega-nerd.com>
-Date: Tue, 20 Jun 2017 00:00:00 +0200
-Subject: fix RF64 on armel/armhf archs
-
-Origin: upstream
-Applied-Upstream: 9d470ee5577d3ccedb1c28c7e0a7295ba17feaf5
-Last-Update: 2017-06-20
----
- src/rf64.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/rf64.c b/src/rf64.c
-index c373bb0..60a3309 100644
---- src/rf64.c
-+++ src/rf64.c
-@@ -339,6 +339,12 @@ rf64_read_header (SF_PRIVATE *psf, int *blockalign, int *framesperblock)
- 					} ;
- 				break ;
- 
-+			case JUNK_MARKER :
-+			case PAD_MARKER :
-+				psf_log_printf (psf, "%M : %d\n", marker, chunk_size) ;
-+				psf_binheader_readf (psf, "j", chunk_size) ;
-+				break ;
-+
- 			default :
- 					if (chunk_size >= 0xffff0000)
- 					{	psf_log_printf (psf, "*** Unknown chunk marker (%X) at position %D with length %u. Exiting parser.\n", marker, psf_ftell (psf) - 8, chunk_size) ;
-@@ -659,7 +665,7 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
- 
- 	if (wpriv->rf64_downgrade && psf->filelength < RIFF_DOWNGRADE_BYTES)
- 	{	psf_binheader_writef (psf, "etm8m", RIFF_MARKER, (psf->filelength < 8) ? 8 : psf->filelength - 8, WAVE_MARKER) ;
--		psf_binheader_writef (psf, "m4884", JUNK_MARKER, 20, 0, 0, 0, 0) ;
-+		psf_binheader_writef (psf, "m4z", JUNK_MARKER, 24, 24) ;
- 		add_fact_chunk = 1 ;
- 		}
- 	else
-@@ -735,9 +741,10 @@ rf64_write_header (SF_PRIVATE *psf, int calc_length)
- 
- #endif
- 
-+	/* Padding may be needed if string data sizes change. */
- 	pad_size = psf->dataoffset - 16 - psf->header.indx ;
- 	if (pad_size >= 0)
--		psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ;
-+		psf_binheader_writef (psf, "m4z", PAD_MARKER, (unsigned int) pad_size, make_size_t (pad_size)) ;
- 
- 	if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES))
- 		psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ;

audio/libsndfile/files/patch-typos

@@ -1,67 +0,0 @@
-From: IOhannes m zmoelnig <umlaeute@debian.org>
-Date: Wed, 5 Oct 2016 00:00:00 +0200
-Subject: fixed spelling errors
-
-Forwarded: yes
-Last-Update: 2016-10-05
-
-discovered by lintian
----
- doc/bugs.html              | 2 +-
- programs/sndfile-convert.c | 2 +-
- src/ogg.c                  | 2 +-
- src/wavlike.c              | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/bugs.html b/doc/bugs.html
-index 3a441fe..addedb8 100644
---- doc/bugs.html
-+++ doc/bugs.html
-@@ -31,7 +31,7 @@
- 	<UL>
- 	<LI>	Compilation problems on new platforms.
- 	<LI>	Errors being detected during the `make check' process.
--	<LI>	Segmentation faults occuring inside libsndfile.
-+	<LI>	Segmentation faults occurring inside libsndfile.
- 	<LI>	libsndfile hanging when opening a file.
- 	<LI>	Supported sound file types being incorrectly read or written.
- 	<LI>	Omissions, errors or spelling mistakes in the documentation.
-diff --git a/programs/sndfile-convert.c b/programs/sndfile-convert.c
-index dff7f79..896838f 100644
---- programs/sndfile-convert.c
-+++ programs/sndfile-convert.c
-@@ -317,7 +317,7 @@ main (int argc, char * argv [])
- 	if ((sfinfo.format & SF_FORMAT_SUBMASK) == SF_FORMAT_GSM610 && sfinfo.samplerate != 8000)
- 	{	printf (
- 			"WARNING: GSM 6.10 data format only supports 8kHz sample rate. The converted\n"
--			"ouput file will contain the input data converted to the GSM 6.10 data format\n"
-+			"output file will contain the input data converted to the GSM 6.10 data format\n"
- 			"but not re-sampled.\n"
- 			) ;
- 		} ;
-diff --git a/src/ogg.c b/src/ogg.c
-index 0856f77..e01ebe1 100644
---- src/ogg.c
-+++ src/ogg.c
-@@ -193,7 +193,7 @@ ogg_stream_classify (SF_PRIVATE *psf, OGG_PRIVATE* odata)
- 			break ;
- 		} ;
- 
--	psf_log_printf (psf, "This Ogg bitstream contains some uknown data type.\n") ;
-+	psf_log_printf (psf, "This Ogg bitstream contains some unknown data type.\n") ;
- 	return SFE_UNIMPLEMENTED ;
- } /* ogg_stream_classify */
- 
-diff --git a/src/wavlike.c b/src/wavlike.c
-index 86ebf01..c053da3 100644
---- src/wavlike.c
-+++ src/wavlike.c
-@@ -161,7 +161,7 @@ wavlike_read_fmt_chunk (SF_PRIVATE *psf, int fmtsize)
- 	{	psf_log_printf (psf, "  Bit Width     : 24\n") ;
- 
- 		psf_log_printf (psf, "\n"
--			"  Ambiguous information in 'fmt ' chunk. Possibile file types:\n"
-+			"  Ambiguous information in 'fmt ' chunk. Possible file types:\n"
- 			"    0) Invalid IEEE float file generated by Syntrillium's Cooledit!\n"
- 			"    1) File generated by ALSA's arecord containing 24 bit samples in 32 bit containers.\n"
- 			"    2) 24 bit file with incorrect Block Align value.\n"

audio/libsndfile/pkg-plist

@@ -10,26 +10,24 @@ bin/sndfile-play
 bin/sndfile-salvage
 include/sndfile.h
 include/sndfile.hh
-lib/libsndfile.a
-lib/libsndfile.so
-lib/libsndfile.so.1
-lib/libsndfile.so.1.0.28
+lib/cmake/SndFile/SndFileConfig.cmake
+lib/cmake/SndFile/SndFileConfigVersion.cmake
+lib/cmake/SndFile/SndFileTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SndFile/SndFileTargets.cmake
+%%STATIC%%lib/libsndfile.a
+%%NO_STATIC%%lib/libsndfile.so
+%%NO_STATIC%%lib/libsndfile.so.1
+%%NO_STATIC%%lib/libsndfile.so.1.0.29
 libdata/pkgconfig/sndfile.pc
 man/man1/sndfile-cmp.1.gz
 man/man1/sndfile-concat.1.gz
 man/man1/sndfile-convert.1.gz
-man/man1/sndfile-deinterleave.1.gz
 man/man1/sndfile-info.1.gz
 man/man1/sndfile-interleave.1.gz
 man/man1/sndfile-metadata-get.1.gz
-man/man1/sndfile-metadata-set.1.gz
 man/man1/sndfile-play.1.gz
 man/man1/sndfile-salvage.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/api.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
 %%PORTDOCS%%%%DOCSDIR%%/command.html
@@ -40,6 +38,7 @@ man/man1/sndfile-salvage.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/lists.html
 %%PORTDOCS%%%%DOCSDIR%%/new_file_type.HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/octave.html
+%%PORTDOCS%%%%DOCSDIR%%/print.css
 %%PORTDOCS%%%%DOCSDIR%%/sndfile_info.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/win32.html

audio/plasma5-plasma-pa/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1594147282
-SHA256 (KDE/plasma/5.19.3/plasma-pa-5.19.3.tar.xz) = 8cf420b64f2deb11c869367bc5362730ddc5bc3bffc52e47d511b0d86349ef2b
-SIZE (KDE/plasma/5.19.3/plasma-pa-5.19.3.tar.xz) = 108064
+TIMESTAMP = 1595947311
+SHA256 (KDE/plasma/5.19.4/plasma-pa-5.19.4.tar.xz) = a9ec0a3bc36de5d41e37b53078b8f7c12e5c075aca9e5c1a64b11c063617c831
+SIZE (KDE/plasma/5.19.4/plasma-pa-5.19.4.tar.xz) = 108052

audio/sfizz/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sfizz
-DISTVERSION=	0.3.2
+DISTVERSION=	0.4.0
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -18,8 +18,8 @@ GH_ACCOUNT=	sfztools
 GH_TUPLE=	\
 		abseil:abseil-cpp:df3ea785d8c30a9503321a3d35ee7d35808f190d:abseil_abseil_cpp/external/abseil-cpp \
 		steinbergmedia:vst3_base:4f6a7184f20f40a7c940a6717e6e0d8b35eeea63:steinbergmedia_vst3_base/vst/external/VST_SDK/VST3_SDK/base \
-		steinbergmedia:vst3_pluginterfaces:227ea1d8f749c6a66dd591582061d58682b4aa9f:steinbergmedia_vst3_pluginterfaces/vst/external/VST_SDK/VST3_SDK/pluginterfaces \
-		steinbergmedia:vst3_public_sdk:c04e9bd690f50893742e2a082abab47af2c3efc8:steinbergmedia_vst3_public_sdk/vst/external/VST_SDK/VST3_SDK/public.sdk \
+		sfztools:vst3_pluginterfaces:8c07a58d84c544a73e1ccad2efae200505796773:sfztools_vst3_pluginterfaces/vst/external/VST_SDK/VST3_SDK/pluginterfaces \
+		sfztools:vst3_public_sdk:ff836e8c02bd28c902f5e3e75353a86f65008a77:sfztools_vst3_public_sdk/vst/external/VST_SDK/VST3_SDK/public.sdk \
 		sfztools:vstgui:c6a7f607c21a7353e922a6d45e54d6c56d5a6745:sfztools_vstgui/vst/external/VST_SDK/VST3_SDK/vstgui4
 USE_LDCONFIG=	yes
 

audio/sfizz/distinfo

@@ -1,13 +1,13 @@
-TIMESTAMP = 1587344882
-SHA256 (sfztools-sfizz-0.3.2_GH0.tar.gz) = 1b1d0ff4ef998597e384433f05c10a859767178501f1e7c82219ccb0973b3c0c
-SIZE (sfztools-sfizz-0.3.2_GH0.tar.gz) = 34417809
+TIMESTAMP = 1595907456
+SHA256 (sfztools-sfizz-0.4.0_GH0.tar.gz) = d73003743c4ca88eab3ee6175e366f1f034e40563199dccbf11ca7aadda56535
+SIZE (sfztools-sfizz-0.4.0_GH0.tar.gz) = 13977077
 SHA256 (abseil-abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_GH0.tar.gz) = f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a
 SIZE (abseil-abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_GH0.tar.gz) = 1679879
 SHA256 (steinbergmedia-vst3_base-4f6a7184f20f40a7c940a6717e6e0d8b35eeea63_GH0.tar.gz) = e3fc07094850115b26c84301bc3a49e880d42b715ca2900b7e2642105ed98497
 SIZE (steinbergmedia-vst3_base-4f6a7184f20f40a7c940a6717e6e0d8b35eeea63_GH0.tar.gz) = 61890
-SHA256 (steinbergmedia-vst3_pluginterfaces-227ea1d8f749c6a66dd591582061d58682b4aa9f_GH0.tar.gz) = 179e780c3a4f604210ec85349e659b340919e3c8cec17b9f310f97231029b0cf
-SIZE (steinbergmedia-vst3_pluginterfaces-227ea1d8f749c6a66dd591582061d58682b4aa9f_GH0.tar.gz) = 88523
-SHA256 (steinbergmedia-vst3_public_sdk-c04e9bd690f50893742e2a082abab47af2c3efc8_GH0.tar.gz) = bb87a131afa6f2f3b93bef29c8677569b072c72bef9a6603ab5f0e3f815f1089
-SIZE (steinbergmedia-vst3_public_sdk-c04e9bd690f50893742e2a082abab47af2c3efc8_GH0.tar.gz) = 5884665
+SHA256 (sfztools-vst3_pluginterfaces-8c07a58d84c544a73e1ccad2efae200505796773_GH0.tar.gz) = 02e5c4876a77e8f9b2bc9d4fc6be7579f8187270750bea462da4a31edf62f206
+SIZE (sfztools-vst3_pluginterfaces-8c07a58d84c544a73e1ccad2efae200505796773_GH0.tar.gz) = 88523
+SHA256 (sfztools-vst3_public_sdk-ff836e8c02bd28c902f5e3e75353a86f65008a77_GH0.tar.gz) = 42463a2aa9bac0b45ce7b4df6c19dd1b57ba246f0f77528b35ab41b846c1550c
+SIZE (sfztools-vst3_public_sdk-ff836e8c02bd28c902f5e3e75353a86f65008a77_GH0.tar.gz) = 5884643
 SHA256 (sfztools-vstgui-c6a7f607c21a7353e922a6d45e54d6c56d5a6745_GH0.tar.gz) = d260594c9fd3aad8164d08ed0688a12fa6ef519da6af3c5e139f4e973de0093d
 SIZE (sfztools-vstgui-c6a7f607c21a7353e922a6d45e54d6c56d5a6745_GH0.tar.gz) = 3508421

audio/sfizz/files/patch-cmake_SfizzConfig.cmake

@@ -1,11 +1,11 @@
---- cmake/SfizzConfig.cmake.orig	2020-04-20 01:18:25 UTC
+--- cmake/SfizzConfig.cmake.orig	2020-07-23 22:01:34 UTC
 +++ cmake/SfizzConfig.cmake
-@@ -67,7 +67,7 @@ if (USE_LIBCPP)
- add_compile_options(-stdlib=libc++)
- # Presumably need the above for linking too, maybe other options missing as well
- add_link_options(-stdlib=libc++)   # New command on CMake master, not in 3.12 release
--add_link_options(-lc++abi)   # New command on CMake master, not in 3.12 release
-+#add_link_options(-lc++abi)   # New command on CMake master, not in 3.12 release
- endif()
+@@ -69,7 +69,7 @@ if (USE_LIBCPP)
+     add_compile_options(-stdlib=libc++)
+     # Presumably need the above for linking too, maybe other options missing as well
+     add_link_options(-stdlib=libc++)   # New command on CMake master, not in 3.12 release
+-    add_link_options(-lc++abi)   # New command on CMake master, not in 3.12 release
++    #add_link_options(-lc++abi)   # New command on CMake master, not in 3.12 release
  endif()
  
+ add_library(sfizz-pugixml STATIC "src/external/pugixml/src/pugixml.cpp")

audio/sfizz/pkg-plist

@@ -1,9 +1,12 @@
 %%JACK%%bin/sfizz_jack
+bin/sfizz_render
 include/sfizz.h
 include/sfizz.hpp
 lib/libsfizz.a
 lib/libsfizz.so
 lib/libsfizz.so.0
+%%LV2%%lib/lv2/sfizz.lv2/Resources/DefaultInstrument.sfz
+%%LV2%%lib/lv2/sfizz.lv2/Resources/DefaultScale.scl
 %%LV2%%lib/lv2/sfizz.lv2/LICENSE.md
 %%LV2%%lib/lv2/sfizz.lv2/manifest.ttl
 %%LV2%%lib/lv2/sfizz.lv2/sfizz.so

audio/surge-synthesizer-lv2/Makefile

@@ -2,12 +2,15 @@
 
 PORTNAME=	surge-synthesizer
 DISTVERSIONPREFIX=	release_
-DISTVERSION=	1.6.6-58
-DISTVERSIONSUFFIX=	-g3dbd1be
-PORTREVISION=	1
+DISTVERSION=	1.7.0
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	c8271d11c25493c2addc82c963bd5e837d3b290c.patch:-p1 \
+		9b8b0663d1abf91e523744f5fa2e9528a950d0df.patch:-p1 \
+		b9525a7c62a57686ea592fa5f8038d460edb255e.patch:-p1
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Surge Synthesizer LV2 and VST plug-in
 
@@ -16,6 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		${LOCALBASE}/include/nanosvg.h:graphics/nanosvg \
+		${LOCALBASE}/include/simde/simde-common.h:devel/simde \
 		xcb-util-keysyms>0:x11/xcb-util-keysyms
 LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon \
 		libxcb-cursor.so:x11/xcb-util-cursor \
@@ -27,14 +31,19 @@ USE_GNOME=	cairo
 USE_XORG=	xcb
 USE_GITHUB=	yes
 GH_PROJECT=	surge
+
 GH_TUPLE=	\
 		surge-synthesizer:vst3sdk:10287bc37bbb34324b8097369e2ec4eb73a51d65:surge_synthesizer_vst3sdk/vst3sdk \
-		surge-synthesizer:vstgui:313faee9db026b1d6254c91d8650e7da58e005a5:surge_synthesizer_vstgui/vstgui.surge \
+		surge-synthesizer:vstgui:980e24b24056d41b87458849828e8952bb39dec2:surge_synthesizer_vstgui/vstgui.surge \
 		craigsapp:midifile:41e450bcd5ba1c0419f69664944434b0abf9d7ba:craigsapp_midifile/libs/midifile \
+		surge-synthesizer:tuning-library:45be1b4da9a6c6d762a1e6ecc2d0ff548e0bd51c:surge_synthesizer_tuning_library/libs/tuning-library \
+		nemequ:munit:fbbdf1467eb0d04a6ee465def2e529e4c87f2118:nemequ_munit/libs/simde/test/munit \
 		steinbergmedia:vst3_base:37dbdb6ff7af29e518877f57f14050594164a0d6:steinbergmedia_vst3_base/vst3sdk/base \
 		steinbergmedia:vst3_cmake:f7ae22417019aa355de6f7ec46ecf890d3c2a76f:steinbergmedia_vst3_cmake/vst3sdk/cmake \
 		steinbergmedia:vst3_pluginterfaces:6c6bb30d18c3d5a553e55aa74afc5d146571be0a:steinbergmedia_vst3_pluginterfaces/vst3sdk/pluginterfaces \
-		steinbergmedia:vst3_public_sdk:ced72c00d5c1365a4cca16cdbfb871be2496848b:steinbergmedia_vst3_public_sdk/vst3sdk/public.sdk
+		steinbergmedia:vst3_public_sdk:ced72c00d5c1365a4cca16cdbfb871be2496848b:steinbergmedia_vst3_public_sdk/vst3sdk/public.sdk \
+
+LDFLAGS+=	-lexecinfo
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
@@ -46,11 +55,11 @@ post-patch:
 do-install:
 	# LV2 plugin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/lv2
-	cd ${WRKSRC}/products && ${COPYTREE_SHARE} Surge.lv2 ${STAGEDIR}${PREFIX}/lib/lv2
+	cd ${BUILD_WRKSRC}/surge_products && ${COPYTREE_SHARE} Surge.lv2 ${STAGEDIR}${PREFIX}/lib/lv2
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/Surge.lv2/Surge.so
 	# VST plugin
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vst
-	${INSTALL_LIB} ${WRKSRC}/products/Surge.vst3/Contents/*/Surge.so ${STAGEDIR}${PREFIX}/lib/vst
+	${INSTALL_LIB} ${BUILD_WRKSRC}/surge_products/Surge.vst3/Contents/*/Surge.so ${STAGEDIR}${PREFIX}/lib/vst
 	# data
 	cd ${WRKSRC}/resources/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 

audio/surge-synthesizer-lv2/distinfo

@@ -1,12 +1,16 @@
-TIMESTAMP = 1586972142
-SHA256 (surge-synthesizer-surge-release_1.6.6-58-g3dbd1be_GH0.tar.gz) = bcd54076adac3ae1d3d13e9b068b1cece0b262b0c45323fed52b69da2ee53cd9
-SIZE (surge-synthesizer-surge-release_1.6.6-58-g3dbd1be_GH0.tar.gz) = 79161919
+TIMESTAMP = 1596058225
+SHA256 (surge-synthesizer-surge-release_1.7.0_GH0.tar.gz) = c90dac0f7c8c0ac80dd5607f5df6dda4396dd9355aaea49f23c77d6c48e15f6b
+SIZE (surge-synthesizer-surge-release_1.7.0_GH0.tar.gz) = 82255913
 SHA256 (surge-synthesizer-vst3sdk-10287bc37bbb34324b8097369e2ec4eb73a51d65_GH0.tar.gz) = b1eb4d7a5fc714ebb058c77bf7250254ee310a6ffd2b77ef702a12ab4bf9ec10
 SIZE (surge-synthesizer-vst3sdk-10287bc37bbb34324b8097369e2ec4eb73a51d65_GH0.tar.gz) = 266390
-SHA256 (surge-synthesizer-vstgui-313faee9db026b1d6254c91d8650e7da58e005a5_GH0.tar.gz) = 797051fe2e28b096c9a890f10eca44440eae4da58b83227595db5bc871c1e57d
-SIZE (surge-synthesizer-vstgui-313faee9db026b1d6254c91d8650e7da58e005a5_GH0.tar.gz) = 1914445
+SHA256 (surge-synthesizer-vstgui-980e24b24056d41b87458849828e8952bb39dec2_GH0.tar.gz) = 06d184fb61594fee775720e4fb480ae30f40c5d77f228d9acb43715a5f877df0
+SIZE (surge-synthesizer-vstgui-980e24b24056d41b87458849828e8952bb39dec2_GH0.tar.gz) = 1915681
 SHA256 (craigsapp-midifile-41e450bcd5ba1c0419f69664944434b0abf9d7ba_GH0.tar.gz) = 6723c1be730dd73ba1c2903e59a044d26b702c07bec6f567d86f1ee77ab8607e
 SIZE (craigsapp-midifile-41e450bcd5ba1c0419f69664944434b0abf9d7ba_GH0.tar.gz) = 147607
+SHA256 (surge-synthesizer-tuning-library-45be1b4da9a6c6d762a1e6ecc2d0ff548e0bd51c_GH0.tar.gz) = aa82457abe042422c4db52b184d225705895d1cbda3853acdbf12af2feeaf81b
+SIZE (surge-synthesizer-tuning-library-45be1b4da9a6c6d762a1e6ecc2d0ff548e0bd51c_GH0.tar.gz) = 137595
+SHA256 (nemequ-munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118_GH0.tar.gz) = d0c8bf80b9804d4df5301bd428702352fe7e14f84f22027c3a2c084a0d9f69a7
+SIZE (nemequ-munit-fbbdf1467eb0d04a6ee465def2e529e4c87f2118_GH0.tar.gz) = 27724
 SHA256 (steinbergmedia-vst3_base-37dbdb6ff7af29e518877f57f14050594164a0d6_GH0.tar.gz) = 1826460d36c2c6a461d29b1b8db9a142c5a621038d15e24812c46343a26dee7a
 SIZE (steinbergmedia-vst3_base-37dbdb6ff7af29e518877f57f14050594164a0d6_GH0.tar.gz) = 61067
 SHA256 (steinbergmedia-vst3_cmake-f7ae22417019aa355de6f7ec46ecf890d3c2a76f_GH0.tar.gz) = bdfba137d724c69a4ee0852a82a94008feca0d4b1e157ce8559321cdebdb0e86
@@ -15,3 +19,9 @@ SHA256 (steinbergmedia-vst3_pluginterfaces-6c6bb30d18c3d5a553e55aa74afc5d146571b
 SIZE (steinbergmedia-vst3_pluginterfaces-6c6bb30d18c3d5a553e55aa74afc5d146571be0a_GH0.tar.gz) = 84830
 SHA256 (steinbergmedia-vst3_public_sdk-ced72c00d5c1365a4cca16cdbfb871be2496848b_GH0.tar.gz) = 38f589ce1a430cc3d93671e28337968b6d8998eda83216943b5546136edd3e47
 SIZE (steinbergmedia-vst3_public_sdk-ced72c00d5c1365a4cca16cdbfb871be2496848b_GH0.tar.gz) = 5861222
+SHA256 (c8271d11c25493c2addc82c963bd5e837d3b290c.patch) = 3227c5f7ac5be2ad04b9475e5c80f242a7d32430fd47a8069a54e085d9016e0f
+SIZE (c8271d11c25493c2addc82c963bd5e837d3b290c.patch) = 1506
+SHA256 (9b8b0663d1abf91e523744f5fa2e9528a950d0df.patch) = 0c86e88250f42668429fba2d5dedf046298ed5fe25d9a9b1547998b38d26b8c9
+SIZE (9b8b0663d1abf91e523744f5fa2e9528a950d0df.patch) = 2856
+SHA256 (b9525a7c62a57686ea592fa5f8038d460edb255e.patch) = 950aca1941b2e214eb173d1787e9117706ed8613c6e3cb35873d4c808a032735
+SIZE (b9525a7c62a57686ea592fa5f8038d460edb255e.patch) = 13136

audio/surge-synthesizer-lv2/files/patch-CMakeLists.txt

@@ -1,24 +1,25 @@
---- CMakeLists.txt.orig	2020-04-15 15:01:57 UTC
+--- CMakeLists.txt.orig	2020-07-29 20:38:54 UTC
 +++ CMakeLists.txt
-@@ -334,7 +334,6 @@ elseif( UNIX AND NOT APPLE )
+@@ -83,7 +83,7 @@ if( CXX_STD_FS )
+ else()
+   if( UNIX AND NOT APPLE )
+     set (CMAKE_REQUIRED_FLAGS "-std=c++11")
+-    set (CMAKE_REQUIRED_LIBRARIES "stdc++fs")
++    #set (CMAKE_REQUIRED_LIBRARIES "stdc++fs")
+   endif()
+   CHECK_CXX_SYMBOL_EXISTS(std::experimental::filesystem::path::preferred_separator "experimental/filesystem" CXX_EXP_STD_FS)
+   if( UNIX AND NOT APPLE )
+@@ -461,7 +461,7 @@ elseif( UNIX AND NOT APPLE )
  
-   set(OS_LINK_LIBRARIES
-      pthread
--     stdc++fs
-      gcc_s
-      gcc
-      dl
-@@ -689,7 +688,7 @@ if( BUILD_LV2 )
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-       COMMAND echo "Packaging up LV2 component"
-       COMMAND mkdir -p products/Surge.lv2 
--      COMMAND cp build/libsurge-lv2.so products/Surge.lv2/Surge.so
-+      COMMAND cp ../.build/libsurge-lv2.so products/Surge.lv2/Surge.so
-       COMMAND python scripts/linux/generate-lv2-ttl.py products/Surge.lv2/Surge.so 
-       )
- 
-@@ -759,7 +758,6 @@ if( BUILD_HEADLESS )
-     target_sources( surge-headless PUBLIC src/linux/ConfigurationXml.S )
+   set(OS_LINK_LIBRARIES_NOGUI
+     pthread
+-    stdc++fs
++    #stdc++fs
+     gcc_s
+     gcc
+     dl
+@@ -936,7 +936,6 @@ if( BUILD_HEADLESS )
+     endif()
      target_link_libraries(surge-headless
        PRIVATE
 -      stdc++fs

audio/surge-synthesizer-lv2/files/patch-cmake_versiontools.cmake

@@ -0,0 +1,11 @@
+--- cmake/versiontools.cmake.orig	2020-07-29 15:54:49 UTC
++++ cmake/versiontools.cmake
+@@ -1,7 +1,7 @@
+ 
+ find_package(Git)
+ 
+-if( Git_FOUND )
++if( FALSE AND Git_FOUND )
+   execute_process(
+     COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+     WORKING_DIRECTORY ${SURGESRC}

audio/surge-synthesizer-lv2/files/patch-scripts_linux_package-vst3.sh

@@ -1,10 +0,0 @@
---- scripts/linux/package-vst3.sh.orig	2020-04-15 18:28:12 UTC
-+++ scripts/linux/package-vst3.sh
-@@ -15,4 +15,6 @@ fi
- 
- VST_SO_DIR="$BUNDLE_DIR/Contents/x86_64-linux"
- mkdir -p "$VST_SO_DIR"
--cp build/libsurge-vst3.so "$VST_SO_DIR"/Surge.so
-+cp ../.build/libsurge-vst3.so "$VST_SO_DIR"/Surge.so
-+
-+echo "package-vst3.sh is done"

audio/surge-synthesizer-lv2/files/patch-src_linux_UserInteractionsLinux.cpp

@@ -1,10 +0,0 @@
---- src/linux/UserInteractionsLinux.cpp.orig	2020-04-15 17:52:26 UTC
-+++ src/linux/UserInteractionsLinux.cpp
-@@ -6,6 +6,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <thread>
-+#include <sstream>
- 
- /*
- ** In June 2019, @baconpaul chose to implement these with an attempt

biology/diamond/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	diamond
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.36
+DISTVERSION=	2.0.0
 CATEGORIES=	biology
 
 MAINTAINER=	jrm@FreeBSD.org

biology/diamond/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1593736895
-SHA256 (bbuchfink-diamond-v0.9.36_GH0.tar.gz) = 870af89606330f6c0b57ed478d2d8237334ce8f5630eac770399ff431948bd59
-SIZE (bbuchfink-diamond-v0.9.36_GH0.tar.gz) = 1104423
+TIMESTAMP = 1595902695
+SHA256 (bbuchfink-diamond-v2.0.0_GH0.tar.gz) = 0a2bbc8f0fc96d124d37e014f43dd5590a84eb2772428288e8b239b78e9a1058
+SIZE (bbuchfink-diamond-v2.0.0_GH0.tar.gz) = 1104518

biology/diamond/files/patch-src_search_collision.cpp

@@ -1,10 +0,0 @@
---- src/search/collision.cpp.orig	2020-07-03 10:58:27 UTC
-+++ src/search/collision.cpp
-@@ -92,7 +92,6 @@ bool is_primary_hit(const Letter *query,
- 	const unsigned sid,
- 	const unsigned len)
- {
--	assert(len > 0 && len <= config.window * 2);
- 	const bool chunked(config.lowmem > 1);
- 	uint64_t mask = reduced_match32(query, subject, len);
- 	unsigned i = 0;

cad/meshlab/Makefile

@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${LOCALBASE}/include/vcglib/img/img.h:devel/vcglib
 LIB_DEPENDS=	libmpirxx.so:math/mpir
 
-USES=		dos2unix gl qmake:outsource qt:5
+USES=		compiler:c++11-lang dos2unix gl qmake:outsource qt:5
 USE_GL=		gl glu glew
 USE_QT=		buildtools_build core gui network \
 		opengl script xml xmlpatterns widgets

cad/meshlab/files/patch-src_external_structuresynth-1.5_ssynth_SyntopiaCore_GLEngine_Raytracer_AtomicCounter.h

@@ -0,0 +1,10 @@
+--- src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h.orig	2020-07-27 23:02:57 UTC
++++ src/external/structuresynth-1.5/ssynth/SyntopiaCore/GLEngine/Raytracer/AtomicCounter.h
+@@ -2,6 +2,7 @@
+ 
+ #include <QMutex>
+ #include <QWaitCondition>
++#include <climits>
+ 
+ namespace SyntopiaCore {
+ 	namespace GLEngine {	

cad/netgen-lvs/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	netgen
-DISTVERSION=	1.5.149
+DISTVERSION=	1.5.150
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-lvs
 

cad/netgen-lvs/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1594056366
-SHA256 (RTimothyEdwards-netgen-1.5.149_GH0.tar.gz) = 4deb5f15a801e2056c1e57b784adb09ac871561b95827bea83a414cd2abb95a1
-SIZE (RTimothyEdwards-netgen-1.5.149_GH0.tar.gz) = 519602
+TIMESTAMP = 1595901023
+SHA256 (RTimothyEdwards-netgen-1.5.150_GH0.tar.gz) = 085548851956aba17c53e08ed81eb9284792e24da28298db8f928b257796cdb5
+SIZE (RTimothyEdwards-netgen-1.5.150_GH0.tar.gz) = 519687

cad/qflow/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qflow
-DISTVERSION=	1.4.85
+DISTVERSION=	1.4.86
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org

cad/qflow/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1595220628
-SHA256 (RTimothyEdwards-qflow-1.4.85_GH0.tar.gz) = 860b05f25a618138ddc1cf26061b77edab95d3f5aa01985c3340523381cbe66b
-SIZE (RTimothyEdwards-qflow-1.4.85_GH0.tar.gz) = 940632
+TIMESTAMP = 1595916164
+SHA256 (RTimothyEdwards-qflow-1.4.86_GH0.tar.gz) = d058b2244455f82440192a42c32ac02a07956ab49e4e59bab4876f917741bd66
+SIZE (RTimothyEdwards-qflow-1.4.86_GH0.tar.gz) = 940635

comms/dump1090/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dump1090
-PORTVERSION=	20150225
-PORTREVISION=	1
+PORTVERSION=	20200718
 CATEGORIES=	comms
 
 MAINTAINER=	skreuzer@FreeBSD.org
@@ -11,14 +10,14 @@ COMMENT=	Simple Mode S decoder for RTLSDR devices
 
 LICENSE=	BSD3CLAUSE
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	antirez
-GH_TAGNAME=	4c53e25
-
 LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 
 USES=	gmake
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	antirez
+GH_TAGNAME=	de61bd5
+
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lrtlsdr -lusb -lpthread -lm
 

comms/dump1090/distinfo

@@ -1,2 +1,3 @@
-SHA256 (antirez-dump1090-20150225-4c53e25_GH0.tar.gz) = 4be0c75132e9ac635216d052dbf2c7dbcefbc56c7d11131d14d3380ccf835a76
-SIZE (antirez-dump1090-20150225-4c53e25_GH0.tar.gz) = 484406
+TIMESTAMP = 1595885702
+SHA256 (antirez-dump1090-20200718-de61bd5_GH0.tar.gz) = 30fb3174d49464aaf7f3b559af39ee4094074329a7902dc8ff6a6d4b80c11a85
+SIZE (antirez-dump1090-20200718-de61bd5_GH0.tar.gz) = 485418

comms/dump1090/files/patch-Makefile

@@ -1,21 +0,0 @@
---- Makefile.orig	2015-03-03 21:04:48 UTC
-+++ Makefile
-@@ -1,6 +1,6 @@
--CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
--LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
--CC=gcc
-+CFLAGS?=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
-+LDFLAGS?=`pkg-config --libs librtlsdr` -lpthread -lm
-+CC?=gcc
- PROGNAME=dump1090
- 
- all: dump1090
-@@ -9,7 +9,7 @@ all: dump1090
- 	$(CC) $(CFLAGS) -c $<
- 
- dump1090: dump1090.o anet.o
--	$(CC) -g -o dump1090 dump1090.o anet.o $(LIBS)
-+	$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS)
- 
- clean:
- 	rm -f *.o dump1090

databases/Makefile

@@ -991,7 +991,6 @@
     SUBDIR += sqliteconvert
     SUBDIR += sqlitemanager
     SUBDIR += sqliteodbc
-    SUBDIR += sqliteodbc-sqlite2
     SUBDIR += sqlitestudio
     SUBDIR += sqlrelay
     SUBDIR += sqsh

databases/sqliteodbc-sqlite2/Makefile

@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	sqliteodbc
-CATEGORIES=	databases
-PKGNAMESUFFIX=	-sqlite2
-
-MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	ODBC driver for SQLite 2
-
-MASTERDIR=	${.CURDIR}/../sqliteodbc
-
-DEPRECATED=	SQLite2 has stopped development in 2005, please move to SQLite3
-EXPIRATION_DATE=	2020-07-27
-
-BROKEN_aarch64=	fails to compile: error: passing char * to parameter of incompatible type va_list
-BROKEN_armv6=	fails to compile: error: passing char * to parameter of incompatible type va_list
-BROKEN_armv7=	fails to compile: error: passing char * to parameter of incompatible type va_list
-
-.include "${MASTERDIR}/Makefile"

deskutils/foliate/pkg-plist

@@ -45,7 +45,6 @@ share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src
 share/com.github.johnfactotum.Foliate/assets/libarchivejs/main.js
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.data.gresource
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource
-share/glib-2.0/schemas/com.github.johnfactotum.Foliate.gschema.xml
 share/icons/hicolor/scalable/apps/com.github.johnfactotum.Foliate.svg
 share/icons/hicolor/symbolic/apps/com.github.johnfactotum.Foliate-symbolic.svg
 share/locale/cs_CS/LC_MESSAGES/com.github.johnfactotum.Foliate.mo

deskutils/plasma5-milou/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1594147283
-SHA256 (KDE/plasma/5.19.3/milou-5.19.3.tar.xz) = 8ec48ee51f0a1e1db8f40dc166d4c9475487f9e5a7acb9eea076169f0a3847a5
-SIZE (KDE/plasma/5.19.3/milou-5.19.3.tar.xz) = 64484
+TIMESTAMP = 1595947312
+SHA256 (KDE/plasma/5.19.4/milou-5.19.4.tar.xz) = 4e8dced6032457f7f9c24a5730fe84be171f0cd43fa5c90a9c6a1127286dfb5c
+SIZE (KDE/plasma/5.19.4/milou-5.19.4.tar.xz) = 64488

deskutils/plasma5-sddm-kcm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1594147285
-SHA256 (KDE/plasma/5.19.3/sddm-kcm-5.19.3.tar.xz) = 36127218130b07145db2a7c8931132c6ec793bb027a849c5046e6ec670ab1485
-SIZE (KDE/plasma/5.19.3/sddm-kcm-5.19.3.tar.xz) = 62088
+TIMESTAMP = 1595947313
+SHA256 (KDE/plasma/5.19.4/sddm-kcm-5.19.4.tar.xz) = 97aa227996995ebdcc9b6dd4dc327393f91962dd9a25cda690c83db2c303339a
+SIZE (KDE/plasma/5.19.4/sddm-kcm-5.19.4.tar.xz) = 62112

deskutils/timewarrior/Makefile

@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	timewarrior
-PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTVERSION=	1.3.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
-MASTER_SITES=	https://taskwarrior.org/download/
-DISTNAME=	timew-${PORTVERSION}
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Track time from the command line
@@ -13,6 +11,10 @@ COMMENT=	Track time from the command line
 LICENSE=	MIT
 
 USES=		cmake compiler:c++11-lang
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	GothenburgBitFactory
+GH_TUPLE=	GothenburgBitFactory:libshared:0d4e31d:libshared/src/libshared
 CMAKE_ARGS+=	-DTIMEW_DOCDIR=${DOCSDIR}
 
 .include <bsd.port.mk>

deskutils/timewarrior/distinfo

@@ -1,3 +1,5 @@
-TIMESTAMP = 1529603473
-SHA256 (timew-1.1.1.tar.gz) = 1f7d9a62e55fc5a3126433654ccb1fd7d2d135f06f05697f871897c9db77ccc9
-SIZE (timew-1.1.1.tar.gz) = 166484
+TIMESTAMP = 1595964414
+SHA256 (GothenburgBitFactory-timewarrior-v1.3.0_GH0.tar.gz) = 6199304fc9697a2eb78c542357aec984924bc2ecad90f3bedf1f6299fe345484
+SIZE (GothenburgBitFactory-timewarrior-v1.3.0_GH0.tar.gz) = 165036
+SHA256 (GothenburgBitFactory-libshared-0d4e31d_GH0.tar.gz) = 254ebd19889ec077ce5f48ce4c014e768bf96c2f7928956c1e3b1a55b605c621
+SIZE (GothenburgBitFactory-libshared-0d4e31d_GH0.tar.gz) = 148753

deskutils/timewarrior/files/patch-src_commands_CmdHelp.cpp

@@ -0,0 +1,10 @@
+--- src/commands/CmdHelp.cpp.orig	2020-07-28 19:41:05 UTC
++++ src/commands/CmdHelp.cpp
+@@ -30,6 +30,7 @@
+ #include <FS.h>
+ #include <shared.h>
+ #include <additional-help.h>
++#include <sys/wait.h>
+ 
+ ////////////////////////////////////////////////////////////////////////////////
+ int CmdHelpUsage (const Extensions& extensions)

deskutils/timewarrior/files/patch-src_libshared_src_FS.cpp

@@ -0,0 +1,20 @@
+--- src/libshared/src/FS.cpp.orig	2020-07-28 19:40:14 UTC
++++ src/libshared/src/FS.cpp
+@@ -478,7 +478,7 @@ bool File::lock ()
+ #ifdef DARWIN
+                     // l_start l_len l_pid l_type   l_whence
+     struct flock fl = {0,      0,    0,    F_WRLCK, SEEK_SET};
+-#elif FREEBSD
++#elif defined FREEBSD
+                     // l_type   l_whence  l_start  l_len  l_pid  l_sysid
+     struct flock fl = {F_WRLCK, SEEK_SET, 0,       0,     0,     0 };
+ #else
+@@ -501,7 +501,7 @@ void File::unlock ()
+ #ifdef DARWIN
+                     // l_start l_len l_pid l_type   l_whence
+     struct flock fl = {0,      0,    0,    F_WRLCK, SEEK_SET};
+-#elif FREEBSD
++#elif defined FREEBSD
+                     // l_type   l_whence  l_start  l_len  l_pid  l_sysid
+     struct flock fl = {F_WRLCK, SEEK_SET, 0,       0,     0,     0 };
+ #else

deskutils/timewarrior/pkg-plist

@@ -1,5 +1,44 @@
 bin/timew
 man/man1/timew.1.gz
+man/man1/timew-annotate.1.gz
+man/man1/timew-cancel.1.gz
+man/man1/timew-chart.1.gz
+man/man1/timew-config.1.gz
+man/man1/timew-continue.1.gz
+man/man1/timew-day.1.gz
+man/man1/timew-delete.1.gz
+man/man1/timew-diagnostics.1.gz
+man/man1/timew-export.1.gz
+man/man1/timew-extensions.1.gz
+man/man1/timew-fill.1.gz
+man/man1/timew-gaps.1.gz
+man/man1/timew-get.1.gz
+man/man1/timew-help.1.gz
+man/man1/timew-join.1.gz
+man/man1/timew-lengthen.1.gz
+man/man1/timew-modify.1.gz
+man/man1/timew-month.1.gz
+man/man1/timew-move.1.gz
+man/man1/timew-report.1.gz
+man/man1/timew-resize.1.gz
+man/man1/timew-shorten.1.gz
+man/man1/timew-show.1.gz
+man/man1/timew-split.1.gz
+man/man1/timew-start.1.gz
+man/man1/timew-stop.1.gz
+man/man1/timew-summary.1.gz
+man/man1/timew-tag.1.gz
+man/man1/timew-tags.1.gz
+man/man1/timew-track.1.gz
+man/man1/timew-undo.1.gz
+man/man1/timew-untag.1.gz
+man/man1/timew-week.1.gz
+man/man7/timew-config.7.gz
+man/man7/timew-dates.7.gz
+man/man7/timew-dom.7.gz
+man/man7/timew-durations.7.gz
+man/man7/timew-hints.7.gz
+man/man7/timew-ranges.7.gz
 %%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog

devel/Makefile

@@ -815,6 +815,7 @@
     SUBDIR += gitolite
     SUBDIR += gitolite2
     SUBDIR += gittrac
+    SUBDIR += gitui
     SUBDIR += glade
     SUBDIR += glademm
     SUBDIR += glib20
@@ -1405,6 +1406,7 @@
     SUBDIR += llvm-cheri
     SUBDIR += llvm-devel
     SUBDIR += llvm10
+    SUBDIR += llvm11
     SUBDIR += llvm60
     SUBDIR += llvm70
     SUBDIR += llvm80
@@ -6641,6 +6643,7 @@
     SUBDIR += silc-toolkit
     SUBDIR += silentbob
     SUBDIR += simavr
+    SUBDIR += simde
     SUBDIR += simdjson
     SUBDIR += simgear
     SUBDIR += simian

devel/aml/Makefile

@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	aml
-PORTVERSION=	s20200717
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -16,6 +17,11 @@ USES=		compiler:c11 meson pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	any1
-GH_TAGNAME=	696f0ee
+
+post-patch:
+# Extract (snapshot) version from the port instead of meson.build
+	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
+		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
+		${WRKSRC}/meson.build
 
 .include <bsd.port.mk>

devel/aml/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1595001795
-SHA256 (any1-aml-s20200717-696f0ee_GH0.tar.gz) = 884340c39d6758c58a64ae528771927038547f40bdbb8d74ab2536e59ed3f593
-SIZE (any1-aml-s20200717-696f0ee_GH0.tar.gz) = 18998
+TIMESTAMP = 1595762226
+SHA256 (any1-aml-v0.1.0_GH0.tar.gz) = 50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+SIZE (any1-aml-v0.1.0_GH0.tar.gz) = 19267

devel/cargo-c/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cargo-c
-DISTVERSION=	0.6.8
-PORTREVISION=	1
+DISTVERSION=	0.6.10
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 # XXX Teach USES=cargo to have proper default
@@ -19,7 +18,8 @@ LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libssh2.so:security/libssh2
 
 USES=		cargo ssl
-PLIST_FILES=	bin/cargo-cbuild \
+PLIST_FILES=	bin/cargo-capi \
+		bin/cargo-cbuild \
 		bin/cargo-cinstall
 
 CARGO_CRATES=	adler-0.2.2 \
@@ -42,7 +42,7 @@ CARGO_CRATES=	adler-0.2.2 \
 		commoncrypto-sys-0.2.0 \
 		core-foundation-0.7.0 \
 		core-foundation-sys-0.7.0 \
-		crates-io-0.31.0 \
+		crates-io-0.31.1 \
 		crc32fast-1.2.0 \
 		crossbeam-utils-0.7.2 \
 		crypto-hash-0.3.4 \
@@ -154,6 +154,6 @@ CARGO_CRATES=	adler-0.2.2 \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,libdir.join("pkgconfig,prefix.join("libdata/pkgconfig,' \
-		${WRKSRC}/src/install_paths.rs
+		${WRKSRC}/src/install.rs
 
 .include <bsd.port.mk>

devel/cargo-c/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1593532614
-SHA256 (rust/crates/cargo-c-0.6.8.tar.gz) = 0145ea1d3488b061fbc22c54b36e8e3cdfc238eb98f3e78a0bf55020764b8513
-SIZE (rust/crates/cargo-c-0.6.8.tar.gz) = 21944
+TIMESTAMP = 1595925502
+SHA256 (rust/crates/cargo-c-0.6.10.tar.gz) = 4f5b2ae430ac76b29f779b1d8f746c146073d87094be6d4747dd412c2c13a5e6
+SIZE (rust/crates/cargo-c-0.6.10.tar.gz) = 23237
 SHA256 (rust/crates/adler-0.2.2.tar.gz) = ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10
 SIZE (rust/crates/adler-0.2.2.tar.gz) = 10934
 SHA256 (rust/crates/aho-corasick-0.7.13.tar.gz) = 043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86
@@ -41,8 +41,8 @@ SHA256 (rust/crates/core-foundation-0.7.0.tar.gz) = 57d24c7a13c43e870e37c1556b74
 SIZE (rust/crates/core-foundation-0.7.0.tar.gz) = 25384
 SHA256 (rust/crates/core-foundation-sys-0.7.0.tar.gz) = b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac
 SIZE (rust/crates/core-foundation-sys-0.7.0.tar.gz) = 17033
-SHA256 (rust/crates/crates-io-0.31.0.tar.gz) = a51c9064687a09f007c08645d5f3ac769030794d91b07faba7bf35284b6a212c
-SIZE (rust/crates/crates-io-0.31.0.tar.gz) = 8907
+SHA256 (rust/crates/crates-io-0.31.1.tar.gz) = 09f977948a46e9edf93eb3dc2d7a8dd4ce3105d36de63300befed37cdf051d4a
+SIZE (rust/crates/crates-io-0.31.1.tar.gz) = 8943
 SHA256 (rust/crates/crc32fast-1.2.0.tar.gz) = ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1
 SIZE (rust/crates/crc32fast-1.2.0.tar.gz) = 39161
 SHA256 (rust/crates/crossbeam-utils-0.7.2.tar.gz) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8

devel/catch/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	catch
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.12.3
+DISTVERSION=	2.13.0
 PORTREVISION=	0
 CATEGORIES=	devel
 

devel/catch/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1593505045
-SHA256 (catchorg-Catch2-v2.12.3_GH0.tar.gz) = 78425e7055cea5bad1ff8db7ea0d6dfc0722ece156be1ccf3597c15e674e6943
-SIZE (catchorg-Catch2-v2.12.3_GH0.tar.gz) = 647128
+TIMESTAMP = 1595851014
+SHA256 (catchorg-Catch2-v2.13.0_GH0.tar.gz) = 4e6608d3fb0247e2aa988735bae2064381b0ec712f47beb766dd761838a546b6
+SIZE (catchorg-Catch2-v2.13.0_GH0.tar.gz) = 650897

devel/chroma/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	chroma
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.3
+DISTVERSION=	0.8.0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-syntax-highlighter
 

devel/chroma/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1589170280
-SHA256 (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 1007e82cc44cea04542c282b19bab25a59cb1e53149aaa7f0e2d9ce72ba80114
-SIZE (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 615181
+TIMESTAMP = 1595900094
+SHA256 (alecthomas-chroma-v0.8.0_GH0.tar.gz) = 03bbe1fd43109b125cb33cf72e26338376056b961ea1c9ab1ecc02a60651e67b
+SIZE (alecthomas-chroma-v0.8.0_GH0.tar.gz) = 623074
 SHA256 (alecthomas-assert-405dbfeb8e38_GH0.tar.gz) = 98220302569c728c0dc546ce946c4600aed4ab0729f6e9fc08b24b753cfcaa13
 SIZE (alecthomas-assert-405dbfeb8e38_GH0.tar.gz) = 71073
 SHA256 (alecthomas-colour-60882d9e2721_GH0.tar.gz) = 72c3b70db87e00ca3044c4f4dbedf08e1ae15e93bbc00e622313a58813c6b012

devel/folly/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2020.07.20.00
+DISTVERSION=	2020.07.27.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org

devel/folly/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1595310325
-SHA256 (facebook-folly-v2020.07.20.00_GH0.tar.gz) = e48459d8f97e2dfaab199e10f5f23ce2315517170c17be3660a3c2484ea28b58
-SIZE (facebook-folly-v2020.07.20.00_GH0.tar.gz) = 3155179
+TIMESTAMP = 1595951305
+SHA256 (facebook-folly-v2020.07.27.00_GH0.tar.gz) = 328b689f639b6618e4083cc9e0365f0e1da23c7b0496f67d0d85e5a1bbb9661c
+SIZE (facebook-folly-v2020.07.27.00_GH0.tar.gz) = 3166353

devel/folly/pkg-plist

@@ -119,6 +119,7 @@ include/folly/concurrency/ConcurrentHashMap.h
 include/folly/concurrency/CoreCachedSharedPtr.h
 include/folly/concurrency/DynamicBoundedQueue.h
 include/folly/concurrency/PriorityUnboundedQueueSet.h
+include/folly/concurrency/QueueObserver.h
 include/folly/concurrency/UnboundedQueue.h
 include/folly/concurrency/detail/AtomicSharedPtr-detail.h
 include/folly/concurrency/detail/ConcurrentHashMap-detail.h
@@ -274,6 +275,7 @@ include/folly/experimental/coro/Concat.h
 include/folly/experimental/coro/CurrentExecutor.h
 include/folly/experimental/coro/Dematerialize-inl.h
 include/folly/experimental/coro/Dematerialize.h
+include/folly/experimental/coro/DetachOnCancel.h
 include/folly/experimental/coro/Error.h
 include/folly/experimental/coro/Filter-inl.h
 include/folly/experimental/coro/Filter.h
@@ -288,12 +290,15 @@ include/folly/experimental/coro/Merge.h
 include/folly/experimental/coro/Multiplex-inl.h
 include/folly/experimental/coro/Multiplex.h
 include/folly/experimental/coro/Mutex.h
+include/folly/experimental/coro/Retry.h
 include/folly/experimental/coro/SharedLock.h
 include/folly/experimental/coro/SharedMutex.h
 include/folly/experimental/coro/Sleep-inl.h
 include/folly/experimental/coro/Sleep.h
 include/folly/experimental/coro/Task.h
 include/folly/experimental/coro/TimedWait.h
+include/folly/experimental/coro/Timeout-inl.h
+include/folly/experimental/coro/Timeout.h
 include/folly/experimental/coro/Traits.h
 include/folly/experimental/coro/Transform-inl.h
 include/folly/experimental/coro/Transform.h

devel/gitui/Makefile

@@ -0,0 +1,160 @@
+# $FreeBSD$
+
+PORTNAME=	gitui
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.9.1
+CATEGORIES=	devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Terminal UI for git
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+LIB_DEPENDS=	libgit2.so:devel/libgit2
+
+USES=		cargo pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	extrawurst
+
+CARGO_CRATES=	addr2line-0.13.0 \
+		adler-0.2.2 \
+		ahash-0.3.8 \
+		anyhow-1.0.32 \
+		arc-swap-0.4.7 \
+		arrayref-0.3.6 \
+		arrayvec-0.4.12 \
+		arrayvec-0.5.1 \
+		autocfg-1.0.0 \
+		backtrace-0.3.50 \
+		base64-0.11.0 \
+		base64-0.12.3 \
+		bitflags-1.2.1 \
+		blake2b_simd-0.5.10 \
+		bytemuck-1.2.0 \
+		bytesize-1.0.1 \
+		cassowary-0.3.0 \
+		cc-1.0.58 \
+		cfg-if-0.1.10 \
+		chrono-0.4.13 \
+		clap-2.33.1 \
+		cloudabi-0.0.3 \
+		cloudabi-0.1.0 \
+		const-random-0.1.8 \
+		const-random-macro-0.1.8 \
+		constant_time_eq-0.1.5 \
+		cpp_demangle-0.3.0 \
+		crossbeam-channel-0.4.3 \
+		crossbeam-deque-0.7.3 \
+		crossbeam-epoch-0.8.2 \
+		crossbeam-queue-0.2.3 \
+		crossbeam-utils-0.7.2 \
+		crossterm-0.17.7 \
+		crossterm_winapi-0.6.1 \
+		debugid-0.7.2 \
+		dirs-3.0.1 \
+		dirs-sys-0.3.5 \
+		either-1.5.3 \
+		failure-0.1.8 \
+		failure_derive-0.1.8 \
+		getrandom-0.1.14 \
+		gimli-0.22.0 \
+		git2-0.13.8 \
+		glob-0.3.0 \
+		hermit-abi-0.1.15 \
+		idna-0.2.0 \
+		indexmap-1.4.0 \
+		inferno-0.10.0 \
+		instant-0.1.6 \
+		itertools-0.9.0 \
+		itoa-0.4.6 \
+		jobserver-0.1.21 \
+		lazy_static-1.4.0 \
+		libc-0.2.72 \
+		libgit2-sys-0.12.9+1.0.1 \
+		libz-sys-1.0.25 \
+		lock_api-0.3.4 \
+		lock_api-0.4.1 \
+		log-0.4.11 \
+		matches-0.1.8 \
+		maybe-uninit-2.0.0 \
+		memchr-2.3.3 \
+		memmap-0.7.0 \
+		memoffset-0.5.5 \
+		miniz_oxide-0.4.0 \
+		mio-0.7.0 \
+		miow-0.3.5 \
+		msvc-demangler-0.8.0 \
+		nix-0.17.0 \
+		nodrop-0.1.14 \
+		ntapi-0.3.4 \
+		num-format-0.4.0 \
+		num-integer-0.1.43 \
+		num-traits-0.2.12 \
+		num_cpus-1.13.0 \
+		object-0.20.0 \
+		parking_lot-0.10.2 \
+		parking_lot-0.11.0 \
+		parking_lot_core-0.7.2 \
+		parking_lot_core-0.8.0 \
+		percent-encoding-2.1.0 \
+		pkg-config-0.3.17 \
+		pprof-0.3.17 \
+		ppv-lite86-0.2.8 \
+		proc-macro-hack-0.5.16 \
+		proc-macro2-1.0.18 \
+		quick-xml-0.18.1 \
+		quote-1.0.7 \
+		rand-0.7.3 \
+		rand_chacha-0.2.2 \
+		rand_core-0.5.1 \
+		rand_hc-0.2.0 \
+		rayon-core-1.7.1 \
+		redox_syscall-0.1.56 \
+		redox_users-0.3.4 \
+		remove_dir_all-0.5.3 \
+		rgb-0.8.20 \
+		ron-0.6.0 \
+		rust-argon2-0.7.0 \
+		rustc-demangle-0.1.16 \
+		scopeguard-1.1.0 \
+		serde-1.0.114 \
+		serde_derive-1.0.114 \
+		signal-hook-0.1.16 \
+		signal-hook-registry-1.2.0 \
+		simplelog-0.8.0 \
+		smallvec-1.4.1 \
+		socket2-0.3.12 \
+		stable_deref_trait-1.1.1 \
+		str_stack-0.1.0 \
+		symbolic-common-7.4.0 \
+		symbolic-demangle-7.4.0 \
+		syn-1.0.33 \
+		synstructure-0.12.4 \
+		tempfile-3.1.0 \
+		textwrap-0.11.0 \
+		thiserror-1.0.20 \
+		thiserror-impl-1.0.20 \
+		time-0.1.43 \
+		tinyvec-0.3.3 \
+		tui-0.9.5 \
+		unicode-bidi-0.3.4 \
+		unicode-normalization-0.1.13 \
+		unicode-segmentation-1.6.0 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.1 \
+		url-2.1.1 \
+		uuid-0.8.1 \
+		vcpkg-0.2.10 \
+		void-1.0.2 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>

devel/gitui/distinfo

@@ -0,0 +1,271 @@
+TIMESTAMP = 1596084693
+SHA256 (rust/crates/addr2line-0.13.0.tar.gz) = 1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072
+SIZE (rust/crates/addr2line-0.13.0.tar.gz) = 29996
+SHA256 (rust/crates/adler-0.2.2.tar.gz) = ccc9a9dd069569f212bc4330af9f17c4afb5e8ce185e83dbb14f1349dda18b10
+SIZE (rust/crates/adler-0.2.2.tar.gz) = 10934
+SHA256 (rust/crates/ahash-0.3.8.tar.gz) = e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217
+SIZE (rust/crates/ahash-0.3.8.tar.gz) = 28650
+SHA256 (rust/crates/anyhow-1.0.32.tar.gz) = 6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b
+SIZE (rust/crates/anyhow-1.0.32.tar.gz) = 28512
+SHA256 (rust/crates/arc-swap-0.4.7.tar.gz) = 4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034
+SIZE (rust/crates/arc-swap-0.4.7.tar.gz) = 48625
+SHA256 (rust/crates/arrayref-0.3.6.tar.gz) = a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544
+SIZE (rust/crates/arrayref-0.3.6.tar.gz) = 10035
+SHA256 (rust/crates/arrayvec-0.4.12.tar.gz) = cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9
+SIZE (rust/crates/arrayvec-0.4.12.tar.gz) = 26551
+SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8
+SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816
+SHA256 (rust/crates/autocfg-1.0.0.tar.gz) = f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d
+SIZE (rust/crates/autocfg-1.0.0.tar.gz) = 12870
+SHA256 (rust/crates/backtrace-0.3.50.tar.gz) = 46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293
+SIZE (rust/crates/backtrace-0.3.50.tar.gz) = 69769
+SHA256 (rust/crates/base64-0.11.0.tar.gz) = b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7
+SIZE (rust/crates/base64-0.11.0.tar.gz) = 48362
+SHA256 (rust/crates/base64-0.12.3.tar.gz) = 3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff
+SIZE (rust/crates/base64-0.12.3.tar.gz) = 57545
+SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
+SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
+SHA256 (rust/crates/blake2b_simd-0.5.10.tar.gz) = d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a
+SIZE (rust/crates/blake2b_simd-0.5.10.tar.gz) = 34093
+SHA256 (rust/crates/bytemuck-1.2.0.tar.gz) = 37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431
+SIZE (rust/crates/bytemuck-1.2.0.tar.gz) = 17957
+SHA256 (rust/crates/bytesize-1.0.1.tar.gz) = 81a18687293a1546b67c246452202bbbf143d239cb43494cc163da14979082da
+SIZE (rust/crates/bytesize-1.0.1.tar.gz) = 7629
+SHA256 (rust/crates/cassowary-0.3.0.tar.gz) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
+SIZE (rust/crates/cassowary-0.3.0.tar.gz) = 22876
+SHA256 (rust/crates/cc-1.0.58.tar.gz) = f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518
+SIZE (rust/crates/cc-1.0.58.tar.gz) = 52896
+SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
+SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
+SHA256 (rust/crates/chrono-0.4.13.tar.gz) = c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6
+SIZE (rust/crates/chrono-0.4.13.tar.gz) = 144286
+SHA256 (rust/crates/clap-2.33.1.tar.gz) = bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129
+SIZE (rust/crates/clap-2.33.1.tar.gz) = 201567
+SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
+SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156
+SHA256 (rust/crates/cloudabi-0.1.0.tar.gz) = 4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467
+SIZE (rust/crates/cloudabi-0.1.0.tar.gz) = 22687
+SHA256 (rust/crates/const-random-0.1.8.tar.gz) = 2f1af9ac737b2dd2d577701e59fd09ba34822f6f2ebdb30a7647405d9e55e16a
+SIZE (rust/crates/const-random-0.1.8.tar.gz) = 5972
+SHA256 (rust/crates/const-random-macro-0.1.8.tar.gz) = 25e4c606eb459dd29f7c57b2e0879f2b6f14ee130918c2b78ccb58a9624e6c7a
+SIZE (rust/crates/const-random-macro-0.1.8.tar.gz) = 5844
+SHA256 (rust/crates/constant_time_eq-0.1.5.tar.gz) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
+SIZE (rust/crates/constant_time_eq-0.1.5.tar.gz) = 4936
+SHA256 (rust/crates/cpp_demangle-0.3.0.tar.gz) = ad49cad3673b9d586bc50cd92fdc0e9205ecd162d4206073d9774c4fe13a8fde
+SIZE (rust/crates/cpp_demangle-0.3.0.tar.gz) = 73820
+SHA256 (rust/crates/crossbeam-channel-0.4.3.tar.gz) = 09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6
+SIZE (rust/crates/crossbeam-channel-0.4.3.tar.gz) = 86153
+SHA256 (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285
+SIZE (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 19888
+SHA256 (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace
+SIZE (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 39283
+SHA256 (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570
+SIZE (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 14753
+SHA256 (rust/crates/crossbeam-utils-0.7.2.tar.gz) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8
+SIZE (rust/crates/crossbeam-utils-0.7.2.tar.gz) = 34338
+SHA256 (rust/crates/crossterm-0.17.7.tar.gz) = 6f4919d60f26ae233e14233cc39746c8c8bb8cd7b05840ace83604917b51b6c7
+SIZE (rust/crates/crossterm-0.17.7.tar.gz) = 105242
+SHA256 (rust/crates/crossterm_winapi-0.6.1.tar.gz) = 057b7146d02fb50175fd7dbe5158f6097f33d02831f43b4ee8ae4ddf67b68f5c
+SIZE (rust/crates/crossterm_winapi-0.6.1.tar.gz) = 15017
+SHA256 (rust/crates/debugid-0.7.2.tar.gz) = f91cf5a8c2f2097e2a32627123508635d47ce10563d999ec1a95addf08b502ba
+SIZE (rust/crates/debugid-0.7.2.tar.gz) = 10746
+SHA256 (rust/crates/dirs-3.0.1.tar.gz) = 142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff
+SIZE (rust/crates/dirs-3.0.1.tar.gz) = 12245
+SHA256 (rust/crates/dirs-sys-0.3.5.tar.gz) = 8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a
+SIZE (rust/crates/dirs-sys-0.3.5.tar.gz) = 10643
+SHA256 (rust/crates/either-1.5.3.tar.gz) = bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3
+SIZE (rust/crates/either-1.5.3.tar.gz) = 12278
+SHA256 (rust/crates/failure-0.1.8.tar.gz) = d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86
+SIZE (rust/crates/failure-0.1.8.tar.gz) = 37582
+SHA256 (rust/crates/failure_derive-0.1.8.tar.gz) = aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4
+SIZE (rust/crates/failure_derive-0.1.8.tar.gz) = 4950
+SHA256 (rust/crates/getrandom-0.1.14.tar.gz) = 7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb
+SIZE (rust/crates/getrandom-0.1.14.tar.gz) = 24698
+SHA256 (rust/crates/gimli-0.22.0.tar.gz) = aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724
+SIZE (rust/crates/gimli-0.22.0.tar.gz) = 704135
+SHA256 (rust/crates/git2-0.13.8.tar.gz) = e6ac22e49b7d886b6802c66662b12609452248b1bc9e87d6d83ecea3db96f557
+SIZE (rust/crates/git2-0.13.8.tar.gz) = 173580
+SHA256 (rust/crates/glob-0.3.0.tar.gz) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
+SIZE (rust/crates/glob-0.3.0.tar.gz) = 18724
+SHA256 (rust/crates/hermit-abi-0.1.15.tar.gz) = 3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9
+SIZE (rust/crates/hermit-abi-0.1.15.tar.gz) = 9597
+SHA256 (rust/crates/idna-0.2.0.tar.gz) = 02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9
+SIZE (rust/crates/idna-0.2.0.tar.gz) = 257203
+SHA256 (rust/crates/indexmap-1.4.0.tar.gz) = c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe
+SIZE (rust/crates/indexmap-1.4.0.tar.gz) = 47871
+SHA256 (rust/crates/inferno-0.10.0.tar.gz) = e4eb1402c92d29c8b44e090b9b0fc25f5714253f959c9f42e378b91cff4d952f
+SIZE (rust/crates/inferno-0.10.0.tar.gz) = 86885
+SHA256 (rust/crates/instant-0.1.6.tar.gz) = 5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485
+SIZE (rust/crates/instant-0.1.6.tar.gz) = 5109
+SHA256 (rust/crates/itertools-0.9.0.tar.gz) = 284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b
+SIZE (rust/crates/itertools-0.9.0.tar.gz) = 96429
+SHA256 (rust/crates/itoa-0.4.6.tar.gz) = dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6
+SIZE (rust/crates/itoa-0.4.6.tar.gz) = 12167
+SHA256 (rust/crates/jobserver-0.1.21.tar.gz) = 5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2
+SIZE (rust/crates/jobserver-0.1.21.tar.gz) = 21228
+SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
+SHA256 (rust/crates/libc-0.2.72.tar.gz) = a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701
+SIZE (rust/crates/libc-0.2.72.tar.gz) = 478292
+SHA256 (rust/crates/libgit2-sys-0.12.9+1.0.1.tar.gz) = 9b33bf3d9d4c45b48ae1ea7c334be69994624dc0a69f833d5d9f7605f24b552b
+SIZE (rust/crates/libgit2-sys-0.12.9+1.0.1.tar.gz) = 1557856
+SHA256 (rust/crates/libz-sys-1.0.25.tar.gz) = 2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe
+SIZE (rust/crates/libz-sys-1.0.25.tar.gz) = 650151
+SHA256 (rust/crates/lock_api-0.3.4.tar.gz) = c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75
+SIZE (rust/crates/lock_api-0.3.4.tar.gz) = 18750
+SHA256 (rust/crates/lock_api-0.4.1.tar.gz) = 28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c
+SIZE (rust/crates/lock_api-0.4.1.tar.gz) = 20339
+SHA256 (rust/crates/log-0.4.11.tar.gz) = 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
+SIZE (rust/crates/log-0.4.11.tar.gz) = 36276
+SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
+SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216
+SHA256 (rust/crates/maybe-uninit-2.0.0.tar.gz) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
+SIZE (rust/crates/maybe-uninit-2.0.0.tar.gz) = 11809
+SHA256 (rust/crates/memchr-2.3.3.tar.gz) = 3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400
+SIZE (rust/crates/memchr-2.3.3.tar.gz) = 22566
+SHA256 (rust/crates/memmap-0.7.0.tar.gz) = 6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b
+SIZE (rust/crates/memmap-0.7.0.tar.gz) = 15214
+SHA256 (rust/crates/memoffset-0.5.5.tar.gz) = c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f
+SIZE (rust/crates/memoffset-0.5.5.tar.gz) = 7318
+SHA256 (rust/crates/miniz_oxide-0.4.0.tar.gz) = be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f
+SIZE (rust/crates/miniz_oxide-0.4.0.tar.gz) = 45246
+SHA256 (rust/crates/mio-0.7.0.tar.gz) = 6e9971bc8349a361217a8f2a41f5d011274686bd4436465ba51730921039d7fb
+SIZE (rust/crates/mio-0.7.0.tar.gz) = 88819
+SHA256 (rust/crates/miow-0.3.5.tar.gz) = 07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e
+SIZE (rust/crates/miow-0.3.5.tar.gz) = 23796
+SHA256 (rust/crates/msvc-demangler-0.8.0.tar.gz) = 6584cf122f02fc0396420a116cd395a9a776ec4347dffe1c5119c3fcc917c060
+SIZE (rust/crates/msvc-demangler-0.8.0.tar.gz) = 50633
+SHA256 (rust/crates/nix-0.17.0.tar.gz) = 50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363
+SIZE (rust/crates/nix-0.17.0.tar.gz) = 195654
+SHA256 (rust/crates/nodrop-0.1.14.tar.gz) = 72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb
+SIZE (rust/crates/nodrop-0.1.14.tar.gz) = 7667
+SHA256 (rust/crates/ntapi-0.3.4.tar.gz) = 7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2
+SIZE (rust/crates/ntapi-0.3.4.tar.gz) = 126944
+SHA256 (rust/crates/num-format-0.4.0.tar.gz) = bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465
+SIZE (rust/crates/num-format-0.4.0.tar.gz) = 59791
+SHA256 (rust/crates/num-integer-0.1.43.tar.gz) = 8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b
+SIZE (rust/crates/num-integer-0.1.43.tar.gz) = 21966
+SHA256 (rust/crates/num-traits-0.2.12.tar.gz) = ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611
+SIZE (rust/crates/num-traits-0.2.12.tar.gz) = 43807
+SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
+SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704
+SHA256 (rust/crates/object-0.20.0.tar.gz) = 1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5
+SIZE (rust/crates/object-0.20.0.tar.gz) = 168755
+SHA256 (rust/crates/parking_lot-0.10.2.tar.gz) = d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e
+SIZE (rust/crates/parking_lot-0.10.2.tar.gz) = 39536
+SHA256 (rust/crates/parking_lot-0.11.0.tar.gz) = a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733
+SIZE (rust/crates/parking_lot-0.11.0.tar.gz) = 39558
+SHA256 (rust/crates/parking_lot_core-0.7.2.tar.gz) = d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3
+SIZE (rust/crates/parking_lot_core-0.7.2.tar.gz) = 33875
+SHA256 (rust/crates/parking_lot_core-0.8.0.tar.gz) = c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b
+SIZE (rust/crates/parking_lot_core-0.8.0.tar.gz) = 33870
+SHA256 (rust/crates/percent-encoding-2.1.0.tar.gz) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
+SIZE (rust/crates/percent-encoding-2.1.0.tar.gz) = 9748
+SHA256 (rust/crates/pkg-config-0.3.17.tar.gz) = 05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677
+SIZE (rust/crates/pkg-config-0.3.17.tar.gz) = 14533
+SHA256 (rust/crates/pprof-0.3.17.tar.gz) = b220b3619032fb17a2ffc86a8eaa570810490c79367c823731841b636807d821
+SIZE (rust/crates/pprof-0.3.17.tar.gz) = 32272
+SHA256 (rust/crates/ppv-lite86-0.2.8.tar.gz) = 237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea
+SIZE (rust/crates/ppv-lite86-0.2.8.tar.gz) = 20848
+SHA256 (rust/crates/proc-macro-hack-0.5.16.tar.gz) = 7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4
+SIZE (rust/crates/proc-macro-hack-0.5.16.tar.gz) = 14227
+SHA256 (rust/crates/proc-macro2-1.0.18.tar.gz) = beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa
+SIZE (rust/crates/proc-macro2-1.0.18.tar.gz) = 36252
+SHA256 (rust/crates/quick-xml-0.18.1.tar.gz) = 3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82
+SIZE (rust/crates/quick-xml-0.18.1.tar.gz) = 103957
+SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
+SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170
+SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
+SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
+SHA256 (rust/crates/rand_chacha-0.2.2.tar.gz) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
+SIZE (rust/crates/rand_chacha-0.2.2.tar.gz) = 13267
+SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
+SIZE (rust/crates/rand_core-0.5.1.tar.gz) = 21116
+SHA256 (rust/crates/rand_hc-0.2.0.tar.gz) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
+SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670
+SHA256 (rust/crates/rayon-core-1.7.1.tar.gz) = e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280
+SIZE (rust/crates/rayon-core-1.7.1.tar.gz) = 58437
+SHA256 (rust/crates/redox_syscall-0.1.56.tar.gz) = 2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84
+SIZE (rust/crates/redox_syscall-0.1.56.tar.gz) = 17117
+SHA256 (rust/crates/redox_users-0.3.4.tar.gz) = 09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431
+SIZE (rust/crates/redox_users-0.3.4.tar.gz) = 12526
+SHA256 (rust/crates/remove_dir_all-0.5.3.tar.gz) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.tar.gz) = 9184
+SHA256 (rust/crates/rgb-0.8.20.tar.gz) = 90ef54b45ae131327a88597e2463fee4098ad6c88ba7b6af4b3987db8aad4098
+SIZE (rust/crates/rgb-0.8.20.tar.gz) = 14960
+SHA256 (rust/crates/ron-0.6.0.tar.gz) = a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f
+SIZE (rust/crates/ron-0.6.0.tar.gz) = 42837
+SHA256 (rust/crates/rust-argon2-0.7.0.tar.gz) = 2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017
+SIZE (rust/crates/rust-argon2-0.7.0.tar.gz) = 27757
+SHA256 (rust/crates/rustc-demangle-0.1.16.tar.gz) = 4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783
+SIZE (rust/crates/rustc-demangle-0.1.16.tar.gz) = 19137
+SHA256 (rust/crates/scopeguard-1.1.0.tar.gz) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.tar.gz) = 11470
+SHA256 (rust/crates/serde-1.0.114.tar.gz) = 5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3
+SIZE (rust/crates/serde-1.0.114.tar.gz) = 74453
+SHA256 (rust/crates/serde_derive-1.0.114.tar.gz) = 2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e
+SIZE (rust/crates/serde_derive-1.0.114.tar.gz) = 50733
+SHA256 (rust/crates/signal-hook-0.1.16.tar.gz) = 604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed
+SIZE (rust/crates/signal-hook-0.1.16.tar.gz) = 27183
+SHA256 (rust/crates/signal-hook-registry-1.2.0.tar.gz) = 94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41
+SIZE (rust/crates/signal-hook-registry-1.2.0.tar.gz) = 14490
+SHA256 (rust/crates/simplelog-0.8.0.tar.gz) = 2b2736f58087298a448859961d3f4a0850b832e72619d75adc69da7993c2cd3c
+SIZE (rust/crates/simplelog-0.8.0.tar.gz) = 17499
+SHA256 (rust/crates/smallvec-1.4.1.tar.gz) = 3757cb9d89161a2f24e1cf78efa0c1fcff485d18e3f55e0aa3480824ddaa0f3f
+SIZE (rust/crates/smallvec-1.4.1.tar.gz) = 25818
+SHA256 (rust/crates/socket2-0.3.12.tar.gz) = 03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918
+SIZE (rust/crates/socket2-0.3.12.tar.gz) = 29253
+SHA256 (rust/crates/stable_deref_trait-1.1.1.tar.gz) = dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8
+SIZE (rust/crates/stable_deref_trait-1.1.1.tar.gz) = 8007
+SHA256 (rust/crates/str_stack-0.1.0.tar.gz) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb
+SIZE (rust/crates/str_stack-0.1.0.tar.gz) = 7977
+SHA256 (rust/crates/symbolic-common-7.4.0.tar.gz) = ebdc6030725c03c26dd3a56a19962767c4f2d9a45f1bc67247db6650ef17c71e
+SIZE (rust/crates/symbolic-common-7.4.0.tar.gz) = 23865
+SHA256 (rust/crates/symbolic-demangle-7.4.0.tar.gz) = 2b724d7ed0462fa8104f19b72535f692f6b4dd5ee9c499e6ebbfb86dd4856c16
+SIZE (rust/crates/symbolic-demangle-7.4.0.tar.gz) = 179373
+SHA256 (rust/crates/syn-1.0.33.tar.gz) = e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd
+SIZE (rust/crates/syn-1.0.33.tar.gz) = 204845
+SHA256 (rust/crates/synstructure-0.12.4.tar.gz) = b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701
+SIZE (rust/crates/synstructure-0.12.4.tar.gz) = 18105
+SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
+SIZE (rust/crates/tempfile-3.1.0.tar.gz) = 25823
+SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
+SHA256 (rust/crates/thiserror-1.0.20.tar.gz) = 7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08
+SIZE (rust/crates/thiserror-1.0.20.tar.gz) = 15950
+SHA256 (rust/crates/thiserror-impl-1.0.20.tar.gz) = bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793
+SIZE (rust/crates/thiserror-impl-1.0.20.tar.gz) = 13197
+SHA256 (rust/crates/time-0.1.43.tar.gz) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438
+SIZE (rust/crates/time-0.1.43.tar.gz) = 28653
+SHA256 (rust/crates/tinyvec-0.3.3.tar.gz) = 53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed
+SIZE (rust/crates/tinyvec-0.3.3.tar.gz) = 17860
+SHA256 (rust/crates/tui-0.9.5.tar.gz) = 9533d39bef0ae8f510e8a99d78702e68d1bbf0b98a78ec9740509d287010ae1e
+SIZE (rust/crates/tui-0.9.5.tar.gz) = 123889
+SHA256 (rust/crates/unicode-bidi-0.3.4.tar.gz) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5
+SIZE (rust/crates/unicode-bidi-0.3.4.tar.gz) = 32228
+SHA256 (rust/crates/unicode-normalization-0.1.13.tar.gz) = 6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977
+SIZE (rust/crates/unicode-normalization-0.1.13.tar.gz) = 91691
+SHA256 (rust/crates/unicode-segmentation-1.6.0.tar.gz) = e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0
+SIZE (rust/crates/unicode-segmentation-1.6.0.tar.gz) = 90703
+SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
+SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392
+SHA256 (rust/crates/url-2.1.1.tar.gz) = 829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb
+SIZE (rust/crates/url-2.1.1.tar.gz) = 70383
+SHA256 (rust/crates/uuid-0.8.1.tar.gz) = 9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11
+SIZE (rust/crates/uuid-0.8.1.tar.gz) = 37015
+SHA256 (rust/crates/vcpkg-0.2.10.tar.gz) = 6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c
+SIZE (rust/crates/vcpkg-0.2.10.tar.gz) = 11504
+SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d
+SIZE (rust/crates/void-1.0.2.tar.gz) = 2356
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
+SHA256 (rust/crates/winapi-0.3.9.tar.gz) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.tar.gz) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
+SHA256 (extrawurst-gitui-v0.9.1_GH0.tar.gz) = 2112575a5ec65f744572d38df9f4f79e7547fc2139093a6c9cf2e9ad85bdf547
+SIZE (extrawurst-gitui-v0.9.1_GH0.tar.gz) = 7329936

devel/gitui/pkg-descr

@@ -0,0 +1,14 @@
+Blazing fast terminal client for git written in Rust.
+
+Features:
+* Fast and intuitive keyboard only control
+* Context based help (no need to memorize tons of hot-keys)
+* Inspect, commit, and amend changes (incl. hooks: commit-msg/post-commit)
+* Stage, unstage, revert and reset files and hunks
+* Stashing (save, apply, drop, and inspect)
+* Browse commit log, diff committed changes
+* Scalable terminal UI layout
+* Async input polling
+* Async git API for fluid control
+
+WWW: https://github.com/extrawurst/gitui

devel/gocheese/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gocheese
-PORTVERSION=	2.3.0
+PORTVERSION=	2.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.gocheese.cypherpunks.ru/
 
@@ -18,6 +18,9 @@ PLIST_FILES=	${DOCSDIR}/README \
 		bin/${PORTNAME} \
 		bin/pyshop2packages.sh
 
+do-build:
+	@cd ${WRKSRC} ; ${ENV} GOPATH=${WRKSRC} go build -ldflags="-s -w" -o gocheese go.cypherpunks.ru/gocheese/v2
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/pyshop2packages.sh ${STAGEDIR}${PREFIX}/bin/

devel/gocheese/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1594732607
-SHA256 (gocheese-2.3.0.tar.xz) = 574c3641bbda29572fe57f03986064034d7b2c5844b2cfa40ebf9f75e0186989
-SIZE (gocheese-2.3.0.tar.xz) = 103832
+TIMESTAMP = 1595942597
+SHA256 (gocheese-2.4.0.tar.xz) = 6ee9a436f415ab096d75fa5ad9bfbd6a9bf9ace252514802cbfdf576c057b2ac
+SIZE (gocheese-2.4.0.tar.xz) = 104048

devel/gocheese/files/patch-Makefile

@@ -1,11 +0,0 @@
---- Makefile.orig	2019-12-09 18:44:34 UTC
-+++ Makefile
-@@ -5,7 +5,7 @@ GOPATH != pwd
- VERSION != cat VERSION
- 
- MOD = go.cypherpunks.ru/gocheese/v2
--LDFLAGS = -X main.Version=$(VERSION)
-+LDFLAGS = -s -X main.Version=$(VERSION)
- 
- all: gocheese gocheese.info
- 

devel/ioncube/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ioncube
-DISTVERSION=	10.3.1
+DISTVERSION=	10.4.1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.ioncube.com/loader_downloads/ \
 		http://downloads2.ioncube.com/loader_downloads/ \
@@ -23,7 +23,6 @@ IGNORE_DragonFly=	is unsupported on DragonFly
 ONLY_FOR_ARCHS=	amd64 i386
 NO_BUILD=	yes
 USES=		php:flavors
-IGNORE_WITH_PHP=	74
 
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}

devel/ioncube/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1546222666
-SHA256 (ioncube/10.3.1/ioncube_loaders_fre_11_x86-64.tar.gz) = 26c5a3997138865128b53315c4edbcc2c9117cb1fd57d14747b01b109c949461
-SIZE (ioncube/10.3.1/ioncube_loaders_fre_11_x86-64.tar.gz) = 12021094
-SHA256 (ioncube/10.3.1/ioncube_loaders_fre_11_x86.tar.gz) = 578aa5792e9bc77ab15d2749618a319648b0b49361dca0fd47d26817c3508776
-SIZE (ioncube/10.3.1/ioncube_loaders_fre_11_x86.tar.gz) = 11943309
+TIMESTAMP = 1595868480
+SHA256 (ioncube/10.4.1/ioncube_loaders_fre_11_x86-64.tar.gz) = e309978953dadf4e524eab40cbe725dc7120c56faf570bd78c5a0fa7f75b1998
+SIZE (ioncube/10.4.1/ioncube_loaders_fre_11_x86-64.tar.gz) = 13150650
+SHA256 (ioncube/10.4.1/ioncube_loaders_fre_11_x86.tar.gz) = 97e78e31d098cc6b5c476374d658c213ef6da9fbbb84d483abf0f7d6c804c3ad
+SIZE (ioncube/10.4.1/ioncube_loaders_fre_11_x86.tar.gz) = 13129900

devel/lazygit/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	lazygit
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.20.4
+DISTVERSION=	0.20.9
 CATEGORIES=	devel
 
 MAINTAINER=	meta@FreeBSD.org

devel/lazygit/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1592144245
-SHA256 (jesseduffield-lazygit-v0.20.4_GH0.tar.gz) = 8af316bf9d0916e8b19ce590a80664314a38652af9ef115083686bc9720fa7b9
-SIZE (jesseduffield-lazygit-v0.20.4_GH0.tar.gz) = 9195728
+TIMESTAMP = 1595943458
+SHA256 (jesseduffield-lazygit-v0.20.9_GH0.tar.gz) = d0d8e0d86384bbdfc6f354f740b5396d48ca639c6c63b1d0c65cd70048fdb598
+SIZE (jesseduffield-lazygit-v0.20.9_GH0.tar.gz) = 9196030
 SHA256 (cloudfoundry-jibber_jabber-bcc4c8345a21_GH0.tar.gz) = a460da92a75eba21a3e06f5dc2bd322c73ef7ac33eb4b50434d0ec3784f117fa
 SIZE (cloudfoundry-jibber_jabber-bcc4c8345a21_GH0.tar.gz) = 7371
 SHA256 (creack-pty-8ab47f72e854_GH0.tar.gz) = 77056c58eae3298aeca994093ddc50fe5463a421ae417ac481cd05658ebf716a

devel/libcjson/Makefile

@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cmake compiler:c11
 
 CMAKE_ON=	BUILD_SHARED_AND_STATIC_LIBS ENABLE_CJSON_UTILS ENABLE_TARGET_EXPORT
+CMAKE_OFF=	ENABLE_CUSTOM_COMPILER_FLAGS
 USE_CSTD=	c11
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}

devel/llvm10/Makefile

@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	10.0.0
-PORTREVISION=	2
+DISTVERSION=	10.0.1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -104,6 +104,7 @@ CLANG_USE=		GNOME=libxml2
 COMPILER_RT_DESC=	Sanitizer libraries
 COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
 COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
+COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
 DOCS_BUILD_DEPENDS=	${PY_SPHINX} \
@@ -346,7 +347,7 @@ _BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
 BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}
 
 _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
-_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/share
+_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share
 _COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
 .if ${ARCH} == "amd64"
 _COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
@@ -534,12 +535,9 @@ post-install-COMPILER_RT-on:
 	cd ${WRKDIR}/compiler-rt-build && \
 	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
 .if ${ARCH} == "amd64"
-	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
+	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
 .endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${MV} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/* \
-	    ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
-	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \

devel/llvm10/distinfo

@@ -1,15 +1,15 @@
-TIMESTAMP = 1585093600
-SHA256 (llvm-10.0.0.src.tar.xz) = df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf
-SIZE (llvm-10.0.0.src.tar.xz) = 35733192
-SHA256 (clang-10.0.0.src.tar.xz) = 885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21
-SIZE (clang-10.0.0.src.tar.xz) = 14190012
-SHA256 (compiler-rt-10.0.0.src.tar.xz) = 6a7da64d3a0a7320577b68b9ca4933bdcab676e898b759850e827333c3282c75
-SIZE (compiler-rt-10.0.0.src.tar.xz) = 2093908
-SHA256 (clang-tools-extra-10.0.0.src.tar.xz) = acdf8cf6574b40e6b1dabc93e76debb84a9feb6f22970126b04d4ba18b92911c
-SIZE (clang-tools-extra-10.0.0.src.tar.xz) = 2604944
-SHA256 (lld-10.0.0.src.tar.xz) = b9a0d7c576eeef05bc06d6e954938a01c5396cee1d1e985891e0b1cf16e3d708
-SIZE (lld-10.0.0.src.tar.xz) = 1143340
-SHA256 (lldb-10.0.0.src.tar.xz) = dd1ffcb42ed033f5167089ec4c6ebe84fbca1db4a9eaebf5c614af09d89eb135
-SIZE (lldb-10.0.0.src.tar.xz) = 9637552
-SHA256 (openmp-10.0.0.src.tar.xz) = 3b9ff29a45d0509a1e9667a0feb43538ef402ea8cfc7df3758a01f20df08adfa
-SIZE (openmp-10.0.0.src.tar.xz) = 959016
+TIMESTAMP = 1595444491
+SHA256 (llvm-10.0.1.src.tar.xz) = c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3
+SIZE (llvm-10.0.1.src.tar.xz) = 35270168
+SHA256 (clang-10.0.1.src.tar.xz) = f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24
+SIZE (clang-10.0.1.src.tar.xz) = 14046188
+SHA256 (compiler-rt-10.0.1.src.tar.xz) = d90dc8e121ca0271f0fd3d639d135bfaa4b6ed41e67bd6eb77808f72629658fa
+SIZE (compiler-rt-10.0.1.src.tar.xz) = 2085712
+SHA256 (clang-tools-extra-10.0.1.src.tar.xz) = d093782bcfcd0c3f496b67a5c2c997ab4b85816b62a7dd5b27026634ccf5c11a
+SIZE (clang-tools-extra-10.0.1.src.tar.xz) = 2599404
+SHA256 (lld-10.0.1.src.tar.xz) = 591449e0aa623a6318d5ce2371860401653c48bb540982ccdd933992cb88df7a
+SIZE (lld-10.0.1.src.tar.xz) = 1134580
+SHA256 (lldb-10.0.1.src.tar.xz) = 07abe87c25876aa306e73127330f5f37d270b6b082d50cc679e31b4fc02a3714
+SIZE (lldb-10.0.1.src.tar.xz) = 9632124
+SHA256 (openmp-10.0.1.src.tar.xz) = d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44
+SIZE (openmp-10.0.1.src.tar.xz) = 955492

devel/llvm10/files/compiler-rt/patch-.._compiler-rt-10.0.1.src_lib_sanitizer__common_sanitizer__platform__interceptors.h

@@ -1,5 +1,5 @@
---- ../compiler-rt-10.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ ../compiler-rt-10.0.0.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
+--- ../compiler-rt-10.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
++++ ../compiler-rt-10.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -594,7 +594,7 @@
  #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
  #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD

devel/llvm10/pkg-plist

@@ -837,7 +837,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/SourceCodeBuilders.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Stencil.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Tooling/Transformer/Transformer.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/fuzzer/FuzzedDataProvider.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/DWARF.h
 %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Driver.h
@@ -1755,6 +1754,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ParallelCG.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/Passes.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PreISelIntrinsicLowering.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/PseudoSourceValue.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFGraph.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFLiveness.h
+llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RDFRegisters.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/ReachingDefAnalysis.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocPBQP.h
 llvm%%LLVM_SUFFIX%%/include/llvm/CodeGen/RegAllocRegistry.h
@@ -2829,24 +2831,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/RecordPrinter.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/Trace.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/XRayRecord.h
 llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/profile/InstrProfData.inc
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/allocator_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/asan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/common_interface_defs.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/coverage_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/dfsan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/hwasan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/linux_syscall_hooks.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/lsan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/msan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/netbsd_syscall_hooks.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/scudo_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/tsan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/tsan_interface_atomic.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/sanitizer/ubsan_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_log_interface.h
-%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/include/xray/xray_records.h
 %%GOLD%%llvm%%LLVM_SUFFIX%%/lib/LLVMgold.so
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h
@@ -2914,6 +2898,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/float.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fma4intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fmaintrin.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fuzzer/FuzzedDataProvider.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/fxsrintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/gfniintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/htmintrin.h
@@ -2955,10 +2940,25 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/tmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ppc_wrappers/xmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/s390intrin.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/allocator_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/asan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/common_interface_defs.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/coverage_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/dfsan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/hwasan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/linux_syscall_hooks.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/lsan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/msan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/netbsd_syscall_hooks.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/scudo_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/tsan_interface_atomic.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sanitizer/ubsan_interface.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/sgxintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/shaintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/smmintrin.h
@@ -2976,6 +2976,9 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/x86intrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xmmintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xopintrin.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_log_interface.h
+%%CLANG%%%%COMPILER_RT%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xray/xray_records.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsavecintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveintrin.h
 %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_RELEASE%%/include/xsaveoptintrin.h
@@ -3003,6 +3006,7 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMOptions.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/HandleLLVMStdlib.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVM-Config.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfig.cmake
+llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigExtensions.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMConfigVersion.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMDistributionSupport.cmake
 llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/LLVMExports-%%CMAKE_BUILD_TYPE%%.cmake
@@ -3038,6 +3042,7 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMDebugInfoPDB.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDemangle.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMDlltoolDriver.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMExecutionEngine.a
+llvm%%LLVM_SUFFIX%%/lib/libLLVMExtensions.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMFrontendOpenMP.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMFuzzMutate.a
 llvm%%LLVM_SUFFIX%%/lib/libLLVMGlobalISel.a

devel/llvm11/Makefile

@@ -0,0 +1,626 @@
+# $FreeBSD$
+
+PORTNAME=	llvm
+DISTVERSION=	11.0.0rc1
+PORTREVISION=	0
+CATEGORIES=	devel lang
+MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
+		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
+PKGNAMESUFFIX=	${LLVM_SUFFIX}
+DISTNAME=	${PORTNAME}-${DISTVERSION}.src
+DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX}
+
+MAINTAINER=	brooks@FreeBSD.org
+COMMENT=	LLVM and Clang
+
+.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
+LICENSE+=	LLVM2
+LICENSE_FILE_LLVM2=	${WRKSRC}/LICENSE.TXT
+LICENSE_NAME_LLVM2=	Apache License 2.0 with LLVM Exceptions
+LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE:=	${LICENSE:NARM}
+
+LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
+LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
+LLVM_SUFFIX=	${LLVM_MAJOR}
+PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
+RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
+
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+
+USES=		cmake compiler:c++11-lib libedit perl5 tar:xz \
+		shebangfix
+_USES_PYTHON?=	python:3.6+,build
+USES+=		${_USES_PYTHON}
+USE_LDCONFIG=	${LLVM_PREFIX}/lib
+SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
+		tools/opt-viewer/optrecord.py \
+		tools/opt-viewer/opt-diff.py \
+		tools/opt-viewer/opt-stats.py \
+		tools/opt-viewer/opt-viewer.py
+
+SUB_FILES=	llvm-wrapper.sh
+SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
+
+CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
+CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON
+CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
+CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
+CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
+# Following commit https://github.com/kitware/cmake/commit/956054
+# we need to either change the whole man-shuffle below, or simply
+# redefine CMAKE_INSTALL_MANDIR
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
+CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
+CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
+		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
+		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so
+
+# Disable assertions.  They should be disabled by cmake, but USES=cmake
+# overrides -DCMAKE_*_FLAGS_RELEASE.
+CFLAGS+=	-DNDEBUG
+CXXFLAGS+=	-DNDEBUG
+
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFINE_aarch64=	OPENMP
+OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFAULT_aarch64=	OPENMP
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
+OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFAULT_powerpc64=     ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
+OPTIONS_DEFAULT_powerpc64_13=	GOLD
+OPTIONS_SINGLE=		BACKENDS
+OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
+OPTIONS_SUB=	yes
+
+BE_AMDGPU_DESC=		AMD GPU backend (required by mesa)
+BE_FREEBSD_DESC=	Backends for FreeBSD architectures
+BE_FREEBSD_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}"
+BE_NATIVE_DESC=		Backend(s) for this architecture (${_NATIVE_BACKENDS})
+BE_NATIVE_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}"
+BE_STANDARD_DESC=	All non-experimental backends
+.for BE in FREEBSD NATIVE STANDARD
+BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|}
+.endfor
+CLANG_DESC=	Build clang
+CLANG_EXTRA_PATCHES=	${PATCHDIR}/clang
+CLANG_DISTFILES=	clang-${DISTVERSION}.src${EXTRACT_SUFX}
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+CLANG_PORTDOCS=		clang
+CLANG_PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
+CLANG_SUB_FILES=	xtoolchain.mk
+CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
+			XCXX=clang++${LLVM_SUFFIX} \
+			XCPP=clang-cpp${LLVM_SUFFIX} \
+			XLD=ld.lld${LLVM_SUFFIX} \
+			X_COMPILER_TYPE=clang
+CLANG_USE=		GNOME=libxml2
+COMPILER_RT_DESC=	Sanitizer libraries
+COMPILER_RT_DISTFILES=	compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX}
+COMPILER_RT_EXTRA_PATCHES=	${PATCHDIR}/compiler-rt
+COMPILER_RT_CMAKE_ON=	-DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE}
+COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
+			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
+DOCS_BUILD_DEPENDS=	${PY_SPHINX} \
+			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
+DOCS_CONFLICTS_BUILD=	commonmark-cmark-*
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+EXTRAS_DESC=		Extra clang tools
+EXTRAS_EXTRA_PATCHES=	${PATCHDIR}/extras
+EXTRAS_IMPLIES=		CLANG
+EXTRAS_DISTFILES=	clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX}
+GOLD_DESC=		Build the LLVM Gold plugin for LTO
+GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
+GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
+LIT_DESC=		Install lit and FileCheck test tools
+LIT_VARS=		_USES_PYTHON=python:3.6+
+LLD_DESC=		Install lld, the LLVM linker
+LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
+LLD_LINK_DESC=		Link ld.lld as ld to clang uses it
+LLD_LINK_IMPLIES=	LLD
+LLDB_BUILD_DEPENDS=	swig:devel/swig \
+			${PY_ENUM34}
+LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
+			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so
+LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
+LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
+LLDB_IMPLIES=		CLANG
+LLDB_PORTDOCS=		lldb
+LLDB_VARS=		_USES_PYTHON=python:3.6+
+OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
+OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
+PYCLANG_DESC=	Install python bindings to libclang
+PYCLANG_IMPLIES=	CLANG
+PYCLANG_VARS=	_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
+
+.if defined(WITH_DEBUG)
+CMAKE_BUILD_TYPE=	RelWithDebInfo
+STRIP=
+.endif
+
+# Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel
+.for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP
+WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
+.endfor
+
+PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
+		LLVM_SUFFIX=${LLVM_SUFFIX} \
+		LLVM_MAJOR=${LLVM_MAJOR}
+
+COMMANDS=	${LLVM_COMMANDS}
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+MAN1SRCS+=	bugpoint.1 \
+		dsymutil.1 \
+		llc.1 \
+		lli.1 \
+		llvm-addr2line.1 \
+		llvm-ar.1 \
+		llvm-as.1 \
+		llvm-bcanalyzer.1 \
+		llvm-build.1 \
+		llvm-config.1 \
+		llvm-cov.1 \
+		llvm-cxxfilt.1 \
+		llvm-cxxmap.1 \
+		llvm-diff.1 \
+		llvm-dis.1 \
+		llvm-dwarfdump.1 \
+		llvm-exegesis.1 \
+		llvm-extract.1 \
+		llvm-lib.1 \
+		llvm-lipo.1 \
+		llvm-link.1 \
+		llvm-locstats.1 \
+		llvm-mca.1 \
+		llvm-nm.1 \
+		llvm-objcopy.1 \
+		llvm-objdump.1 \
+		llvm-pdbutil.1 \
+		llvm-profdata.1 \
+		llvm-ranlib.1 \
+		llvm-readelf.1 \
+		llvm-readobj.1 \
+		llvm-size.1 \
+		llvm-stress.1 \
+		llvm-strings.1 \
+		llvm-strip.1 \
+		llvm-symbolizer.1 \
+		opt.1 \
+		tblgen.1
+
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		${LIBNAME}.0 \
+		libLTO.so
+
+EXTRAS_LIBS=	libclangApplyReplacements \
+		libclangChangeNamespace \
+		libclangDaemon \
+		libclangDoc \
+		libclangIncludeFixer \
+		libclangMove \
+		libclangQuery \
+		libclangRename \
+		libclangReorderFields \
+		libclangTidy \
+		libclangTidyGoogleModule \
+		libclangTidyLLVMModule \
+		libclangTidyMiscModule \
+		libclangTidyReadabilityModule \
+		libclangTidyUtils \
+		libfindAllSymbols \
+		libmodernizeCore
+EXTRAS_FILES=	index.js
+EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
+
+.include <bsd.port.options.mk>
+
+# keep in sync with /usr/src/lib/clang/clang.build.mk
+# ----------- start of sync block ------------------
+# Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
+# arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
+# For all other targets, we stick with 'unknown'.
+.if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+TARGET_ABI=	-gnueabihf
+.elif ${ARCH:Marm*}
+TARGET_ABI=	-gnueabi
+.else
+TARGET_ABI=
+.endif
+
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
+# ----------- end of sync block --------------------
+
+.if ${PORT_OPTIONS:MCLANG}
+COMMANDS+=	${CLANG_COMMANDS}
+MAN1SRCS+=	clang.1 \
+		diagtool.1 \
+		scan-build.1
+CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so)
+SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-view \
+		tools/clang/tools/clang-format/clang-format-diff.py \
+		tools/clang/tools/clang-format/git-clang-format \
+		tools/clang/utils/hmaptool/hmaptool
+USES+=		gnome
+.endif
+
+.if ${PORT_OPTIONS:MCOMPILER_RT}
+COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
+.endif
+
+.if ${PORT_OPTIONS:MEXTRAS}
+COMMANDS+=	${EXTRAS_COMMANDS}
+MAN1SRCS+=	extraclangtools.1
+PORTDOCS+=	clang-tools
+PLIST_DIRS+=	${LLVM_PREFIX:S|${PREFIX}/||}/include/clang-tidy/plugin
+SHEBANG_FILES+=	tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
+		tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \
+		tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py
+.endif
+
+.if ${PORT_OPTIONS:MLIT}
+MAN1SRCS+=	lit.1 FileCheck.1
+.endif
+
+.if ${PORT_OPTIONS:MLLD}
+COMMANDS+=	${LLD_COMMANDS}
+PORTDOCS+=	lld
+.endif
+
+.if ${PORT_OPTIONS:MLLDB}
+COMMANDS+=	${LLDB_COMMANDS}
+MAN1SRCS+=	lldb.1
+USES+=		lua
+.endif
+
+OPENMP_PATTERN=	libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
+
+.if ${PORT_OPTIONS:MPYCLANG}
+PYCLANG_PATTERN=	(clang\/(__init__|cindex|enumerations).py)$$
+.endif
+
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/Makefile.COMMANDS"
+
+_FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
+FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
+.if ${ARCH} == amd64
+_NATIVE_BACKENDS=	X86
+.elif ${ARCH} == arm64
+_NATIVE_BACKENDS=	AAarch64
+.elif ${ARCH:Marmv*}
+_NATIVE_BACKENDS=	ARM
+.elif ${ARCH} == i386
+_NATIVE_BACKENDS=	X86
+.elif ${ARCH:Mmips*}
+_NATIVE_BACKENDS=	Mips
+.elif ${ARCH:Mpowerpc*}
+_NATIVE_BACKENDS=	PowerPC
+.elif ${ARCH:Mriscv*}
+_NATIVE_BACKENDS=	RISCV
+.endif
+NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
+.if ${PORT_OPTIONS:MBE_AMDGPU}
+FREEBSD_BACKENDS+=	AMDGPU
+NATIVE_BACKENDS+=	AMDGPU
+.endif
+STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU BPF Hexagon Lanai MSP430 \
+			NVPTX SystemZ WebAssembly XCore
+_BE_LIBS_COMMON=	CodeGen Desc Info
+_BE_LIBS_AArch64=	AsmParser Disassembler Utils
+_BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
+_BE_LIBS_ARM=		AsmParser Disassembler Utils
+_BE_LIBS_BPF=		AsmParser Disassembler 
+_BE_LIBS_Hexagon=	AsmParser Disassembler
+_BE_LIBS_Lanai=		AsmParser Disassembler
+_BE_LIBS_MSP430=	AsmParser Disassembler
+_BE_LIBS_Mips=		AsmParser Disassembler
+_BE_LIBS_PowerPC=	AsmParser Disassembler
+_BE_LIBS_RISCV=		AsmParser Disassembler Utils
+_BE_LIBS_Sparc=		AsmParser Disassembler
+_BE_LIBS_SystemZ=	AsmParser Disassembler
+_BE_LIBS_WebAssembly=	AsmParser Disassembler
+_BE_LIBS_X86=		AsmParser Disassembler
+_BE_LIBS_XCore=		Disassembler
+.for BE in FREEBSD NATIVE STANDARD
+.for BE_ARCH in ${${BE}_BACKENDS}
+_BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
+			${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/}
+.endfor
+.endfor
+BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}
+
+_CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd
+_CRTBLDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share
+_COMPILER_RT_BLACKLISTS=	cfi_blacklist.txt
+.if ${ARCH} == "amd64"
+_COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
+_COMPILER_RT_BLACKLISTS+=	msan_blacklist.txt
+_COMPILER_RT_LIBS= \
+	libclang_rt.asan-preinit-x86_64.a \
+	libclang_rt.asan-x86_64.a \
+	libclang_rt.asan-x86_64.a.syms \
+	libclang_rt.asan-x86_64.so \
+	libclang_rt.asan_cxx-x86_64.a \
+	libclang_rt.asan_cxx-x86_64.a.syms \
+	libclang_rt.builtins-x86_64.a \
+	libclang_rt.cfi-x86_64.a \
+	libclang_rt.cfi_diag-x86_64.a \
+	libclang_rt.dd-x86_64.a \
+	libclang_rt.dyndd-x86_64.so \
+	libclang_rt.fuzzer-x86_64.a \
+	libclang_rt.fuzzer_no_main-x86_64.a \
+	libclang_rt.msan-x86_64.a \
+	libclang_rt.msan-x86_64.a.syms \
+	libclang_rt.msan_cxx-x86_64.a \
+	libclang_rt.msan_cxx-x86_64.a.syms \
+	libclang_rt.profile-x86_64.a \
+	libclang_rt.safestack-x86_64.a \
+	libclang_rt.stats-x86_64.a \
+	libclang_rt.stats_client-x86_64.a \
+	libclang_rt.tsan-x86_64.a \
+	libclang_rt.tsan-x86_64.a.syms \
+	libclang_rt.tsan_cxx-x86_64.a \
+	libclang_rt.tsan_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.a \
+	libclang_rt.ubsan_minimal-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.so \
+	libclang_rt.ubsan_standalone-x86_64.a \
+	libclang_rt.ubsan_standalone-x86_64.a.syms \
+	libclang_rt.ubsan_standalone-x86_64.so \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
+	libclang_rt.xray-basic-x86_64.a \
+	libclang_rt.xray-fdr-x86_64.a \
+	libclang_rt.xray-profiling-x86_64.a \
+	libclang_rt.xray-x86_64.a
+.endif
+.if ${ARCH} == "i386"
+_COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
+_COMPILER_RT_LIBS+= \
+	libclang_rt.asan-i386.a \
+	libclang_rt.asan-i386.so \
+	libclang_rt.asan-preinit-i386.a \
+	libclang_rt.asan_cxx-i386.a \
+	libclang_rt.builtins-i386.a \
+	libclang_rt.cfi-i386.a \
+	libclang_rt.cfi_diag-i386.a \
+	libclang_rt.profile-i386.a \
+	libclang_rt.safestack-i386.a \
+	libclang_rt.stats-i386.a \
+	libclang_rt.stats_client-i386.a \
+	libclang_rt.ubsan_minimal-i386.a \
+	libclang_rt.ubsan_minimal-i386.so \
+	libclang_rt.ubsan_standalone-i386.a \
+	libclang_rt.ubsan_standalone-i386.so \
+	libclang_rt.ubsan_standalone_cxx-i386.a
+.endif
+
+# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
+# PR: 235282
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
+LDFLAGS_armv6=-fuse-ld=lld
+.endif
+
+.if ${ARCH} == "armv6"
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+.endif
+
+.if ! ${OPTIONS_DEFINE:MCOMPILER_RT}
+# Hack to disable COMPILER_RT in plist of unsupported architectures
+PLIST_SUB+=	COMPILER_RT="@comment "
+.else
+.endif
+
+.if ! ${OPTIONS_DEFINE:MGOLD}
+# Hack to disable GOLD in plist of unsupported architectures
+PLIST_SUB+=	GOLD="@comment "
+.else
+.endif
+
+.if ! ${OPTIONS_DEFINE:MOPENMP}
+# Hack to disable OPENMP in plist of unsupported architectures
+PLIST_SUB+=	OPENMP="@comment "
+.else
+.endif
+
+post-extract-CLANG-on:
+	${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang
+
+post-extract-EXTRAS-on:
+	${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra
+
+post-extract-LLD-on:
+	${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld
+
+post-extract-LLDB-on:
+	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
+
+post-extract-OPENMP-on:
+	# FreeBSD/aarch64 needs same va_list handling as Linux/aarch64
+	# see https://reviews.freebsd.org/D21167
+	${REINPLACE_CMD} -e 's/KMP_ARCH_AARCH64) && KMP_OS_LINUX/KMP_ARCH_AARCH64)/' \
+	    ${WRKSRC_openmp}/runtime/src/kmp.h \
+	    ${WRKSRC_openmp}/runtime/src/kmp_csupport.cpp \
+	    ${WRKSRC_openmp}/runtime/src/kmp_runtime.cpp \
+	    ${WRKSRC_openmp}/runtime/src/kmp_gsupport.cpp
+	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
+
+post-patch:
+	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
+	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
+	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
+	    ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \
+	    ${WRKSRC}/utils/lit/lit/formats/*.py
+	${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \
+	    ${WRKSRC}/CMakeLists.txt
+
+post-patch-CLANG-on:
+	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
+	    ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp
+	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
+	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \
+	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \
+	    ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format
+
+post-patch-LLD-on:
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
+			${PATCH_WRKSRC}/tools/lld/docs/conf.py
+
+post-build-COMPILER_RT-on:
+	${MKDIR} ${WRKDIR}/compiler-rt-build
+	cd ${WRKDIR}/compiler-rt-build && \
+	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
+	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
+	    ${WRKSRC_compiler_rt} && \
+	    ${MAKE_ENV} ${MAKE_CMD}
+
+post-install:
+	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
+	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
+.endfor
+
+post-install-DOCS-on:
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR}
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+.if ${PORT_OPTIONS:MCLANG}
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+.endif
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
+	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
+	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
+
+post-install-COMPILER_RT-on:
+	cd ${WRKDIR}/compiler-rt-build && \
+	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
+.if ${ARCH} == "amd64"
+	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
+.endif
+	${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}
+
+post-install-LIT-on:
+	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \
+			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
+	${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \
+			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
+	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
+
+post-install-LLD-on:
+	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
+
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
+do-test:
+	if [ `${ID} -u` = 0 ]; then \
+		${CHOWN} -R nobody ${WRKSRC}/test; \
+		su -m nobody -c ${TEST_CMD}; \
+	else \
+		${SH} -c ${TEST_CMD}; \
+	fi
+
+build-plist:
+	${RM} ${PLIST} ${PLIST}.tmp
+	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
+	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+.endfor
+.for command in ${LIT_COMMANDS}
+	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
+.endfor
+
+	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v '_blacklist.txt$$' | \
+	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
+	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	${AWK} '{ \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
+		{printf "%%%%COMPILER_RT%%%%"} \
+	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
+	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
+	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
+	    if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \
+	    if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
+	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
+	${RM} ${PLIST}.tmp
+
+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
+.include <bsd.port.post.mk>

devel/llvm11/Makefile.COMMANDS

@@ -0,0 +1,109 @@
+# $FreeBSD$
+
+LLVM_COMMANDS=	\
+		bugpoint \
+		dsymutil \
+		llc \
+		lli \
+		llvm-addr2line \
+		llvm-ar \
+		llvm-as \
+		llvm-bcanalyzer \
+		llvm-cat \
+		llvm-cfi-verify \
+		llvm-config \
+		llvm-cov \
+		llvm-cvtres \
+		llvm-cxxmap \
+		llvm-diff \
+		llvm-dis \
+		llvm-dlltool \
+		llvm-dwarfdump \
+		llvm-dwp \
+		llvm-elfabi \
+		llvm-exegesis \
+		llvm-extract \
+		llvm-gsymutil \
+		llvm-ifs \
+		llvm-install-name-tool \
+		llvm-jitlink \
+		llvm-link \
+		llvm-lipo \
+		llvm-mc \
+		llvm-mca \
+		llvm-ml \
+		llvm-modextract \
+		llvm-mt \
+		llvm-nm \
+		llvm-objcopy \
+		llvm-objdump \
+		llvm-opt-report \
+		llvm-pdbutil \
+		llvm-profdata \
+		llvm-ranlib \
+		llvm-rc \
+		llvm-readelf \
+		llvm-readobj \
+		llvm-reduce \
+		llvm-rtdyld \
+		llvm-size \
+		llvm-split \
+		llvm-stress \
+		llvm-strings \
+		llvm-strip \
+		llvm-symbolizer \
+		llvm-tblgen \
+		llvm-undname \
+		llvm-xray \
+		opt \
+		sancov
+
+CLANG_COMMANDS=	\
+		c-index-test \
+		clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-extdef-mapping \
+		clang-format \
+		clang-offload-bundler \
+		clang-offload-wrapper \
+		clang-rename \
+		clang-scan-deps \
+		diagtool \
+		hmaptool \
+		scan-build \
+		scan-view
+
+EXTRAS_COMMANDS= \
+		clangd \
+		clang-apply-replacements \
+		clang-change-namespace \
+		clang-doc \
+		clang-include-fixer \
+		clang-move \
+		clang-query \
+		clang-reorder-fields \
+		clang-tidy \
+		find-all-symbols \
+		modularize \
+		pp-trace
+
+LIT_COMMANDS=	\
+		FileCheck \
+		lit \
+		llvm-lit
+
+LLD_COMMANDS=	\
+		ld.lld \
+		ld64.lld \
+		lld \
+		lld-link \
+		wasm-ld
+
+LLDB_COMMANDS=	\
+		lldb \
+		lldb-argdumper \
+		lldb-instr \
+		lldb-server \
+		lldb-vscode

devel/llvm11/distinfo

@@ -0,0 +1,15 @@
+TIMESTAMP = 1595962846
+SHA256 (llvm-11.0.0rc1.src.tar.xz) = 039fef64c7eda73e4db49d4c29fc92522087e17231bbf447b65e78e657a8de86
+SIZE (llvm-11.0.0rc1.src.tar.xz) = 39459388
+SHA256 (clang-11.0.0rc1.src.tar.xz) = 0eacdc50fdeef33472c864998723779059cfd81154e539f6fbe34cd681edcf49
+SIZE (clang-11.0.0rc1.src.tar.xz) = 14977136
+SHA256 (compiler-rt-11.0.0rc1.src.tar.xz) = c686ead7e72cfb74d6c899cdab413a22c6ed3c1dd84af83352e4b3339c211714
+SIZE (compiler-rt-11.0.0rc1.src.tar.xz) = 2141924
+SHA256 (clang-tools-extra-11.0.0rc1.src.tar.xz) = 001fc3dc7ae1459a661901609cdb40872f155458fe70cf7984b2c74155ab44c9
+SIZE (clang-tools-extra-11.0.0rc1.src.tar.xz) = 1512152
+SHA256 (lld-11.0.0rc1.src.tar.xz) = 9ec9dc78ac73243bc196b4ca0f856086f7fc5b8978ddd6a572f702752b42bc3c
+SIZE (lld-11.0.0rc1.src.tar.xz) = 1243204
+SHA256 (lldb-11.0.0rc1.src.tar.xz) = 70cf7c4157021b3a95f23aafb6ea361913166f12afa8d43f63595f53c672ebef
+SIZE (lldb-11.0.0rc1.src.tar.xz) = 9741300
+SHA256 (openmp-11.0.0rc1.src.tar.xz) = 6c5919a924f59c5981512020e307e47f594d825db8fe5d66da0e5ce82064e6e1
+SIZE (openmp-11.0.0rc1.src.tar.xz) = 975016

devel/llvm11/files/clang/patch-fformat_extensions.diff

@@ -0,0 +1,44 @@
+diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def
+--- tools/clang/include/clang/Basic/LangOptions.def	2015-07-30 22:47:41 UTC
++++ tools/clang/include/clang/Basic/LangOptions.def
+@@ -114,6 +114,7 @@
+ LANGOPT(RTTIData          , 1, 1, "emit run-time type information data")
+ LANGOPT(MSBitfields       , 1, 0, "Microsoft-compatible structure layout")
+ LANGOPT(Freestanding, 1, 0, "freestanding implementation")
++LANGOPT(FormatExtensions  , 1, 0, "FreeBSD format extensions")
+ LANGOPT(NoBuiltin         , 1, 0, "disable builtin functions")
+ LANGOPT(NoMathBuiltin     , 1, 0, "disable math builtin functions")
+ LANGOPT(GNUAsm            , 1, 1, "GNU-style inline assembly")
+diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td
+--- tools/clang/include/clang/Driver/Options.td.orig	2020-01-30 15:29:37.000000000 +0000
++++ tools/clang/include/clang/Driver/Options.td	2020-01-31 23:26:44.132423000 +0000
+@@ -1211,6 +1211,8 @@
+ 
+ def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>,
+   HelpText<"Assert that the compilation takes place in a freestanding environment">;
++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>,
++  HelpText<"Enable FreeBSD kernel specific format string extensions">;
+ def fgnuc_version_EQ : Joined<["-"], "fgnuc-version=">, Group<f_Group>,
+   HelpText<"Sets various macros to claim compatibility with the given GCC version (default is 4.2.1)">,
+   Flags<[CC1Option, CoreOption]>;
+--- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig	2017-09-14 19:36:28.212240000 +0100
++++ tools/clang/lib/Driver/ToolChains/Clang.cpp	2017-09-14 19:35:59.296165000 +0100
+@@ -3202,6 +3202,7 @@
+ 
+   // Forward -f (flag) options which we can pass directly.
+   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
++  Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
+   Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names);
+   // Emulated TLS is enabled by default on Android and OpenBSD, and can be enabled
+diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp
+--- tools/clang/lib/Frontend/CompilerInvocation.cpp	2015-07-30 22:47:41 UTC
++++ tools/clang/lib/Frontend/CompilerInvocation.cpp
+@@ -1543,6 +1543,7 @@
+   Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false);
+   Opts.ShortEnums = Args.hasArg(OPT_fshort_enums);
+   Opts.Freestanding = Args.hasArg(OPT_ffreestanding);
++  Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions);
+   Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding;
+   Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin);
+   Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new);

devel/llvm11/files/clang/patch-fopenmp.diff

@@ -0,0 +1,14 @@
+--- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig	2017-05-10 17:18:56.000000000 +0000
++++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp	2017-05-10 23:01:17.087686000 +0000
+@@ -441,7 +441,10 @@
+ 
+   switch (TC.getDriver().getOpenMPRuntime(Args)) {
+   case Driver::OMPRT_OMP:
+-    CmdArgs.push_back("-lomp");
++    if (TC.getTriple().getOS() != llvm::Triple::FreeBSD || TC.isCrossCompiling() || !llvm::sys::fs::exists("%%LLVM_PREFIX%%/lib/libomp.so"))
++      CmdArgs.push_back("-lomp");
++    else
++      CmdArgs.push_back("%%LLVM_PREFIX%%/lib/libomp.so");
+     break;
+   case Driver::OMPRT_GOMP:
+     CmdArgs.push_back("-lgomp");

devel/llvm11/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt

@@ -0,0 +1,32 @@
+--- tools/clang/lib/Headers/CMakeLists.txt.orig
++++ tools/clang/lib/Headers/CMakeLists.txt
+@@ -72,7 +72,6 @@
+   inttypes.h
+   invpcidintrin.h
+   iso646.h
+-  limits.h
+   lwpintrin.h
+   lzcntintrin.h
+   mm3dnow.h
+@@ -98,13 +97,7 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+   stdnoreturn.h
+   tbmintrin.h
+   tgmath.h
+@@ -113,7 +106,6 @@
+   unwind.h
+   vadefs.h
+   vaesintrin.h
+-  varargs.h
+   vecintrin.h
+   vpclmulqdqintrin.h
+   waitpkgintrin.h

devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py

@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/clang-format-sublime.py.orig
++++ tools/clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@
+ import subprocess
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ 
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for

devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format.py

@@ -0,0 +1,11 @@
+--- tools/clang/tools/clang-format/clang-format.py.orig	2015-09-08 20:44:00 UTC
++++ tools/clang/tools/clang-format/clang-format.py
+@@ -34,7 +34,7 @@ import vim
+ 
+ # set g:clang_format_path to the path to clang-format if it is not on the path
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+   binary = vim.eval('g:clang_format_path')
+ 

devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_git-clang-format

@@ -0,0 +1,32 @@
+
+$FreeBSD$
+
+--- tools/clang/tools/clang-format/git-clang-format.orig
++++ tools/clang/tools/clang-format/git-clang-format
+@@ -90,7 +90,7 @@
+     usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,
+     description=desc)
+   p.add_argument('--binary',
+-                 default=config.get('clangformat.binary', 'clang-format'),
++                 default=config.get('clangformat.binary', 'clang-format%%LLVM_SUFFIX%%'),
+                  help='path to clang-format'),
+   p.add_argument('--commit',
+                  default=config.get('clangformat.commit', 'HEAD'),
+@@ -344,7 +344,7 @@
+ 
+ 
+ def run_clang_format_and_save_to_tree(changed_lines, revision=None,
+-                                      binary='clang-format', style=None):
++                                      binary='clang-format%%LLVM_SUFFIX%%', style=None):
+   """Run clang-format on each file and save the result to a git tree.
+ 
+   Returns the object ID (SHA-1) of the created tree."""
+@@ -397,7 +397,7 @@
+ 
+ 
+ def clang_format_to_blob(filename, line_ranges, revision=None,
+-                         binary='clang-format', style=None):
++                         binary='clang-format%%LLVM_SUFFIX%%', style=None):
+   """Run clang-format on the given file and save the result to a git blob.
+ 
+   Runs on the file in `revision` if not None, or on the file in the working

devel/llvm11/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer

@@ -0,0 +1,12 @@
+--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig
++++ tools/clang/tools/scan-build/libexec/ccc-analyzer
+@@ -81,6 +81,9 @@
+   if (-x "/usr/bin/xcrun") {
+     $UseXCRUN = 1;
+   }
++} elsif (`uname -s` eq "FreeBSD\n") {
++  $DefaultCCompiler = 'cc';
++  $DefaultCXXCompiler = 'c++';
+ } else {
+   $DefaultCCompiler = 'gcc';
+   $DefaultCXXCompiler = 'g++';

devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h

@@ -0,0 +1,11 @@
+--- ../compiler-rt-11.0.0rc1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
++++ ../compiler-rt-11.0.0rc1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -597,7 +597,7 @@
+ #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
+ #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
+ #define SANITIZER_INTERCEPT_QSORT \
+-  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
++  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
+ #define SANITIZER_INTERCEPT_QSORT_R (SI_LINUX && !SI_ANDROID)
+ // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
+ // calling it and assuming that it does not clobber registers.