MFH: r550753

update firefox to 81.0.1 (rc1)

Release Notes (soon):
  https://www.mozilla.org/en-US/firefox/81.0.1/releasenotes/

Approved by:	portmgr (blanket: web browser)

Mk/bsd.gecko.mk

@@ -77,7 +77,7 @@ BINARY_ALIAS+=	python3=python${PYTHON3_DEFAULT}
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
-				rust-cbindgen>=0.14.1:devel/rust-cbindgen \
+				rust-cbindgen>=0.14.3:devel/rust-cbindgen \
 				${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \
 				${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \
 				node:www/node
@@ -234,8 +234,6 @@ MOZ_OPTIONS+=	--disable-libproxy
 
 .if ${PORT_OPTIONS:MALSA}
 BUILD_DEPENDS+=	${LOCALBASE}/include/alsa/asoundlib.h:audio/alsa-lib
-RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-RUN_DEPENDS+=	alsa-lib>=1.1.1_1:audio/alsa-lib
 MOZ_OPTIONS+=	--enable-alsa
 .endif
 

arabic/libreoffice/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1590778599
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = ed5980590fa9529c9061c6f46cc9c70248b6a631e557149eb3265a1f12eb26b5
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_ar.tar.gz) = 1655105
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 831029269cae67610f5761fb087a86c6e769bfe5532514eee8486a2f510437df
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224552
+TIMESTAMP = 1597379188
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_ar.tar.gz) = 9405d2a9ecaf49a61949450cc502510400b08ab768e6c2e096e820a1dbc1cf71
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_ar.tar.gz) = 1656466
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_ar.tar.gz) = 39adf59da8120609ac3c8cd61f300eeb7999a0e35340ed4f3523105553c6b3c8
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_ar.tar.gz) = 2224407

archivers/arc/files/patch-arclzw.c

@@ -1,6 +1,21 @@
 --- arclzw.c.orig	2010-08-07 13:06:42 UTC
 +++ arclzw.c
-@@ -560,7 +560,7 @@ decomp(squash, f, t)		/* decompress a fi
+@@ -57,9 +57,11 @@ static VOID     putcode();
+ #define NOT_FND  0xFFFF
+ 
+ extern u_char	*pinbuf;
+-u_char		*inbeg, *inend;
+-u_char          *outbuf;
+-u_char          *outbeg, *outend; 
++u_char		*inbeg;
++u_char		*inend;
++extern u_char	*outbuf;
++u_char		*outbeg;
++extern u_char	*outend; 
+ 
+ static int      sp;		/* current stack pointer */
+ static int	inflag;
+@@ -560,7 +562,7 @@ decomp(squash, f, t)		/* decompress a file */
  		 */
  		if (code >= free_ent) {
  			if (code > free_ent) {

archivers/arc/files/patch-arcunp.c

@@ -1,6 +1,17 @@
 --- arcunp.c.orig	2010-08-07 13:06:42 UTC
 +++ arcunp.c
-@@ -122,7 +122,7 @@ unpack(f, t, hdr)		/* unpack an archive 
+@@ -39,8 +39,8 @@ extern int	lastc;
+ #define NOHIST 0		/* no relevant history */
+ #define INREP 1			/* sending a repeated value */
+ 
+-short    crcval;		/* CRC check value */
+-long     stdlen;		/* bytes to read */
++extern short    crcval;		/* CRC check value */
++extern long     stdlen;		/* bytes to read */
+ #if	!DOS
+ static int	gotcr;		/* got a carriage return? */
+ #endif
+@@ -122,7 +122,7 @@ unpack(f, t, hdr)		/* unpack an archive entry */
  		break;
  
  	default:		/* unknown method */
@@ -9,7 +20,7 @@
  			printf("I don't know how to unpack file %s\n", hdr->name);
  			printf("I think you need a newer version of ARC\n");
  			nerrs++;
-@@ -134,7 +134,7 @@ unpack(f, t, hdr)		/* unpack an archive 
+@@ -134,7 +134,7 @@ unpack(f, t, hdr)		/* unpack an archive entry */
  	/* cleanups common to all methods */
  
  	if (crcval != hdr->crc) {

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
+

archivers/brotli/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	brotli
-PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTVERSION=	1.0.9
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	archivers devel

archivers/brotli/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1540423662
-SHA256 (google-brotli-v1.0.7_GH0.tar.gz) = 4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c
-SIZE (google-brotli-v1.0.7_GH0.tar.gz) = 23827908
+TIMESTAMP = 1598538126
+SHA256 (google-brotli-v1.0.9_GH0.tar.gz) = f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+SIZE (google-brotli-v1.0.9_GH0.tar.gz) = 486984

astro/wmglobe/Makefile

@@ -18,8 +18,9 @@ LIB_DEPENDS=	libwraster.so:x11-wm/libwraster
 USES=		xorg
 USE_XORG=	x11 xext xpm
 
-PLIST_FILES=	bin/wmglobe \
-		man/man1/wmglobe.1.gz
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 
+PLIST_FILES=	bin/wmglobe \
+		man/man1/wmglobe.1.gz
+
 .include <bsd.port.mk>

astro/wmglobe/files/patch-src_myconvert.c

@@ -0,0 +1,20 @@
+--- src/myconvert.c.orig	2020-09-16 20:04:28 UTC
++++ src/myconvert.c
+@@ -253,7 +253,7 @@ static RXImage *image2PseudoColor(RContext * ctx, RIma
+     const unsigned short bmask = rmask;
+     unsigned short *rtable, *gtable, *btable;
+     const int cpccpc = cpc * cpc;
+-    unsigned char *data;
++    char *data;
+     int ofs;
+     /*register unsigned char maxrgb = 0xff; */
+ 
+@@ -420,7 +420,7 @@ static RXImage *image2GrayScale(RContext * ctx, RImage
+     const int cpc = ctx->attribs->colors_per_channel;
+     unsigned short gmask;
+     unsigned short *table;
+-    unsigned char *data;
++    char *data;
+     int ofs;
+     /*register unsigned char maxrgb = 0xff; */
+ 

astro/wmglobe/files/patch-src_rend.c

@@ -0,0 +1,23 @@
+--- src/rend.c.orig	2020-09-15 14:31:47 UTC
++++ src/rend.c
+@@ -33,6 +33,20 @@
+ 
+ #include "wmglobe.h"
+ 
++/*
++ * variables globales
++ */
++
++double solu[DIAMETRE][DIAMETRE][3];
++int tabsolu[DIAMETRE][DIAMETRE];
++double moon_lat,moon_long;
++struct timeval tlast, tnext, trend, tdelay, tini, tbase;
++time_t tsunpos;
++double center_dist;
++double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
++double c_coef, b_coef;
++int radius_proj, aml;
++
+ static RColor mygetMapColorLinear
+     (double longitude, double latitude, double angle);
+ 

astro/wmglobe/files/patch-src_wmglobe.c

@@ -0,0 +1,29 @@
+--- src/wmglobe.c.orig	2001-08-12 15:41:22 UTC
++++ src/wmglobe.c
+@@ -35,7 +35,17 @@
+ #include "defnimap.xpm"
+ #endif
+ 
++/*
++ * variables globales
++ */
+ 
++Display *dpy;
++Pixmap pix, pixmask;
++XEvent Event;
++RImage *map, *small, *mapnight;
++Window iconwin, win;
++GC NormalGC;
++double marker[MAX_MARKERS][3];
+ 
+ 
+ 
+@@ -414,7 +424,7 @@ int main(int argc, char *argv[])
+ 	    if (do_something) {
+ 		if (!myRConvertImage(ctx, small, &pix)) {
+ 		    fprintf(stderr, "crash !?\n");
+-		    fprintf(stderr, RMessageForError(RErrorCode));
++		    fprintf(stderr, "%s", RMessageForError(RErrorCode));
+ 		    exit(1);
+ 		}
+ 		wmg.pixmap = pix;

astro/wmglobe/files/patch-src_wmglobe.h

@@ -0,0 +1,141 @@
+--- src/wmglobe.h.orig	2001-08-12 15:41:22 UTC
++++ src/wmglobe.h
+@@ -34,7 +34,6 @@
+ #include <ctype.h>		/*toupper */
+ #include <stdarg.h>
+ #include <time.h>
+-#include <sys/timeb.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <X11/Xlib.h>
+@@ -83,17 +82,17 @@ typedef struct {
+     int right;
+ } MOUSE_REGION;
+ 
+-MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
++extern MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
+ 
+ typedef struct MPO {
+     int r, g, b;
+ } MPO;
+ 
+-MPO *md[4], *mn[4];
++extern MPO *md[4], *mn[4];
+ 
+-double solu[DIAMETRE][DIAMETRE][3];
+-int tabsolu[DIAMETRE][DIAMETRE];
+-int solution;
++extern double solu[DIAMETRE][DIAMETRE][3];
++extern int tabsolu[DIAMETRE][DIAMETRE];
++extern int solution;
+ 
+ typedef struct {
+     Pixmap pixmap;
+@@ -102,72 +101,72 @@ typedef struct {
+ } XpmIcon;
+ 
+ 
+-Display *dpy;
++extern Display *dpy;
+ 
+-char *dayfile, *nightfile, *dpy_name;
++extern char *dayfile, *nightfile, *dpy_name;
+ 
+-Pixmap pix, pixmask;
++extern Pixmap pix, pixmask;
+ 
+-XEvent Event;
++extern XEvent Event;
+ 
+-RImage *map, *small, *mapnight;
++extern RImage *map, *small, *mapnight;
+ 
+-XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
++extern XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
+ 
+-Window iconwin, win;
+-int onlyshape, option_iw;
+-GC NormalGC;
++extern Window iconwin, win;
++extern int onlyshape, option_iw;
++extern GC NormalGC;
+ 
+ /********* rendering********/
+ 
+ #if WITH_MARKERS
+-double marker[MAX_MARKERS][3];
+-int nb_marker, sun_marker, moon_marker;
+-RColor sun_col, moon_col;
+-double moon_lat,moon_long;
++extern double marker[MAX_MARKERS][3];
++extern int nb_marker, sun_marker, moon_marker;
++extern RColor sun_col, moon_col;
++extern double moon_lat,moon_long;
+ #endif
+ 
+-double delay, time_multi;
++extern double delay, time_multi;
+ /*
+  * struct timeval delta_tim, last_tim, next_tim, render_tim, base_tim,
+  *  vec_tim;
+  * 
+  * time_t beg_time, ini_time,t1901;
+  */
+-struct timeval tlast, tnext, trend, tdelay, tini, tbase;
+-time_t tsunpos;
++extern struct timeval tlast, tnext, trend, tdelay, tini, tbase;
++extern time_t tsunpos;
+ 
+-int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
++extern int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
+ 
+-int typecadre, p_type, use_nightmap, use_default_nightmap, use_nmap_ini, 
+-firstTime, stoprand, do_something, iop;
++extern int typecadre, p_type, use_nightmap, use_default_nightmap,
++       use_nmap_ini, firstTime, stoprand, do_something, iop;
+ 
+-double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
+-double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
++extern double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
++extern double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
+ 
+-double sun_lat;
+-double sun_long;
++extern double sun_lat;
++extern double sun_long;
+ 
+-double fov;
+-double radius;
+-double proj_dist;		/* distance to projection plane */
++extern double fov;
++extern double radius;
++extern double proj_dist;		/* distance to projection plane */
+ 
+-double center_dist;		/*  distance to center of earth */
++extern double center_dist;		/*  distance to center of earth */
+ 
+-double ambient_light;		/* how dark is the dark side? */
++extern double ambient_light;		/* how dark is the dark side? */
+ 
+-double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
++extern double light_x, light_y, light_z;	/* vector of sunlight with lengt 1 */
+ 
+-double c_coef, b_coef;
+-double zoom;
+-int radius_proj, aml;		/* radius of sphere on screen */
++extern double c_coef, b_coef;
++extern double zoom;
++extern int radius_proj, aml;		/* radius of sphere on screen */
+ 
+-RColor noir;
++extern RColor noir;
+ #ifdef DEBUG
+-double minhz;
++extern double minhz;
+ #endif
+ 
+-int stable;
++extern int stable;
+ 
+ /****************************************************************/
+ /* Function Prototypes                                          */

astro/wmglobe/files/patch-src_wmgutil.c

@@ -0,0 +1,40 @@
+--- src/wmgutil.c.orig	2020-09-15 14:29:30 UTC
++++ src/wmgutil.c
+@@ -32,6 +32,37 @@
+ #include "scrtime.xpm"
+ #include "scrdiv.xpm"
+ 
++/*
++ * variables globales
++ */
++
++MOUSE_REGION mouse_region[MAX_MOUSE_REGION];
++MPO *md[4], *mn[4];
++int solution;
++char *dayfile, *nightfile, *dpy_name;
++XpmIcon screenpos, scrdate, scrdiv, numpix, txtpix, wmg;
++int onlyshape, option_iw;
++int nb_marker, sun_marker, moon_marker;
++RColor sun_col, moon_col;
++double delay, time_multi;
++int sens, fun, funx, funy, oknimap, mratiox, mratioy, gotoscr;
++int typecadre, p_type, use_nightmap, use_default_nightmap, use_nmap_ini,
++    firstTime, stoprand, do_something, iop;
++double v_lat, v_long, old_dvlat, old_dvlong, dv_lat, dv_long;
++double dlat, dlong, addlat, addlong, ratiox, ratioy, dawn;
++double sun_lat;
++double sun_long;
++double fov;
++double radius;
++double proj_dist;		/* distance to projection plane */
++double ambient_light;
++double zoom;
++RColor noir;
++double minhz;
++int stable;
++
++
++
+ static void move_earth(double vla, double vlo);
+ static int flush_expose(Window w);
+ static void mqparam();

audio/Makefile

@@ -658,6 +658,7 @@
     SUBDIR += py-fmoo-audiotools
     SUBDIR += py-gmusicapi
     SUBDIR += py-gmusicproxy
+    SUBDIR += py-gtts
     SUBDIR += py-hsaudiotag
     SUBDIR += py-karaoke
     SUBDIR += py-mpd

audio/adplay/Makefile

@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libadplug.so:audio/libadplug \
 		libbinio.so:devel/libbinio
 
-USES=		autoreconf libtool pkgconfig
+USES=		autoreconf compiler:c++11-lang libtool pkgconfig
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	adplug

audio/audacity/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	audacity
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 DISTVERSIONPREFIX=	Audacity-
 CATEGORIES=	audio
 
@@ -35,18 +35,19 @@ CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system \
 		-Daudacity_use_portsmf:STRING=local \
 		-Daudacity_use_portmixer:STRING=local \
 		-Daudacity_use_portaudio:STRING=system
+CMAKE_OFF=	audacity_use_pch
 
 OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
-			MIDI NYQUIST OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
+			MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
 			VORBIS VST
-OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI NYQUIST OGG SBSMS \
+OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD MIDI OGG SBSMS \
 			SOUNDTOUCH TWOLAME VAMP VORBIS VST
+OPTIONS_EXCLUDE_i386=	SBSMS
 
 LAME_DESC=		Use lame for import and export support
 LV2_DESC=		Add LV2 plug-in support
 MAD_DESC=		Use libmad for mp2/3 decoding support
 MIDI_DESC=		MIDI support
-NYQUIST_DESC=		Nyquist synthesis and composition support
 SBSMS_DESC=		Use libsbsms for pitch and tempo changing
 SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
 TWOLAME_DESC=		Use libtwolame for MP2 export support
@@ -99,9 +100,6 @@ MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off
 # TODO: fix NLS support properly
 PLIST_SUB+=		NLS=""
 
-NYQUIST_CMAKE_ON=	-Daudacity_use_nyquist:STRING=local
-NYQUIST_CMAKE_OFF=	-Daudacity_use_nyquist:STRING=off
-
 OGG_CMAKE_ON=		-Daudacity_use_ogg:STRING=system
 OGG_CMAKE_OFF=		-Daudacity_use_ogg:STRING=local
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
@@ -128,6 +126,14 @@ VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 
 VST_CMAKE_BOOL=		audacity_use_vst
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+CMAKE_ARGS+=	-DHAVE_MMX:BOOL=OFF \
+		-DHAVE_SSE:BOOL=OFF \
+		-DHAVE_SSE2:BOOL=OFF
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
 		/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt

audio/audacity/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1589881433
-SHA256 (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 50240f07471373a7e5c2df65cc26eeeaaced9a0850ad1f95cb795f171ea3009f
-SIZE (audacity-audacity-Audacity-2.4.1_GH0.tar.gz) = 63935461
+TIMESTAMP = 1593304211
+SHA256 (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = cdb4800c8e9d1d4ca19964caf8d24000f80286ebd8a4db566c2622449744c099
+SIZE (audacity-audacity-Audacity-2.4.2_GH0.tar.gz) = 61248430

audio/audacity/files/patch-cmake-proxies_CMakeLists.txt

@@ -1,7 +1,7 @@
---- cmake-proxies/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
+--- cmake-proxies/CMakeLists.txt.orig	2020-06-19 15:16:47 UTC
 +++ cmake-proxies/CMakeLists.txt
-@@ -150,7 +150,7 @@ addlib( lame               lame        LAME        YES
- addlib( lib-widget-extra   libextra    EXTRA       YES   YES   "" )
+@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES
+ addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
  addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
  addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
 -addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )

audio/audacity/files/patch-cmake-proxies_sbsms_CMakeLists.txt

@@ -1,10 +0,0 @@
---- cmake-proxies/sbsms/CMakeLists.txt.orig	2020-05-19 09:43:53 UTC
-+++ cmake-proxies/sbsms/CMakeLists.txt
-@@ -28,6 +28,7 @@ list( APPEND INCLUDES
- list( APPEND OPTIONS
-    PRIVATE
-       $<$<C_COMPILER_ID:AppleClang,Clang,GNU>:-Wno-enum-compare>
-+      ${SSE_FLAG}
- )
- 
- find_package( Threads )

audio/audacity/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h

@@ -1,6 +1,6 @@
 --- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2018-10-01 14:07:33 UTC
 +++ lib-src/libnyquist/nyquist/cmt/cext.h
-@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
+@@ -61,7 +61,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
  #include <malloc.h>
  #endif
  

audio/audacity/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h

@@ -1,6 +1,6 @@
 --- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
 +++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
-@@ -160,6 +160,15 @@ extern long ptrtoabs();
+@@ -161,6 +161,15 @@ extern long ptrtoabs();
  #endif
  #endif
  

audio/audacity/files/patch-lib-src_portsmf_allegro.h

@@ -0,0 +1,10 @@
+--- lib-src/portsmf/allegro.h.orig	2020-07-18 17:54:26 UTC
++++ lib-src/portsmf/allegro.h
+@@ -51,6 +51,7 @@
+ #include <assert.h>
+ #include <istream>
+ #include <ostream>
++#include <cstring>
+ 
+ #define ALG_EPS 0.000001 // epsilon
+ #define ALG_DEFAULT_BPM 100.0 // default tempo

audio/audacity/files/patch-src_AboutDialog.cpp

@@ -0,0 +1,11 @@
+--- src/AboutDialog.cpp.orig	2020-06-28 06:25:54 UTC
++++ src/AboutDialog.cpp
+@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
+ // RevisionIdent.h may contain #defines like these ones:
+ //#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
+ //#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
+-#include <RevisionIdent.h>
++//#include <RevisionIdent.h>
+ 
+ #ifndef REV_TIME
+ #define REV_TIME "unknown date and time"

audio/audacity/files/patch-src_AudioIO.cpp

@@ -1,6 +1,6 @@
---- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
+--- src/AudioIO.cpp.orig	2020-06-19 15:16:47 UTC
 +++ src/AudioIO.cpp
-@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback
+@@ -491,7 +491,6 @@ time warp info and AudioIOListener and whether the pla
     #define ROUND(x) (int) ((x)+0.5)
     //#include <string.h>
  //   #include "../lib-src/portmidi/pm_common/portmidi.h"
@@ -8,7 +8,7 @@
     #include "NoteTrack.h"
  #endif
  
-@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)
+@@ -815,13 +814,22 @@ struct AudioIoCallback::ScrubState (private)
  // return the system time as a double
  static double streamStartTime = 0; // bias system time to small number
  

audio/audacity/files/patch-src_FFmpeg.h

@@ -1,6 +1,6 @@
 --- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
 +++ src/FFmpeg.h
-@@ -667,7 +667,7 @@ extern "C" {
+@@ -685,7 +685,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVOutputFormat*,
        av_oformat_next,
@@ -9,7 +9,7 @@
        (f)
     );
  #endif
-@@ -748,7 +748,7 @@ extern "C" {
+@@ -766,7 +766,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        int,
        av_fifo_size,
@@ -18,7 +18,7 @@
        (f)
     );
  #endif
-@@ -810,7 +810,7 @@ extern "C" {
+@@ -828,7 +828,7 @@ extern "C" {
     FFMPEG_FUNCTION_WITH_RETURN(
        AVDictionaryEntry *,
        av_dict_get,

audio/audacity/pkg-plist

@@ -3,6 +3,7 @@ man/man1/audacity.1.gz
 share/appdata/audacity.appdata.xml
 share/applications/audacity.desktop
 %%DATADIR%%/EQDefaultCurves.xml
+%%DATADIR%%/modules/mod-script-pipe.so
 %%DATADIR%%/nyquist/aud-do-support.lsp
 %%DATADIR%%/nyquist/dspprims.lsp
 %%DATADIR%%/nyquist/envelopes.lsp

audio/beatslash-lv2/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=	beatslash
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -29,4 +29,7 @@ USE_GNOME=	atkmm gdkpixbuf2 gtkmm24
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <lvtk-1/lvtk|#include <lvtk-2/lvtk|' ${WRKSRC}/src/*.?pp
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/beatslash.lv2/*.so
+
 .include <bsd.port.mk>

audio/beatslash-lv2/files/patch-wscript

@@ -1,4 +1,4 @@
---- wscript.orig	2016-11-06 20:24:40 UTC
+--- wscript.orig	2019-02-23 21:03:41 UTC
 +++ wscript
 @@ -31,9 +31,9 @@ def configure(conf):
      autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.24.0')
@@ -13,3 +13,12 @@
  
      check = 'Extended Initializer Lists'
      conf.check_cxx(msg         = check,
+@@ -78,7 +78,7 @@ def build_plugin(bld, bundle, name, source, cxxflags=[
+ 
+     # Install data file
+     data_file = '%s.ttl' % name
+-    bld.install_files('${LV2DIR}/' + bundle, os.path.join(bundle, data_file))
++    #bld.install_files('${LV2DIR}/' + bundle, os.path.join(bundle, data_file)) # see https://github.com/blablack/beatslash-lv2/issues/9
+ 
+ 
+ def build_plugin_gui(bld, bundle, name, source, cxxflags=[], libs=[], add_source=[]):

audio/beatslash-lv2/pkg-descr

@@ -4,4 +4,4 @@ Features:
 * the beat repeater will repeat the current beat
 * the beat slicer will randomly repeat parts of a live sample
 
-WWW: https://objectivewave.wordpress.com/beatslash-lv2/
+WWW: https://github.com/blablack/beatslash-lv2

audio/bharvestr-lv2/Makefile

@@ -17,7 +17,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libsndfile.so:audio/libsndfile
 
-USES=		gmake gnome pkgconfig xorg
+USES=		compiler:c++11-lang gmake gnome pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	sjaehn
 GH_PROJECT=	BHarvestr

audio/bharvestr-lv2/files/patch-src_BWidgets_FileChooser.hpp

@@ -0,0 +1,10 @@
+--- src/BWidgets/FileChooser.hpp.orig	2020-07-20 09:39:49 UTC
++++ src/BWidgets/FileChooser.hpp
+@@ -24,6 +24,7 @@
+ #include "PopupListBox.hpp"
+ #include "TextButton.hpp"
+ #include <regex>
++#include <climits>
+ 
+ namespace BWidgets
+ {

audio/bjumblr-lv2/Makefile

@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libsndfile.so:audio/libsndfile
 
-USES=		gmake gnome pkgconfig xorg
+USES=		compiler:c++11-lang gmake gnome pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	sjaehn
 GH_PROJECT=	BJumblr

audio/bjumblr-lv2/files/patch-src_BWidgets_FileChooser.hpp

@@ -0,0 +1,10 @@
+--- src/BWidgets/FileChooser.hpp.orig	2020-07-20 09:39:49 UTC
++++ src/BWidgets/FileChooser.hpp
+@@ -24,6 +24,7 @@
+ #include "PopupListBox.hpp"
+ #include "TextButton.hpp"
+ #include <regex>
++#include <climits>
+ 
+ namespace BWidgets
+ {

audio/csound/Makefile

@@ -156,6 +156,12 @@ WIIMOTE_DESC=		Build the Wiimote opcodes
 WIIMOTE_CMAKE_BOOL=	BUILD_WIIMOTE_OPCODES
 WIIMOTE_BROKEN=		Need to port wiiuse: https://github.com/rpavlik/wiiuse
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+BROKEN_FreeBSD_11=	libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8'
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}|' \
@@ -185,4 +191,4 @@ post-install:
 post-install-FLTK-on:
 	@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

audio/faustlive/Makefile

@@ -52,7 +52,8 @@ post-patch:
 	@${REINPLACE_CMD} -e ' \
 		s|########## LIBS AND FLAGS|CXXFLAGS+=$$$$system($$$$LLVM_CONFIG --cflags)| ; \
 		s|/use/local|${LOCALBASE}| ; \
-		s|-L/opt/local/lib$$|-L${LOCALBASE}/lib -lexecinfo|' \
+		s|-L/opt/local/lib$$|-L${LOCALBASE}/lib -lexecinfo| ; \
+		s|-L/usr/lib/||' \
 		${WRKSRC}/Build/FreeBSD/FaustLive.pro
 	@${REINPLACE_CMD} -e ' \
 		s|#!/bin/bash|#!/bin/sh|' \

audio/geonkick-lv2/Makefile

@@ -12,10 +12,6 @@ COMMENT=	Software percussion synthesizer
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/filesystem)
-BROKEN=		STL feature 'filesystem' isn't available # '
-.endif
-
 BUILD_DEPENDS=	lv2>0:audio/lv2 \
 		gmake:devel/gmake \
 		rapidjson>0:devel/rapidjson \
@@ -35,4 +31,11 @@ CMAKE_ARGS=	-DFREEBSD_GMAKE=${GMAKE}
 
 #INSTALLS_ICONS=	yes # disabled because it causes: gtk-update-icon-cache: Failed to open file /usr/local/share/icons/hicolor/.icon-theme.cache : Permission denied
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-plugin_lv2_CMakeLists.txt \
+		${FILESDIR}/extra-patch-standalone_CMakeLists.txt
+.endif
+
+.include <bsd.port.post.mk>

audio/gnaural/Makefile

@@ -22,4 +22,6 @@ USES=		desktop-file-utils gnome pkgconfig
 USE_CSTD=	gnu89
 USE_GNOME=	libglade2
 
+LDFLAGS+=	-lm
+
 .include <bsd.port.mk>

audio/lenticular-lv2/Makefile

@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	lv2>0:audio/lv2
 
-USES=		gmake pkgconfig
+USES=		compiler:c++11-lang gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	polyeffects
 GH_PROJECT=	lenticular_lv2

audio/libaudec/Makefile

@@ -19,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	alex-tee
 USE_LDCONFIG=	yes
 
-MESON_ARGS=	-Dbuild-tests=false
+MESON_ARGS=	-Dtests=false
 
 PLIST_FILES=	bin/audec \
 		include/audec/audec.h \

audio/libaudec/files/patch-meson.build

@@ -1,6 +1,6 @@
---- meson.build.orig	2020-05-16 11:50:13 UTC
+--- meson.build.orig	2020-08-15 13:40:04 UTC
 +++ meson.build
-@@ -177,7 +177,7 @@ config_h_dep = declare_dependency (
+@@ -162,7 +162,7 @@ config_h_dep = declare_dependency (
    )
  audec_deps += config_h_dep
  
@@ -9,14 +9,3 @@
    'audec',
    sources: srcs,
    dependencies: [
-@@ -212,7 +212,9 @@ audec_exe = executable (
-   install: not meson.is_subproject(),
-   )
- 
--subdir('tests')
-+if get_variable('build-tests', true)
-+	subdir('tests')
-+endif
- 
- summary = [
-   '',

audio/libsndfile/Makefile

@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libsndfile
-PORTVERSION=	1.0.28
-PORTREVISION=	2
+DISTVERSION=	1.0.29
 CATEGORIES=	audio
-MASTER_SITES=	http://www.mega-nerd.com/libsndfile/files/
+MASTER_SITES=	https://github.com/erikd/${PORTNAME}/releases/download/v1.0.29/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Reading and writing files containing sampled sound (like WAV or AIFF)
@@ -13,37 +12,45 @@ 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 \
+		tar:bz2
+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_LDCONFIG=	yes
-TEST_TARGET=	check
-INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	CPU_CLIP EXTERNAL DOCS
+CMAKE_ARGS=	-DCMAKE_DISABLE_FIND_PACKAGE_ALSA:BOOL=True \
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sndio:BOOL=True \
+		-DCMAKE_DISABLE_FIND_PACKAGE_Speex:BOOL=True \
+		-DCMAKE_DISABLE_FIND_PACKAGE_SQLite3:BOOL=True
+
+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_DESC=	Build tests (forces static library only)
+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 = 1598210411
+SHA256 (libsndfile-1.0.29.tar.bz2) = 2ba20d44817c8176f097ab25eff44ef0aeec9e00973def5a7174c5ae0764b22f
+SIZE (libsndfile-1.0.29.tar.bz2) = 831090

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-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-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/musicpd/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	musicpd
-PORTVERSION=	0.21.24
+PORTVERSION=	0.21.26
 CATEGORIES=	audio
 MASTER_SITES=	https://www.musicpd.org/download/mpd/${PORTVERSION:R}/
 DISTNAME=	mpd-${PORTVERSION}

audio/musicpd/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1591873774
-SHA256 (mpd-0.21.24.tar.xz) = 84632a7e82e672b3a6d71651a75d05fb7acd62645c33e3f3af5a1067cfa64cd6
-SIZE (mpd-0.21.24.tar.xz) = 681576
+TIMESTAMP = 1600722391
+SHA256 (mpd-0.21.26.tar.xz) = f9e68221c7a6829ec02f281eb313b2f24182020f5eb65ab22b337e6169ea4eea
+SIZE (mpd-0.21.26.tar.xz) = 685396

audio/p5-CDDB_get/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	CDDB_get
 PORTVERSION=	2.28
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
@@ -16,11 +16,13 @@ COMMENT=	High-level interface to the Compact Disc Database
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Copying
 
-PORTSCOUT=	skipv:2.28.1
-
 USES=		perl5 shebangfix
-SHEBANG_FILES=	cddb.pl
 USE_PERL5=	configure
+
 NO_ARCH=	yes
 
+PORTSCOUT=	skipv:2.28.1
+
+SHEBANG_FILES=	cddb.pl
+
 .include <bsd.port.mk>

audio/p5-CDDB_get/files/patch-CDDB__get.pm

@@ -0,0 +1,20 @@
+--- CDDB_get.pm.orig	2012-03-06 18:28:24 UTC
++++ CDDB_get.pm
+@@ -66,7 +66,7 @@ my $CDROM_MSF=0x02;
+ 
+ # default config
+ 
+-my $CDDB_HOST = "freedb.freedb.org";
++my $CDDB_HOST = "gnudb.gnudb.org";
+ my $CDDB_PORT = 8880;
+ my $CDDB_MODE = "cddb";
+ my $CD_DEVICE = "/dev/cdrom";
+@@ -608,7 +608,7 @@ CDDB - Read the CDDB entry for an audio CD in your dri
+ 
+  # following variables just need to be declared if different from defaults
+ 
+- $config{CDDB_HOST}="freedb.freedb.org";	# set cddb host
++ $config{CDDB_HOST}="gnudb.gnudb.org";		# set cddb host
+  $config{CDDB_PORT}=8880;			# set cddb port
+  $config{CDDB_MODE}="cddb";			# set cddb mode: cddb or http
+  $config{CD_DEVICE}="/dev/cdrom";		# set cd device

audio/p5-CDDB_get/files/patch-cddb.pl

@@ -0,0 +1,11 @@
+--- cddb.pl.orig	2005-10-06 06:00:59 UTC
++++ cddb.pl
+@@ -85,7 +85,7 @@ $CDDB_get::debug=1 if($option{D});
+ # following variables just need to be declared if different from defaults
+ # defaults are listed below (cdrom default is os specific)
+ 
+-# $config{CDDB_HOST}="freedb.freedb.org";	# set cddb host
++# $config{CDDB_HOST}="gnudb.gnudb.org";		# set cddb host
+ if($option{H}) {
+   $config{CDDB_HOST}=$option{H};
+ }

audio/picard-plugins/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1593449367
-SHA256 (metabrainz-picard-plugins-2.0.20200506-d8137c5_GH0.tar.gz) = 4ae912e3d6a5fd956fdb3a6a263e210c02248f014b8a1256687d64be1f136147
-SIZE (metabrainz-picard-plugins-2.0.20200506-d8137c5_GH0.tar.gz) = 385098
+TIMESTAMP = 1593696678
+SHA256 (metabrainz-picard-plugins-2.0.20200605-d8137c5_GH0.tar.gz) = 4ae912e3d6a5fd956fdb3a6a263e210c02248f014b8a1256687d64be1f136147
+SIZE (metabrainz-picard-plugins-2.0.20200605-d8137c5_GH0.tar.gz) = 385098

audio/playumidi/Makefile

@@ -1,10 +1,10 @@
-# Created by: Koine Yuusuke(koinec) <koinec@yahoo.co.jp>
+# Created by: Koine Yuusuke(koinec) <koinec@users.osdn.me>
 # $FreeBSD$
 
 PORTNAME=		playumidi
-PORTVERSION=		0.8.2
+PORTVERSION=		0.8.3
 CATEGORIES=		audio
-MASTER_SITES=		OSDN/playumidi/71406
+MASTER_SITES=		OSDN/${PORTNAME}
 
 MAINTAINER=		koinec@users.osdn.me
 COMMENT=		Standard MIDI format 0/1 player for FreeBSD USB-MIDI(umidi) device

audio/playumidi/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1565487633
-SHA256 (playumidi-0.8.2.tar.gz) = d007844d85abc76faa0d4ec37fd2718a61755d586155ac1922a98f909161aa86
-SIZE (playumidi-0.8.2.tar.gz) = 21998
+TIMESTAMP = 1598157944
+SHA256 (playumidi-0.8.3.tar.gz) = 518e6cefc77d057ab7a802041c4d250a208f93d1bd054fed42a76d6a387dfb1e
+SIZE (playumidi-0.8.3.tar.gz) = 22160

audio/pms-devel/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pms-devel
-PORTVERSION=	0.0.20200102
+PORTVERSION=	0.0.20200702
 CATEGORIES=	audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -16,7 +16,7 @@ USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	ambientsound
 GH_PROJECT=	pms
-GH_TAGNAME=	0f72e8e
+GH_TAGNAME=	cae1f02
 
 GH_TUPLE=	\
 		RoaringBitmap:roaring:v0.4.16:roaringbitmap_roaring/vendor/github.com/RoaringBitmap/roaring \

audio/pms-devel/distinfo

@@ -1,6 +1,6 @@
-TIMESTAMP = 1584271377
-SHA256 (ambientsound-pms-0.0.20200102-0f72e8e_GH0.tar.gz) = a20d0eef8252db2b50493ca77e43d99075c102b06c4670854b96cede23260f2b
-SIZE (ambientsound-pms-0.0.20200102-0f72e8e_GH0.tar.gz) = 79721
+TIMESTAMP = 1595083232
+SHA256 (ambientsound-pms-0.0.20200702-cae1f02_GH0.tar.gz) = 71fbd5324241e3f0648644ba29160e6db03cae9073ddf1a37201471ad64c24b4
+SIZE (ambientsound-pms-0.0.20200702-cae1f02_GH0.tar.gz) = 79804
 SHA256 (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 6018c018098229217404878d89d313c92127218926cb5463c2ba0eb5de02a09d
 SIZE (RoaringBitmap-roaring-v0.4.16_GH0.tar.gz) = 132016
 SHA256 (Smerity-govarint-7265e41f48f1_GH0.tar.gz) = 7c78365ebe8f5e40b2d0265c4950e66dd8252e4141fbfbd4f2b0a3f3e4dcefbe

audio/py-gtts/Makefile

@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+PORTNAME=	gtts
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.1.1
+CATEGORIES=	audio python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	kai@FreeBSD.org
+COMMENT=	Library/CLI tool to interface with Google Translate text-to-speech API
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gtts-token>=1.1.3:security/py-gtts-token@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.9:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}testfixtures>0:devel/py-testfixtures@${PY_FLAVOR}
+
+USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	pndurette
+GH_PROJECT=	gTTS
+USE_PYTHON=	distutils autoplist
+
+NO_ARCH=	yes
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3600
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twine1>=1.11:devel/py-twine1@${PY_FLAVOR}
+.else
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}twine>=1.11:devel/py-twine@${PY_FLAVOR}
+.endif
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
+
+.include <bsd.port.post.mk>

audio/py-gtts/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1594610064
+SHA256 (pndurette-gTTS-v2.1.1_GH0.tar.gz) = 7ba54c933aadf83811d397947a2702360188a03b3571b3caff0d618aa34c0d7c
+SIZE (pndurette-gTTS-v2.1.1_GH0.tar.gz) = 33476

audio/py-gtts/pkg-descr

@@ -0,0 +1,13 @@
+gTTS (Google Text-to-Speech), a Python library and CLI tool to interface with
+Google Translate's text-to-speech API. Write spoken mp3 data to a file, a
+file-like object (bytestring) for further audio manipulation, or stdout.
+
+Or simply pre-generate Google Translate TTS request URLs to feed to an external
+program.
+
+Customizable speech-specific sentence tokenizer that allows for unlimited
+lengths of text to be read, all while keeping proper intonation, abbreviations,
+decimals and more; Customizable text pre-processors which can, for example,
+provide pronunciation corrections; Automatic retrieval of supported languages.
+
+WWW: https://github.com/pndurette/gTTS

audio/sound-juicer/Makefile

@@ -22,7 +22,8 @@ LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		desktop-file-utils gettext gmake gnome pathfix pkgconfig tar:xz
+USES=		compiler:c11 desktop-file-utils gettext gmake gnome \
+		pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack
 USE_GSTREAMER1=	cdparanoia flac good vorbis
 GNU_CONFIGURE=	yes

audio/stegosaurus-lv2/Makefile

@@ -14,9 +14,11 @@ BUILD_DEPENDS=	lv2>0:audio/lv2
 
 USES=		gnome waf localbase:ldflags pkgconfig xorg
 USE_GITHUB=	yes
-GH_ACCOUNT=	mxmilkb
+GH_ACCOUNT=	mxmilkiib
 GH_TAGNAME=	543a95d
 USE_GNOME=	cairo
 USE_XORG=	x11
 
+CFLAGS+=	-fcommon # variables controller/write_function/etc, see https://github.com/mxmilkiib/stegosaurus/issues/6
+
 .include <bsd.port.mk>

audio/stegosaurus-lv2/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1554603122
-SHA256 (mxmilkb-stegosaurus-0.0.3-543a95d_GH0.tar.gz) = 61548c786886fbae181e5adf6b116ae5d7338cda461e9fc798b6788b5b191e2e
-SIZE (mxmilkb-stegosaurus-0.0.3-543a95d_GH0.tar.gz) = 163416
+TIMESTAMP = 1600651761
+SHA256 (mxmilkiib-stegosaurus-0.0.3-543a95d_GH0.tar.gz) = 61548c786886fbae181e5adf6b116ae5d7338cda461e9fc798b6788b5b191e2e
+SIZE (mxmilkiib-stegosaurus-0.0.3-543a95d_GH0.tar.gz) = 163416

audio/stegosaurus-lv2/files/patch-stegosaurus__synth.c

@@ -0,0 +1,11 @@
+--- stegosaurus_synth.c.orig	2020-09-19 18:50:38 UTC
++++ stegosaurus_synth.c
+@@ -2,6 +2,8 @@
+ #include "stegosaurus_synth.h"
+ #include "noise.h"
+ 
++stegosaurus* stegosaurus_self = 0;
++
+ voice* voices[4];
+ int next_voice = 0;
+ int keys[128];

audio/stegosaurus-lv2/files/patch-stegosaurus__synth.h

@@ -0,0 +1,11 @@
+--- stegosaurus_synth.h.orig	2020-09-19 18:50:03 UTC
++++ stegosaurus_synth.h
+@@ -26,7 +26,7 @@ void stegosaurus_synth_set_osc_waves(int, int, int);
+ #define ENV_STATE_KILL 7
+ 
+ 
+-stegosaurus* stegosaurus_self;
++extern stegosaurus* stegosaurus_self;
+ 
+ 
+ 	typedef struct

audio/stegosaurus-lv2/pkg-descr

@@ -1,3 +1,3 @@
 lv2 drum synthersizer without sampling.
 
-WWW: https://github.com/mxmilkb/stegosaurus
+WWW: https://github.com/mxmilkiib/stegosaurus

benchmarks/blogbench/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	blogbench
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://download.pureftpd.org/pub/blogbench/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/blogbench/
@@ -10,14 +11,19 @@ MASTER_SITES=	http://download.pureftpd.org/pub/blogbench/ \
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Performance Test of Filesystem I/O
 
-GNU_CONFIGURE=	yes
 USES=		tar:bzip2
 
+GNU_CONFIGURE=	yes
+
 PLIST_FILES=	bin/blogbench man/man8/blogbench.8.gz
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} -Ee 's|[[:<:]]rand\(|arc4random(|g' \
+		"${WRKSRC}"/src/*.[ch]
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}

biology/cufflinks/Makefile

@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhts.so:biology/htslib
 
-USES=		autoreconf eigen:3 gmake python shebangfix
+USES=		autoreconf compiler:c++11-lang eigen:3 gmake python shebangfix
 SHEBANG_FILES=	src/cuffmerge
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes

biology/mapm3/Makefile

@@ -3,23 +3,29 @@
 
 PORTNAME=	mapm3
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://www.broad.mit.edu/ftp/distribution/software/mapmaker3/ \
 		ftp://ftp.ibiblio.org/pub/academic/biology/molbio/mapmaker/   \
 		http://iubio.bio.indiana.edu/soft/molbio/qtl/mapmaker/        \
 		http://www.mirrorservice.org/sites/iubio.bio.indiana.edu/molbio/qtl/mapmaker/
 DISTNAME=	mapm3-source
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	tphilipp@potion-studios.com
 COMMENT=	Constructs linkage maps of markers segregating in experimental crosses
 
-USES=		ncurses
+LICENSE=	MAPMAKER
+LICENSE_NAME=	Whitehead Institute Mapmaker license
+LICENSE_FILE=	${WRKSRC}/READ.ME
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+
+USES=		ncurses tar:Z
 USE_CSTD=	gnu89
-CFLAGS+=	-Wno-return-type
-NO_WRKSUBDIR=	yes
+
 MAKE_ARGS+=	SYS_LIBS="${LDFLAGS} -lm -lncurses"
 MAKE_JOBS_UNSAFE=	yes
+CFLAGS+=	-fcommon -Wno-return-type
+NO_WRKSUBDIR=	yes
 
 post-patch:
 	${CP} ${WRKSRC}/sun/* ${WRKSRC}
@@ -27,4 +33,8 @@ post-patch:
 pre-install:
 	@${REINPLACE_CMD} -e 's|/usr/local|${STAGEDIR}${PREFIX}|' ${WRKSRC}/Makefile
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mapmaker
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qtl
+
 .include <bsd.port.mk>

biology/paml/files/patch-src_paml.h

@@ -0,0 +1,14 @@
+--- src/paml.h.orig	2020-08-20 16:14:50 UTC
++++ src/paml.h
+@@ -372,9 +372,9 @@ void copySptree(void);
+ void printSptree(void);
+ 
+ 
+-enum {BASEseq=0, CODONseq, AAseq, CODON2AAseq, BINARYseq, BASE5seq} SeqTypes;
++enum SeqTypes {BASEseq=0, CODONseq, AAseq, CODON2AAseq, BINARYseq, BASE5seq};
+ 
+-enum {PrBranch=1, PrNodeNum=2, PrLabel=4, PrNodeStr=8, PrAge=16, PrOmega=32} OutTreeOptions;
++enum OutTreeOptions {PrBranch=1, PrNodeNum=2, PrLabel=4, PrNodeStr=8, PrAge=16, PrOmega=32};
+ 
+ 
+ /* use mean (0; default) for discrete gamma instead of median (1) */

biology/py-scikit-bio/Makefile

@@ -28,4 +28,11 @@ RUN_DEPENDS=	${PYNUMPY} \
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386
+CFLAGS+=	-msse2 # workaround for https://github.com/biocore/scikit-bio/issues/1727
+CXXFLAGS+=	-msse2
+.endif
+
+.include <bsd.port.post.mk>

cad/PrusaSlicer/Makefile

@@ -3,7 +3,7 @@
 PORTNAME=		PrusaSlicer
 DISTVERSIONPREFIX=	version_
 DISTVERSION=		2.2.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=		cad
 
 MAINTAINER=	teodorsigaev@gmail.com

cad/alliance/Makefile

@@ -29,7 +29,7 @@ USE_TEX=	dvipsk:build latex:build
 USE_XORG=	ice sm x11 xext xt
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP}
+CONFIGURE_ENV+=	ALLIANCE_TOP=${ALLIANCE_TOP} YACC=${YACC}
 CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \
 		--prefix=${ALLIANCE_TOP}
 

cad/alliance/files/patch-exp_src_Makefile.am

@@ -0,0 +1,11 @@
+--- exp/src/Makefile.am.orig	2014-08-02 23:38:00 UTC
++++ exp/src/Makefile.am
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = exp 
+ 
+-YACC = @YACC@ -d -v --debug
++YACC = @YACC@ -d -v -t
+ CFLAGS = @CFLAGS@ @ALLIANCE_CFLAGS@
+ exp_LDADD =
+ 

cad/alliance/files/patch-fvh_src_fbl__byacc.h

@@ -0,0 +1,9 @@
+--- fvh/src/fbl_byacc.h.orig	2014-08-02 23:38:00 UTC
++++ fvh/src/fbl_byacc.h
+@@ -119,5 +119,5 @@ extern void         fbl_select();
+   extern          char * fbl_stostr __P((char *str));
+ 
+   extern           void  fbl_y_error __P((char *str));
+-  extern            long  fbl_y_lex __P(());
++  extern            int  fbl_y_lex __P(());
+ 

cad/caneda/Makefile

@@ -13,7 +13,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
 
-USES=		cmake desktop-file-utils qt:5 shared-mime-info
+USES=		cmake compiler:c++11-lang desktop-file-utils qt:5 \
+		shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	Caneda
 GH_PROJECT=	Caneda

cad/iverilog/files/patch-driver_cflexor.lex

@@ -0,0 +1,10 @@
+--- driver/cflexor.lex.orig	2020-08-18 17:06:30 UTC
++++ driver/cflexor.lex
+@@ -30,6 +30,7 @@
+ static int comment_enter;
+ static char* trim_trailing_white(char*txt, int trim);
+ 
++char *current_file;
+ /*
+  * Mostly copied from the flex manual. Do not make this arbitrary
+  * depth without checking for looping files.

cad/iverilog/files/patch-driver_cfparse__misc.h

@@ -0,0 +1,10 @@
+--- driver/cfparse_misc.h.orig	2020-08-18 17:06:43 UTC
++++ driver/cfparse_misc.h
+@@ -39,6 +39,6 @@ int cferror(const char *);
+ int cfparse(void);
+ void switch_to_command_file(const char *);
+ void destroy_lexor(void);
+-char *current_file;
++extern char *current_file;
+ 
+ #endif /* IVL_cfparse_misc_H */

cad/iverilog/files/patch-libveriuser_priv.h

@@ -0,0 +1,12 @@
+--- libveriuser/priv.h.orig	2020-08-18 15:47:00 UTC
++++ libveriuser/priv.h
+@@ -30,7 +30,8 @@ extern char* __acc_newstring(const char*txt);
+ 
+ /*
+  * Trace file for logging ACC and TF calls.
++ * Defined in libveriuser/priv.c
+  */
+-FILE* pli_trace;
++extern FILE* pli_trace;
+ 
+ #endif /* IVL_priv_H */

cad/ngspice_rework/Makefile

@@ -21,7 +21,7 @@ shlib_PKGNAMESUFFIX=	-shlib
 shlib_CONFLICTS_INSTALL=	ngspice_rework-2*
 x11_CONFLICTS_INSTALL=		ngspice_rework-shlib-2*
 
-USES=		gmake libtool ncurses readline autoreconf pkgconfig
+USES=		compiler:c11 gmake libtool ncurses readline autoreconf pkgconfig
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

cad/openvsp/Makefile

@@ -13,7 +13,6 @@ LICENSE_NAME=	NASA Open Source Agreement version 1.3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN=		fails to link
 BROKEN_aarch64=		fails to compile: invokes x86 asm
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
@@ -56,7 +55,7 @@ USE_GNOME=	libxml2
 
 # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230888
 .if ${OPSYS} == FreeBSD
-.if (${OSVERSION} < 1200000 || ${OSVERSION} >=1300000)
+.if (${OSVERSION} < 1104507) || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000) || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300115)
 BROKEN=	undefined reference to __atomic_load
 .endif
 .endif

chinese/libreoffice-zh_CN/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1590778893
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 04f6e67209dca6d45f332347d3e2af47aaa9e48605d911613adb79f9afafeccb
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 614508
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 3942363bd7c2a1947bc754900330c9ddbb456c3cf7b8ab2eea4fecf0bbae0d95
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 2444529
+TIMESTAMP = 1597379250
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = de4d9914ffab9a0e9393998278fd7d75e3a23010afd891feaa6453b69a6bb898
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_zh-CN.tar.gz) = 619596
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 67d0b8c57019b8e986d74260fa5f40549cf75184b35c3e0380cc93de7b45b97a
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_zh-CN.tar.gz) = 2444394

chinese/libreoffice-zh_TW/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1590778896
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 4db1046155825fe8614974ba6a5626ff0698c76f42b7d26c9fb8d26e959bb21f
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 620337
-SHA256 (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = ecd9db4643007ddb7fc0372d622372efb5fef7e76abe8e75173ee2d2b42b8363
-SIZE (libreoffice/i18n/LibreOffice_6.4.4_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 2533617
+TIMESTAMP = 1597379250
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 3094f7882184dfc8e1daead9d67ffcbaf99ecb1970730fcee220c87eef1194ec
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_langpack_zh-TW.tar.gz) = 620147
+SHA256 (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 1cff132951bfca88a45798b34ddb3e8bf958181cac379cf02787fc060d920c1f
+SIZE (libreoffice/i18n/LibreOffice_6.4.6_Linux_x86-64_deb_helppack_zh-TW.tar.gz) = 2533621

converters/recode/Makefile

@@ -4,20 +4,24 @@
 PORTNAME=	recode
 PORTVERSION=	3.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	converters
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
+LICENSE=	GPLv2+
+
+USES=		gettext iconv libtool makeinfo perl5
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	pinard
 GH_PROJECT=	Recode
 
-GNU_CONFIGURE=	yes
-USES=		gettext iconv libtool perl5
-USE_PERL5=	run build
 USE_LDCONFIG=	yes
+USE_PERL5=	run build
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
@@ -38,4 +42,8 @@ post-patch:
 		${WRKSRC}/src/libiconv.c
 	@${CP} ${WRKSRC}/lib/error.c ${WRKSRC}/src
 
+# to enable, remove this line and the leading @: from the STRIP_CMD line
+post-install:
+	@: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librecode.so.*.*.*
+
 .include <bsd.port.mk>

converters/wkhtmltopdf/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wkhtmltopdf
-PORTVERSION=	0.12.5
-PORTREVISION=	5
+PORTVERSION=	0.12.6
 CATEGORIES=	converters
 
 MAINTAINER=	pi@FreeBSD.org
@@ -20,17 +19,16 @@ BROKEN_mips64=		fails to link: undefined reference to __sync_add_and_fetch_4
 RUN_DEPENDS=	webfonts>=0:x11-fonts/webfonts
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libpng.so:graphics/png \
-		libQt5WebKit.so:www/qt5-webkit
+		libpng.so:graphics/png
 
 USES=		compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl xorg
+USE_GCC=	8
 USE_XORG=	x11 xext xrender
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 WKQT_TAGNAME=	5db36ec
 GH_TUPLE=	${PORTNAME}:qt:${WKQT_TAGNAME}:qt
-USE_CXXSTD=	gnu++98
 HAS_CONFIGURE=	yes
 
 PATCH_WRKSRC=		${WRKSRC}/qt

converters/wkhtmltopdf/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1528798989
-SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 861d6e61e2f5beb2d8daaade2cd5a85b84065ee9fac0d6d85000d8a7712a4621
-SIZE (wkhtmltopdf-wkhtmltopdf-0.12.5_GH0.tar.gz) = 511181
+TIMESTAMP = 1591904530
+SHA256 (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = adcced78492e7366d940c66a1327a85d3ae8c45190f486f545fdaa84cac662f0
+SIZE (wkhtmltopdf-wkhtmltopdf-0.12.6_GH0.tar.gz) = 519045
 SHA256 (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 2b60944b46a4b0b9cdb9ce0339c3bf8f54c5ff9411cbc3c6a6ad01f88cc578e1
 SIZE (wkhtmltopdf-qt-5db36ec_GH0.tar.gz) = 172992377

converters/wkhtmltopdf/files/patch-config.tests_unix_compile.test

@@ -1,6 +1,6 @@
---- config.tests/unix/compile.test.orig
+--- config.tests/unix/compile.test.orig	2018-05-29 06:56:52 UTC
 +++ config.tests/unix/compile.test
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ DESCRIPTION=$7
  shift 7
  LFLAGS="$SYSROOT_FLAG"
  INCLUDEPATH=""

converters/wkhtmltopdf/files/patch-configure

@@ -0,0 +1,11 @@
+--- configure.orig	2018-05-29 06:56:52 UTC
++++ configure
+@@ -7754,7 +7754,7 @@ case "$XPLATFORM" in
+     *-g++*)
+ 	# Check gcc's version
+ 	case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+-	    8*|7*|6*|5*|4*|3.4*)
++	    11*|10*|9*|8*|7*|6*|5*|4*|3.4*)
+ 		;;
+             3.3*)
+                 canBuildWebKit="no"

converters/wkhtmltopdf/files/patch-libcxx

@@ -202,27 +202,25 @@ Reviewed by Anders Carlsson.
 libc++ provides std::nullptr emulation, so we don't have to.
 
 ------------------------------------------------------------------------
---- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
+--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig	2018-05-29 06:56:52 UTC
 +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
-@@ -35,10 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+@@ -35,9 +35,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH D
      #define __has_feature(feature) 0
  #endif
  
--#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION)
 +#include <ciso646>
 +
-+#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION)
+ #if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION)
  
  #define HAVE_NULLPTR 1
- 
-+#include <cstddef>
 +
++#include <cstddef>
+ 
  #else
  
- namespace std {
---- src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp	(revision 86528)
-+++ src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp	(revision 86529)
-@@ -215,7 +215,7 @@
+--- src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebCore/dom/XMLDocumentParserQt.cpp
+@@ -215,7 +215,7 @@ void XMLDocumentParser::doEnd()
  {
  #if ENABLE(XSLT)
      if (m_sawXSLTransform) {
@@ -231,7 +229,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
          document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets.
          document()->styleSelectorChanged(RecalcStyleImmediately);
          document()->setParsing(true);
---- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
+--- src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h.orig	2018-05-29 06:56:52 UTC
 +++ src/3rdparty/webkit/Source/WebCore/loader/icon/IconRecord.h
 @@ -38,7 +38,7 @@
  #include <wtf/OwnPtr.h>
@@ -242,7 +240,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
  #include <sys/types.h> // For time_t structure.
  #endif
  
---- src/3rdparty/webkit/Source/WebCore/page/Page.h
+--- src/3rdparty/webkit/Source/WebCore/page/Page.h.orig	2018-05-29 06:56:52 UTC
 +++ src/3rdparty/webkit/Source/WebCore/page/Page.h
 @@ -29,7 +29,7 @@
  #include <wtf/HashSet.h>
@@ -253,7 +251,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
  #include <sys/time.h> // For time_t structure.
  #endif
  
---- src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h
+--- src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h.orig	2018-05-29 06:56:52 UTC
 +++ src/3rdparty/webkit/Source/WebCore/platform/network/ResourceResponseBase.h
 @@ -35,7 +35,7 @@
  #include <wtf/PassOwnPtr.h>
@@ -264,9 +262,9 @@ libc++ provides std::nullptr emulation, so we don't have to.
  #include <sys/time.h> // For time_t structure.
  #endif
  
---- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp	(revision 86529)
-+++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp	(revision 86530)
-@@ -285,7 +285,7 @@
+--- src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+@@ -285,7 +285,7 @@ void QNetworkReplyWrapper::receiveMetaData()
  
      Q_ASSERT(!m_sniffer);
  
@@ -275,7 +273,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
  
      if (m_sniffer->isFinished()) {
          receiveSniffedMIMEType();
-@@ -666,7 +666,7 @@
+@@ -666,7 +666,7 @@ void QNetworkReplyHandler::start()
      if (!reply)
          return;
  
@@ -284,10 +282,9 @@ libc++ provides std::nullptr emulation, so we don't have to.
  
      if (m_loadType == SynchronousLoad) {
          m_replyWrapper->synchronousLoad();
-===================================================================
---- src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp	(revision 86530)
-+++ src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp	(revision 86531)
-@@ -64,7 +64,7 @@
+--- src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebCore/platform/text/qt/TextCodecQt.cpp
+@@ -64,7 +64,7 @@ void TextCodecQt::registerEncodingNames(EncodingNameRe
  
  static PassOwnPtr<TextCodec> newTextCodecQt(const TextEncoding& encoding, const void*)
  {
@@ -296,10 +293,20 @@ libc++ provides std::nullptr emulation, so we don't have to.
  }
  
  void TextCodecQt::registerCodecs(TextCodecRegistrar registrar)
-
---- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp	(revision 86532)
-+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp	(revision 86533)
-@@ -504,7 +504,7 @@
+--- src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp
+@@ -950,7 +950,7 @@ bool PluginView::platformStart()
+ 
+ #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
+         if (shouldUseAcceleratedCompositing()) {
+-            m_platformLayer = new PluginGraphicsLayerQt(this);
++            m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this));
+             // Trigger layer computation in RenderLayerCompositor
+             m_element->setNeedsStyleRecalc(SyntheticStyleChange);
+         }
+--- src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/Api/qgraphicswebview.cpp
+@@ -504,7 +504,7 @@ void QGraphicsWebView::setPage(QWebPage* page)
      if (!d->page)
          return;
  
@@ -308,9 +315,9 @@ libc++ provides std::nullptr emulation, so we don't have to.
  
      if (d->overlay())
          d->overlay()->prepareGraphicsItemGeometryChange();
---- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp	(revision 86532)
-+++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp	(revision 86550)
-@@ -1319,7 +1319,7 @@
+--- src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp
+@@ -1343,7 +1343,7 @@ void QWebPagePrivate::adjustPointForClicking(QMouseEve
  void QWebPagePrivate::adjustPointForClicking(QGraphicsSceneMouseEvent* ev)
  {
      QtPlatformPlugin platformPlugin;
@@ -319,7 +326,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
      if (!touchModifier)
          return;
  
-@@ -1328,8 +1328,7 @@
+@@ -1352,8 +1352,7 @@ void QWebPagePrivate::adjustPointForClicking(QGraphics
      unsigned bottomPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Down);
      unsigned leftPadding = touchModifier->hitTestPaddingForTouch(QWebTouchModifier::Left);
  
@@ -329,7 +336,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
  
      if (!topPadding && !rightPadding && !bottomPadding && !leftPadding)
          return;
-@@ -2044,7 +2044,7 @@
+@@ -2068,7 +2067,7 @@ void QWebPage::setView(QWidget* view)
      }
  
      if (view)
@@ -338,68 +345,9 @@ libc++ provides std::nullptr emulation, so we don't have to.
  }
  
  /*!
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h	(revision 86550)
-@@ -22,6 +22,8 @@
- 
- #include "PopupMenu.h"
- #include <QObject>
-+#include <wtf/OwnPtr.h>
-+#include <wtf/PassOwnPtr.h>
- 
- class QWebSelectData;
- class QWebSelectMethod;
-@@ -49,8 +51,8 @@
- 
- private:
-     PopupMenuClient* m_popupClient;
--    QWebSelectMethod* m_popup;
--    QWebSelectData* m_selectData;
-+    OwnPtr<QWebSelectMethod> m_popup;
-+    OwnPtr<QWebSelectData> m_selectData;
-     const ChromeClientQt* m_chromeClient;
- };
- 
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h	(revision 86550)
-@@ -22,6 +22,7 @@
- #define QtPlatformPlugin_h
- 
- #include <QPluginLoader>
-+#include <wtf/PassOwnPtr.h>
- 
- class QWebSelectMethod;
- class QWebKitPlatformPlugin;
-@@ -37,15 +38,20 @@
- 
- class QtPlatformPlugin {
- public:
--    QtPlatformPlugin() : m_loaded(false), m_plugin(0) {}
-+    QtPlatformPlugin()
-+        : m_loaded(false)
-+        , m_plugin(0)
-+    {
-+    }
-+
-     ~QtPlatformPlugin();
- 
--    QWebSelectMethod* createSelectInputMethod();
--    QWebNotificationPresenter* createNotificationPresenter();
--    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
--    QWebTouchModifier* createTouchModifier();
-+    PassOwnPtr<QWebSelectMethod> createSelectInputMethod();
-+    PassOwnPtr<QWebNotificationPresenter> createNotificationPresenter();
-+    PassOwnPtr<QWebHapticFeedbackPlayer> createHapticFeedbackPlayer();
-+    PassOwnPtr<QWebTouchModifier> createTouchModifier();
- #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
--    QWebFullScreenVideoHandler* createFullScreenVideoHandler();
-+    PassOwnPtr<QWebFullScreenVideoHandler> createFullScreenVideoHandler();
- #endif
- 
-     QWebKitPlatformPlugin* plugin();
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp	(revision 86550)
-@@ -696,18 +696,18 @@
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+@@ -702,18 +702,18 @@ void ChromeClientQt::exitFullscreenForNode(Node* node)
  } 
  #endif
  
@@ -424,9 +372,95 @@ libc++ provides std::nullptr emulation, so we don't have to.
  #endif
  }
  
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp	(revision 86550)
-@@ -82,8 +82,6 @@
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+@@ -34,6 +34,7 @@
+ #include "KURL.h"
+ #include "PlatformString.h"
+ #include "QtPlatformPlugin.h"
++#include <wtf/PassOwnPtr.h>
+ #include <wtf/RefCounted.h>
+ 
+ QT_BEGIN_NAMESPACE
+@@ -190,7 +191,7 @@ class ChromeClientQt : public ChromeClient { (public)
+     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
+     virtual void populateVisitedLinks();
+ 
+-    QWebSelectMethod* createSelectPopup() const;
++    PassOwnPtr<QWebSelectMethod> createSelectPopup() const;
+ 
+     virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
+ 
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+@@ -140,7 +140,7 @@ FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* c
+     Q_ASSERT(m_chromeClient);
+ 
+ #if USE(QT_MULTIMEDIA)
+-    m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler();
++    m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler().leakPtr();
+     if (!m_FullScreenVideoHandler)
+         m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler;
+ 
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+@@ -203,8 +203,9 @@ void InspectorClientQt::inspectorDestroyed()
+ void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController)
+ {
+ #if ENABLE(INSPECTOR)
+-    QWebView* inspectorView = new QWebView;
+-    InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
++    OwnPtr<QWebView> inspectorView = adoptPtr(new QWebView);
++    // FIXME: Where does inspectorPage get deleted?
++    InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView.get());
+     inspectorView->setPage(inspectorPage);
+ 
+     QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
+@@ -229,11 +230,14 @@ void InspectorClientQt::openInspectorFrontend(WebCore:
+         inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects);
+ #endif
+     inspectorView->page()->mainFrame()->load(inspectorUrl);
+-    m_inspectedWebPage->d->inspectorFrontend = inspectorView;
+-    inspector->d->setFrontend(inspectorView);
++    m_inspectedWebPage->d->inspectorFrontend = inspectorView.get();
++    inspector->d->setFrontend(inspectorView.get());
+ 
+-    m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this);
+-    inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient);
++    // Is 'controller' the same object as 'inspectorController' (which appears to be unused)?
++    InspectorController* controller = inspectorView->page()->d->page->inspectorController();
++    OwnPtr<InspectorFrontendClientQt> frontendClient = adoptPtr(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView.release(), this));
++    m_frontendClient = frontendClient.get();
++    controller->setInspectorFrontendClient(frontendClient.release());
+     m_frontendWebPage = inspectorPage;
+ #endif
+ }
+@@ -297,7 +301,7 @@ bool InspectorClientQt::sendMessageToFrontend(const St
+ 
+ #if ENABLE(INSPECTOR)
+ InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView, InspectorClientQt* inspectorClient)
+-    : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, new InspectorFrontendSettingsQt())
++    : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, adoptPtr(new InspectorFrontendSettingsQt()))
+     , m_inspectedWebPage(inspectedWebPage)
+     , m_inspectorView(inspectorView)
+     , m_destroyingInspectorView(false)
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
+@@ -211,9 +211,9 @@ void NotificationPresenterClientQt::displayNotificatio
+         QPixmap pixmap;
+         if (bytes.length() && pixmap.loadFromData(bytes)) {
+             QIcon icon(pixmap);
+-            wrapper->m_notificationIcon = new QSystemTrayIcon(icon);
++            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon));
+         } else
+-            wrapper->m_notificationIcon = new QSystemTrayIcon();
++            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon());
+ #endif
+     }
+ 
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.cpp
+@@ -82,16 +82,12 @@ namespace WebCore {
  
  PopupMenuQt::PopupMenuQt(PopupMenuClient* client, const ChromeClientQt* chromeClient)
      : m_popupClient(client)
@@ -435,7 +469,6 @@ libc++ provides std::nullptr emulation, so we don't have to.
      , m_chromeClient(chromeClient)
  {
  }
-@@ -90,8 +88,6 @@
  
  PopupMenuQt::~PopupMenuQt()
  {
@@ -444,7 +477,7 @@ libc++ provides std::nullptr emulation, so we don't have to.
  }
  
  void PopupMenuQt::disconnectClient()
-@@ -107,11 +103,11 @@
+@@ -107,21 +103,19 @@ void PopupMenuQt::show(const IntRect& rect, FrameView*
  
      if (!m_popup) {
          m_popup = m_chromeClient->createSelectPopup();
@@ -459,7 +492,6 @@ libc++ provides std::nullptr emulation, so we don't have to.
          QRect geometry(rect);
          geometry.moveTopLeft(view->contentsToWindow(rect.location()));
          fallback->setGeometry(geometry);
-@@ -118,10 +114,8 @@
          fallback->setFont(m_popupClient->menuStyle().font().font());
      }
  
@@ -472,20 +504,31 @@ libc++ provides std::nullptr emulation, so we don't have to.
  #endif
  }
  
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp	(revision 86550)
-@@ -136,7 +136,7 @@
-     Q_ASSERT(m_chromeClient);
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h
+@@ -22,6 +22,8 @@
  
- #if USE(QT_MULTIMEDIA)
--    m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler();
-+    m_FullScreenVideoHandler = m_chromeClient->m_platformPlugin.createFullScreenVideoHandler().leakPtr();
-     if (!m_FullScreenVideoHandler)
-         m_FullScreenVideoHandler = new DefaultFullScreenVideoHandler;
+ #include "PopupMenu.h"
+ #include <QObject>
++#include <wtf/OwnPtr.h>
++#include <wtf/PassOwnPtr.h>
  
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp	(revision 86550)
-@@ -102,36 +102,35 @@
+ class QWebSelectData;
+ class QWebSelectMethod;
+@@ -49,8 +51,8 @@ private slots:
+ 
+ private:
+     PopupMenuClient* m_popupClient;
+-    QWebSelectMethod* m_popup;
+-    QWebSelectData* m_selectData;
++    OwnPtr<QWebSelectMethod> m_popup;
++    OwnPtr<QWebSelectData> m_selectData;
+     const ChromeClientQt* m_chromeClient;
+ };
+ 
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
+@@ -102,36 +102,35 @@ QWebKitPlatformPlugin* QtPlatformPlugin::plugin()
      return m_plugin;
  }
  
@@ -532,89 +575,40 @@ libc++ provides std::nullptr emulation, so we don't have to.
  }
  #endif
  
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp	(revision 86550)
-@@ -203,8 +203,9 @@
- void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController* inspectorController)
- {
- #if ENABLE(INSPECTOR)
--    QWebView* inspectorView = new QWebView;
--    InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
-+    OwnPtr<QWebView> inspectorView = adoptPtr(new QWebView);
-+    // FIXME: Where does inspectorPage get deleted?
-+    InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView.get());
-     inspectorView->setPage(inspectorPage);
+--- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h.orig	2018-05-29 06:56:52 UTC
++++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
+@@ -22,6 +22,7 @@
+ #define QtPlatformPlugin_h
  
-     QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
-@@ -229,11 +230,14 @@
-         inspectorPage->setProperty("_q_inspectorJavaScriptWindowObjects", inspectorJavaScriptWindowObjects);
- #endif
-     inspectorView->page()->mainFrame()->load(inspectorUrl);
--    m_inspectedWebPage->d->inspectorFrontend = inspectorView;
--    inspector->d->setFrontend(inspectorView);
-+    m_inspectedWebPage->d->inspectorFrontend = inspectorView.get();
-+    inspector->d->setFrontend(inspectorView.get());
- 
--    m_frontendClient = new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView, this);
--    inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(m_frontendClient);
-+    // Is 'controller' the same object as 'inspectorController' (which appears to be unused)?
-+    InspectorController* controller = inspectorView->page()->d->page->inspectorController();
-+    OwnPtr<InspectorFrontendClientQt> frontendClient = adoptPtr(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView.release(), this));
-+    m_frontendClient = frontendClient.get();
-+    controller->setInspectorFrontendClient(frontendClient.release());
-     m_frontendWebPage = inspectorPage;
- #endif
- }
-@@ -297,7 +301,7 @@
- 
- #if ENABLE(INSPECTOR)
- InspectorFrontendClientQt::InspectorFrontendClientQt(QWebPage* inspectedWebPage, PassOwnPtr<QWebView> inspectorView, InspectorClientQt* inspectorClient)
--    : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, new InspectorFrontendSettingsQt())
-+    : InspectorFrontendClientLocal(inspectedWebPage->d->page->inspectorController(), inspectorView->page()->d->page, adoptPtr(new InspectorFrontendSettingsQt()))
-     , m_inspectedWebPage(inspectedWebPage)
-     , m_inspectorView(inspectorView)
-     , m_destroyingInspectorView(false)
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp	(revision 86550)
-@@ -211,9 +211,9 @@
-         QPixmap pixmap;
-         if (bytes.length() && pixmap.loadFromData(bytes)) {
-             QIcon icon(pixmap);
--            wrapper->m_notificationIcon = new QSystemTrayIcon(icon);
-+            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon(icon));
-         } else
--            wrapper->m_notificationIcon = new QSystemTrayIcon();
-+            wrapper->m_notificationIcon = adoptPtr(new QSystemTrayIcon());
- #endif
-     }
- 
---- src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h	(revision 86550)
-@@ -34,6 +34,7 @@
- #include "KURL.h"
- #include "PlatformString.h"
- #include "QtPlatformPlugin.h"
+ #include <QPluginLoader>
 +#include <wtf/PassOwnPtr.h>
- #include <wtf/RefCounted.h>
  
- QT_BEGIN_NAMESPACE
-@@ -189,7 +190,7 @@
-     virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const;
-     virtual void populateVisitedLinks();
+ class QWebSelectMethod;
+ class QWebKitPlatformPlugin;
+@@ -37,15 +38,20 @@ namespace WebCore {
  
--    QWebSelectMethod* createSelectPopup() const;
-+    PassOwnPtr<QWebSelectMethod> createSelectPopup() const;
+ class QtPlatformPlugin {
+ public:
+-    QtPlatformPlugin() : m_loaded(false), m_plugin(0) {}
++    QtPlatformPlugin()
++        : m_loaded(false)
++        , m_plugin(0)
++    {
++    }
++
+     ~QtPlatformPlugin();
  
-     virtual void dispatchViewportDataDidChange(const ViewportArguments&) const;
-
---- src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp	(revision 86536)
-+++ src/3rdparty/webkit/Source/WebCore/plugins/qt/PluginViewQt.cpp	(revision 86550)
-@@ -950,7 +950,7 @@ bool PluginView::platformStart()
+-    QWebSelectMethod* createSelectInputMethod();
+-    QWebNotificationPresenter* createNotificationPresenter();
+-    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
+-    QWebTouchModifier* createTouchModifier();
++    PassOwnPtr<QWebSelectMethod> createSelectInputMethod();
++    PassOwnPtr<QWebNotificationPresenter> createNotificationPresenter();
++    PassOwnPtr<QWebHapticFeedbackPlayer> createHapticFeedbackPlayer();
++    PassOwnPtr<QWebTouchModifier> createTouchModifier();
+ #if ENABLE(VIDEO) && USE(QT_MULTIMEDIA)
+-    QWebFullScreenVideoHandler* createFullScreenVideoHandler();
++    PassOwnPtr<QWebFullScreenVideoHandler> createFullScreenVideoHandler();
+ #endif
  
- #if USE(ACCELERATED_COMPOSITING) && !USE(TEXTURE_MAPPER)
-         if (shouldUseAcceleratedCompositing()) {
--            m_platformLayer = new PluginGraphicsLayerQt(this);
-+            m_platformLayer = adoptPtr(new PluginGraphicsLayerQt(this));
-             // Trigger layer computation in RenderLayerCompositor
-             m_element->setNeedsStyleRecalc(SyntheticStyleChange);
-         }
+     QWebKitPlatformPlugin* plugin();