*/*: sync with upstream

Taken from: HardenedBSD
2020-08-29 05:37:35 +02:00 · 2020-08-29 05:37:35 +02:00 · 49d32f2e06
parent 7ab1698c07
commit 49d32f2e06
309 changed files with 3275 additions and 990 deletions
--- a/archivers/file-roller/files/patch-src_fr-application.c
+++ b/archivers/file-roller/files/patch-src_fr-application.c
@ -0,0 +1,10 @@
+--- src/fr-application.c.orig	2018-07-16 20:15:42 UTC
+++ src/fr-application.c
+@@ -42,7 +42,6 @@
+ #define SERVICE_TIMEOUT 10
+ 
+ 
+-gint                ForceDirectoryCreation;
+ static char       **remaining_args;
+ static char        *arg_add_to = NULL;
+ static int          arg_add = FALSE;
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@ -12,13 +12,14 @@ COMMENT=	Pack, send, and unpack shell archives; synchronize via e-mail

 LICENSE=	GPLv3

+USES=		charsetfix cpe perl5 tar:xz
+
 OPTIONS_DEFINE=	NLS

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode
 INSTALL_TARGET=	install install-man
 INFO=		sharutils
-USES=		charsetfix cpe perl5 tar:xz
 USE_PERL5=	build
 OPTIONS_SUB=	yes
 CPE_VENDOR=	gnu
@ -30,6 +31,14 @@ NLS_CONFIGURE_OFF=	--disable-nls
 post-patch:
 	@${REINPLACE_CMD} -e '/Please include config.h first./ s,^.*$$,#include <config.h>,' \
 		${WRKSRC}/lib/unistd.in.h
+	@${REINPLACE_CMD} -e '/char const . const program_name/d' \
+		${WRKSRC}/src/shar-opts.h \
+		${WRKSRC}/src/shar-opts.c \
+		${WRKSRC}/src/unshar-opts.h \
+		${WRKSRC}/src/unshar-opts.c \
+		${WRKSRC}/src/uudecode-opts.h \
+		${WRKSRC}/src/uudecode-opts.c \
+		${WRKSRC}/src/uuencode-opts.h
 .for man in shar.1 unshar.1
 	@${REINPLACE_CMD} \
 		-e 's, SHAR , GSHAR ,' \
--- a/archivers/sharutils/files/patch-src_shar.c
+++ b/archivers/sharutils/files/patch-src_shar.c
@ -0,0 +1,11 @@
+--- src/shar.c.orig	2020-08-28 17:03:20 UTC
+++ src/shar.c
+@@ -83,6 +83,8 @@ static const char cright_years_z[] =
+ 
+ #define LOG10_MAX_INT  11
+ 
+char const * const program_name = "shar";
+
+ /* System related declarations.  */
+ 
+ /* Convert a possibly-signed character to an unsigned character.  This is
--- a/archivers/sharutils/files/patch-src_unshar.c
+++ b/archivers/sharutils/files/patch-src_unshar.c
@ -0,0 +1,11 @@
+--- src/unshar.c.orig	2020-08-28 17:03:20 UTC
+++ src/unshar.c
+@@ -32,6 +32,8 @@
+ 
+ #include "xgetcwd.h"
+ 
+char const * const program_name = "unshar";
+
+ /*
+  * FIXME: actually configure this stuff:
+  */
--- a/archivers/sharutils/files/patch-src_uudecode.c
+++ b/archivers/sharutils/files/patch-src_uudecode.c
@ -0,0 +1,11 @@
+--- src/uudecode.c.orig	2020-08-28 17:15:21 UTC
+++ src/uudecode.c
+@@ -82,6 +82,8 @@ static char const cright_years_z[] =
+ #define UU_CHMOD(_n, _fd, _m)   chmod ((_n), UU_MODE_BITS(_m))
+ #endif
+ 
+char const * const program_name = "uudecode";
+
+ struct passwd *getpwnam ();
+ 
+ static uudecode_exit_code_t read_stduu(
--- a/astro/foxtrotgps/files/patch-bzr_323
+++ b/astro/foxtrotgps/files/patch-bzr_323
@ -0,0 +1,30 @@
+Obtained from:
+	https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/323
+
+=== modified file 'src/callbacks.c'
+--- src/callbacks.c	2020-01-15 05:46:18 +0000
+++ src/callbacks.c	2020-01-25 00:00:46 +0000
+@@ -46,7 +46,7 @@
+ static gboolean maximized = FALSE;
+ 
+ 
+-GtkWidget *dialog10 = NULL;
+static GtkWidget *dialog10 = NULL;
+ 
+ 
+ static int local_x = 0;
+
+=== modified file 'src/tracks.c'
+--- src/tracks.c	2019-02-26 00:59:58 +0000
+++ src/tracks.c	2020-01-25 00:00:46 +0000
+@@ -30,7 +30,7 @@
+ 
+ GSList *loaded_track = NULL;
+ GtkWidget *window12;
+-GtkWidget *dialog10;
+static GtkWidget *dialog10;
+ 
+ 
+ 
+
+
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@ -26,6 +26,11 @@ USES=		gmake gnome pkgconfig
 USE_GNOME=	gtk20
 MAKE_ARGS=	INSTALLDIR="${PREFIX}" CC="${CC}" CXX="${CXX}"

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 SUB_FILES=	pkg-message

 PORTDOCS=	${DOCS} README
--- a/astro/saoimage/Makefile
+++ b/astro/saoimage/Makefile
@ -16,6 +16,11 @@ ALL_TARGET=	${OPSYS}
 USES=		xorg
 USE_XORG=	x11

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/saoimage etc/imtoolrc.sample share/man/man1/saoimage.1.gz

 post-patch:
--- a/audio/bristol/Makefile
+++ b/audio/bristol/Makefile
@ -26,6 +26,9 @@ CONFIGURE_ARGS+=	--disable-alsa --enable-oss \
 			--enable-jack-default-midi \
 			--disable-version-check

+# Fix build on recent current (would require a handful of patches)
+CFLAGS+=		-fcommon
+
 PORTDATA=	*

 post-patch:
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@ -21,6 +21,11 @@ MAKE_ARGS=	CFLAGS="${CFLAGS} -c -ansi"	\
 		CC="${CC}"
 MAKE_JOBS_UNSAFE=	yes

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/cdplay \
 		share/man/man1/cdplay.1.gz

--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -5,6 +5,9 @@ PORTNAME=	csound
 DISTVERSION=	6.14.0
 CATEGORIES=	audio lang

+PATCH_SITES=	https://github.com/csound/csound/commit/
+PATCHFILES=	c444e8f752c3acc31d364b901204e09eae2e791e.patch:-p1
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sound synthesizer

--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1580112683
+TIMESTAMP = 1598638243
 SHA256 (csound-csound-6.14.0_GH0.tar.gz) = bef349c5304b2d3431ef417933b4c9e9469c0a408a4fa4a98acf0070af360a22
 SIZE (csound-csound-6.14.0_GH0.tar.gz) = 26812543
+SHA256 (c444e8f752c3acc31d364b901204e09eae2e791e.patch) = 7314a10797e51cb291c488581f833b23eafe4af556b37c6b20573c2f0f5af0d0
+SIZE (c444e8f752c3acc31d364b901204e09eae2e791e.patch) = 621
--- a/audio/ctronome/Makefile
+++ b/audio/ctronome/Makefile
@ -12,6 +12,9 @@ COMMENT=	Programmable console-based metronome
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

+# Fix build with clang11
+CFLAGS+=	-fcommon
+
 PLIST_FILES=	bin/ctronome \
 		%%DATADIR%%/metronome1.wav \
 		%%DATADIR%%/metronome2.wav
--- a/audio/denemo/files/patch-include_denemo_denemo__types.h
+++ b/audio/denemo/files/patch-include_denemo_denemo__types.h
@ -0,0 +1,20 @@
+--- include/denemo/denemo_types.h.orig	2020-08-28 18:35:58 UTC
+++ include/denemo/denemo_types.h
+@@ -429,7 +429,7 @@ enum
+   COL_ROW,
+   COL_SCHEME,
+   N_COLUMNS
+-} COMMAND_COLS;
+};
+ 
+ typedef enum { TYPESET_EXCERPT, TYPESET_MOVEMENT, TYPESET_ALL_MOVEMENTS} typeset_type;
+ 
+@@ -1212,6 +1212,7 @@ struct DenemoRoot
+   gboolean *fatal_scheme_errors; /** Abort on scheme errors */
+   gboolean *silent; /** Don't log any message */
+   gboolean *verbose; /** Display every messages */
+-}  Denemo; /**< The root object. */
+};
+ 
+extern struct DenemoRoot Denemo; /**< The root object. */
+ #endif
--- a/audio/denemo/files/patch-src_export_print.c
+++ b/audio/denemo/files/patch-src_export_print.c
@ -0,0 +1,13 @@
+--- src/export/print.c.orig	2020-08-28 18:37:44 UTC
+++ src/export/print.c
+@@ -30,7 +30,9 @@
+ #include "export/exportlilypond.h"
+ #include "core/utils.h"
+ 
+-
+gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
+GError *lily_err;
+GPid previewerpid;
+   
+ #if GTK_MAJOR_VERSION==3
+ typedef enum
--- a/audio/denemo/files/patch-src_export_print.h
+++ b/audio/denemo/files/patch-src_export_print.h
@ -0,0 +1,15 @@
+--- src/export/print.h.orig	2020-08-28 18:38:07 UTC
+++ src/export/print.h
+@@ -108,9 +108,9 @@ typedef struct WysiwygInfo
+   GtkWidget *dialog;            //an info dialog to tell the user what to do next...
+ } WysiwygInfo;
+ 
+-gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
+-GError *lily_err;
+-GPid previewerpid;
+extern gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
+extern GError *lily_err;
+extern GPid previewerpid;
+ 
+ WysiwygInfo* get_wysiwyg_info();
+ void initialize_print_status (void);
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@ -27,6 +27,11 @@ USES=		gmake gnome pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jackmidi

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/ghostess bin/ghostess_universal_gui man/man1/ghostess.1.gz

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@ -21,6 +21,11 @@ USE_GNOME=	gtk20 intltool libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes

--- a/audio/gvolwheel/files/patch-src_conf.h
+++ b/audio/gvolwheel/files/patch-src_conf.h
@ -0,0 +1,20 @@
+--- src/conf.h.orig	2011-06-04 18:20:10 UTC
+++ src/conf.h
+@@ -4,11 +4,11 @@
+ #define OPT_CHANNEL_MASTER	0
+ #define OPT_CHANNEL_PCM		1 
+ 
+-gchar opt_mixer[100];
+-guint opt_channel;
+-guint opt_incr;
+-gboolean opt_gnome_icons;
+-gboolean opt_show_tooltip;
+extern gchar opt_mixer[100];
+extern guint opt_channel;
+extern guint opt_incr;
+extern gboolean opt_gnome_icons;
+extern gboolean opt_show_tooltip;
+ 
+ void load_config();
+ void save_config();
+\ No newline at end of file
--- a/audio/gvolwheel/files/patch-src_main.c
+++ b/audio/gvolwheel/files/patch-src_main.c
@ -0,0 +1,15 @@
+--- src/main.c.orig	2012-04-07 21:54:38 UTC
+++ src/main.c
+@@ -71,7 +71,11 @@ static GOptionEntry entries[] =
+ 	{NULL}
+ };
+ 
+-
+gchar opt_mixer[100];
+guint opt_channel;
+guint opt_incr;
+gboolean opt_gnome_icons;
+gboolean opt_show_tooltip;
+ 
+ int main (int argc, char *argv[])
+ {
--- a/audio/gvolwheel/files/patch-src_oss.c
+++ b/audio/gvolwheel/files/patch-src_oss.c
@ -1,6 +1,6 @@
 --- src/oss.c.orig	2012-04-07 21:18:50 UTC
 +++ src/oss.c
-@@ -17,7 +17,8 @@
+@@ -17,13 +17,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
@ -10,10 +10,36 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-@@ -51,4 +52,4 @@ void vol_backend_set(int mixer, int valu
- 		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &vol);
+ #include "oss.h"
+ 
+ static char *default_device = "/dev/mixer"; 
+struct stereo_volume oss_vol;
+ 
+ int mixer_fd;
+ 
+@@ -38,17 +40,17 @@ int vol_backend_init (char *device)
+ int vol_backend_get(int mixer)
+ {
+ 	if (mixer == 0)
+-		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_VOLUME), &vol);
+		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_VOLUME), &oss_vol);
 	else if (mixer == 1)	
- 		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &vol);
+-		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_PCM), &vol);
+-	return(vol.left);
+		ioctl(mixer_fd, MIXER_READ(SOUND_MIXER_PCM), &oss_vol);
+	return(oss_vol.left);
+ }
+ 
+ void vol_backend_set(int mixer, int value)
+ {
+-	vol.left=vol.right = value;
+	oss_vol.left=oss_vol.right = value;
+ 	if (mixer == 0)	
+-		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &vol);
+		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_VOLUME), &oss_vol);
+ 	else if (mixer == 1)	
+-		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &vol);
 -}
 \ No newline at end of file
+		ioctl(mixer_fd, MIXER_WRITE(SOUND_MIXER_PCM), &oss_vol);
 +}
--- a/audio/gvolwheel/files/patch-src_oss.h
+++ b/audio/gvolwheel/files/patch-src_oss.h
@ -0,0 +1,14 @@
+--- src/oss.h.orig	2020-08-29 07:49:49 UTC
+++ src/oss.h
+@@ -23,8 +23,8 @@ struct stereo_volume
+ 	unsigned char right;
+ };
+ 
+-struct stereo_volume vol;
+extern struct stereo_volume oss_vol;
+ 
+ int vol_backend_init(char *device);
+ void vol_backend_set(int mixer, int value);
+-int vol_backend_get(int mixer);
+\ No newline at end of file
+int vol_backend_get(int mixer);
--- a/audio/gvolwheel/files/patch-src_trayicon.c
+++ b/audio/gvolwheel/files/patch-src_trayicon.c
@ -0,0 +1,27 @@
+--- src/trayicon.c.orig	2012-04-07 21:56:11 UTC
+++ src/trayicon.c
+@@ -31,6 +31,8 @@ const char *tray_image_stocks[] = {
+ 	 "audio-volume-high"
+  	 };
+ 
+GtkStatusIcon *tray_icon; 
+GdkPixbuf *tray_pixbufs[4]; 
+  
+ GtkStatusIcon *create_tray_icon() 
+ {
+@@ -49,6 +51,8 @@ GtkStatusIcon *create_tray_icon() 
+ 	
+ 	gtk_status_icon_set_visible(tray_icon, TRUE);
+ 
+GtkStatusIcon *tray_icon;
+GdkPixbuf *tray_pixbufs[4];
+ 
+ 	return tray_icon;
+ }
+@@ -157,4 +161,4 @@ void update_tray_image()
+ 
+ 	g_sprintf(volchar, "%i\%%", vol);
+ 	if (opt_show_tooltip) gtk_status_icon_set_tooltip_text(tray_icon, volchar);
+-}
+\ No newline at end of file
+}
--- a/audio/gvolwheel/files/patch-src_trayicon.h
+++ b/audio/gvolwheel/files/patch-src_trayicon.h
@ -0,0 +1,20 @@
+--- src/trayicon.h.orig	2011-06-04 12:27:58 UTC
+++ src/trayicon.h
+@@ -2,8 +2,8 @@
+ #include <glib/gstdio.h>
+ #include <glib/gi18n-lib.h>
+ 
+-GtkStatusIcon *tray_icon; 
+-GdkPixbuf *tray_pixbufs[4]; 
+extern GtkStatusIcon *tray_icon; 
+extern GdkPixbuf *tray_pixbufs[4]; 
+ 
+ GtkStatusIcon* create_tray_icon();
+ gboolean tray_icon_recreate(gpointer data);
+@@ -12,4 +12,4 @@ void on_tray_icon_scroll (GtkWidget *widget, GdkEventS
+ void on_tray_icon_click(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+ void on_tray_icon_press(GtkWidget *widget, GdkEventButton *event, gpointer user_data);
+ void update_tray_image();
+-void load_pixbufs();
+\ No newline at end of file
+void load_pixbufs();
--- a/audio/icecast-kh/Makefile
+++ b/audio/icecast-kh/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	icecast
 DISTVERSIONPREFIX=	icecast-
-DISTVERSION=	2.4.0-kh10
+DISTVERSION=	2.4.0-kh15
 CATEGORIES=	audio net
 PKGNAMESUFFIX=	-kh

--- a/audio/icecast-kh/distinfo
+++ b/audio/icecast-kh/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1535557669
-SHA256 (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 783684db7b199b0e4096fcbd9f1b4c50bb79542e1a33dbaf6d817b2ba4150d33
-SIZE (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 1004087
+TIMESTAMP = 1598687767
+SHA256 (karlheyes-icecast-kh-icecast-2.4.0-kh15_GH0.tar.gz) = fe7b7a9309f538a001f5253acd7f2899180d50244513dfc9cc490fe7d33ec9b7
+SIZE (karlheyes-icecast-kh-icecast-2.4.0-kh15_GH0.tar.gz) = 1014679
--- a/audio/jamin/Makefile
+++ b/audio/jamin/Makefile
@ -22,6 +22,11 @@ USES=		desktop-file-utils gmake gnome libtool pkgconfig \
 		shared-mime-info
 USE_GNOME=	gtk20 intltool libxml2

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ladspa/jamincont_1912.so

--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@ -24,6 +24,11 @@ EXTRACT_AFTER_ARGS=	--exclude CVS
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 OPTIONS_DEFINE=	DOCS

 post-patch:
--- a/audio/musicbox-tag-editor/Makefile
+++ b/audio/musicbox-tag-editor/Makefile
@ -23,6 +23,11 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--program-suffix=-tag-editor
 SHEBANG_FILES=	data/edit.pl

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/pixmaps|${PREFIX}/share/pixmaps|' \
 		${WRKSRC}/data/musicbox.glade
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@ -9,6 +9,11 @@ MASTER_SITES=	SUNSITE/apps/sound/players
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/nspmod man/man1/nspmod.1.gz

 do-install:
--- a/audio/shout/Makefile
+++ b/audio/shout/Makefile
@ -14,4 +14,9 @@ COMMENT=	Send mp3 streams to an icecast/shoutcast server

 GNU_CONFIGURE=	yes

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 .include <bsd.port.mk>
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@ -19,6 +19,11 @@ ALL_TARGET=	${PORTNAME}
 MAKE_ARGS=	CC="${CC}" TWEAKS="${CFLAGS}" ARCH="" PG="" OPTIM=""
 USE_CSTD=	gnu89

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/toolame
 PORTDOCS=	FUTURE HISTORY LGPL.txt README

--- a/audio/wmrecord/Makefile
+++ b/audio/wmrecord/Makefile
@ -16,6 +16,11 @@ USE_XORG=	xpm x11 xext
 MAKE_ARGS=	LIBS="-L${LOCALBASE}/lib -lXpm -lX11 -lXext" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LIBDIR=""

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/wmrecord man/man1/wmrecord.1.gz

 do-install:
--- a/audio/ympd/files/patch-src_mpd__client.c
+++ b/audio/ympd/files/patch-src_mpd__client.c
@ -0,0 +1,11 @@
+--- src/mpd_client.c.orig	2020-08-28 21:21:59 UTC
+++ src/mpd_client.c
+@@ -27,6 +27,8 @@
+ #include "config.h"
+ #include "json_encode.h"
+ 
+struct t_mpd mpd;
+
+ /* forward declaration */
+ static int mpd_notify_callback(struct mg_connection *c, enum mg_event ev);
+ 
--- a/audio/ympd/files/patch-src_mpd__client.h
+++ b/audio/ympd/files/patch-src_mpd__client.h
@ -0,0 +1,18 @@
+--- src/mpd_client.h.orig	2016-02-13 21:01:52 UTC
+++ src/mpd_client.h
+@@ -92,12 +92,14 @@ struct t_mpd {
+ 
+     int song_id;
+     unsigned queue_version;
+-} mpd;
+};
+ 
+ struct t_mpd_client_session {
+     int song_id;
+     unsigned queue_version;
+ };
+
+extern struct t_mpd mpd;
+ 
+ void mpd_poll(struct mg_server *s);
+ int callback_mpd(struct mg_connection *c);
--- a/audio/zinf/Makefile
+++ b/audio/zinf/Makefile
@ -36,6 +36,10 @@ INSTALL_TARGET=	install-strip
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis

+BROKEN=		Does not build with llvm 11
+DEPRECATED=	Does not build, no upstream
+EXPIRATION_DATE=2020-09-30
+
 .include <bsd.port.pre.mk>

 .if ${ARCH} == "i386"
--- a/biology/bwa/Makefile
+++ b/biology/bwa/Makefile
@ -5,6 +5,9 @@ PORTVERSION=	0.7.17
 DISTVERSIONPREFIX=v
 CATEGORIES=	biology

+PATCH_SITES=	https://github.com/lh3/bwa/commit/
+PATCHFILES=	2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch:-p1
+
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Burrows-Wheeler sequence aligner

--- a/biology/bwa/distinfo
+++ b/biology/bwa/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1511844744
+TIMESTAMP = 1598613295
 SHA256 (lh3-bwa-v0.7.17_GH0.tar.gz) = 980b9591b61c60042c4a39b9e31ccaad8d17ff179d44d347997825da3fdf47fd
 SIZE (lh3-bwa-v0.7.17_GH0.tar.gz) = 232593
+SHA256 (2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch) = 15216a79759a2390bda4a4684af34ff3108f63519d2ec3935754507f3c008da0
+SIZE (2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch) = 709
--- a/biology/cufflinks/files/patch-src_locfit_c__plot.c
+++ b/biology/cufflinks/files/patch-src_locfit_c__plot.c
@ -0,0 +1,11 @@
+--- src/locfit/c_plot.c.orig	2020-08-28 18:21:05 UTC
+++ src/locfit/c_plot.c
+@@ -9,7 +9,7 @@ vari *growvar(vari* vold, int n);
+ 
+ plots *cpl, pl[MAXWIN];
+ extern device devps, devwin;
+-INT curwin;
+extern INT curwin;
+ char *psfn;
+ extern lfit lf;
+ extern pplot pp;
--- a/cad/veroroute/Makefile
+++ b/cad/veroroute/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	veroroute
-PORTVERSION=	1.96
+PORTVERSION=	1.97
 PORTEPOCH=	1
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/
--- a/cad/veroroute/distinfo
+++ b/cad/veroroute/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1592187834
-SHA256 (veroroute-1.96.tar.gz) = 7555beccb43658c610f5b089ba5d4e95a1c9d144c3eb86dcc5cd4b4f948f93a6
-SIZE (veroroute-1.96.tar.gz) = 916407
+TIMESTAMP = 1598646392
+SHA256 (veroroute-1.97.tar.gz) = b07bfbb9baca74fa7fa1e7af1c8eb65214e52f249ea31567a5e36297179e9135
+SIZE (veroroute-1.97.tar.gz) = 916607
--- a/comms/dsd/files/patch-dsd.h
+++ b/comms/dsd/files/patch-dsd.h
@ -0,0 +1,11 @@
+--- dsd.h.orig	2020-08-28 19:58:20 UTC
+++ dsd.h
+@@ -40,7 +40,7 @@
+ /*
+  * global variables
+  */
+-int exitflag;
+extern int exitflag;
+ 
+ 
+ typedef struct
--- a/comms/dsd/files/patch-dsd__main.c
+++ b/comms/dsd/files/patch-dsd__main.c
@ -0,0 +1,11 @@
+--- dsd_main.c.orig	2020-08-28 19:59:00 UTC
+++ dsd_main.c
+@@ -25,6 +25,8 @@
+ #include "dmr_const.h"
+ #include "provoice_const.h"
+ 
+int exitflag;
+
+ int
+ comp (const void *a, const void *b)
+ {
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@ -22,6 +22,11 @@ MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 SUB_FILES=	pkg-message

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 CONFLICTS=	efax-gtk-*

 OPTIONS_DEFINE=	DOCS
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gpredict
 DISTVERSION=	2.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://github.com/csete/${PORTNAME}/releases/download/v${DISTVERSION}/

--- a/comms/gpredict/files/patch-src_qth-data.h
+++ b/comms/gpredict/files/patch-src_qth-data.h
@ -0,0 +1,11 @@
+--- src/qth-data.h.orig	2017-12-29 10:28:07 UTC
+++ src/qth-data.h
+@@ -30,7 +30,7 @@ typedef struct {
+     gint            alt;        /*!< Altitude above sea level in meters. */
+ } qth_small_t;
+ 
+-enum {
+static enum {
+     QTH_STATIC_TYPE = 0,
+     QTH_GPSD_TYPE
+ } qth_data_type;
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	linrad
 PORTVERSION=	4.02
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/\
 		http://www.sm5bsz.com/linuxdsp/archive/
@ -53,7 +53,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}/|' \
 		${WRKSRC}/help.c
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}/|' \
-		${WRKSRC}/libfind1.c ${WRKSRC}/help.c
+		${WRKSRC}/libfind1.c

 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
--- a/comms/linrad/files/patch-help.c
+++ b/comms/linrad/files/patch-help.c
@ -1,14 +1,20 @@
--- help.c.orig	2014-11-04 10:25:00 UTC
-+++ help.c
-@@ -583,7 +583,10 @@ void write_from_msg_file(int *line, int msg_no, 
- char s[512];
- char chr;
- int i,j,k;
-msg_file=fopen(msg_filename, "r");
-+char *fn;
-+asprintf(&fn, "%s/%s", "%%LOCALBASE%%share/linrad/", msg_filename);
-+msg_file=fopen(fn, "r");
-+free(fn);
- if(msg_file == NULL)
-   {
-   sprintf(s,"Could not find %s",msg_filename);
+--- help.c.orig	2014-11-04 05:25:00.000000000 -0500
+++ help.c	2020-08-28 11:17:46.820070000 -0400
+@@ -720,7 +720,7 @@
+   printf("\n%s",s);
+   DEB"\n%s",s);
+   }  
+-msg_filename="errors.lir";
+msg_filename="%%DATADIR%%errors.lir";
+ line=3;
+ write_from_msg_file(&line, lir_errcod, screen_mode, ERROR_VERNR);
+ }  
+@@ -730,7 +730,7 @@
+ {
+ int i, line;
+ if(msg_no < 0)return;
+-msg_filename="help.lir";
+msg_filename="%%DATADIR%%help.lir";
+ line=0;
+ settextcolor(15);
+ clear_screen();
--- a/comms/linrad/files/patch-screendef.h
+++ b/comms/linrad/files/patch-screendef.h
@ -0,0 +1,15 @@
+--- screendef.h.orig	2020-08-28 12:43:47 UTC
+++ screendef.h
+@@ -334,9 +334,9 @@ extern int fft3_totmem;
+ extern int radar_totmem;
+ extern int s_meter_avg_filled_flag;
+ 
+-int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
+-int w3sz_offset_hz_old;  //w3sz 
+-int w3sz_users_flag;//w3sz
+extern int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
+extern int w3sz_offset_hz_old;  //w3sz 
+extern int w3sz_users_flag;//w3sz
+ 
+ extern ROUTINE current_mouse_activity;
+ extern int mouse_active_flag;
--- a/comms/linrad/files/patch-xmain.c
+++ b/comms/linrad/files/patch-xmain.c
@ -0,0 +1,13 @@
+--- xmain.c.orig	2014-11-04 10:25:00 UTC
+++ xmain.c
+@@ -52,6 +52,10 @@
+ #include "ldef.h"
+ #include "conf.h"
+ 
+int w3sz_offset_hz;  //w3sz offset equal to ug.par2 to be used elsewhere in program
+int w3sz_offset_hz_old;  //w3sz
+int w3sz_users_flag;//w3sz
+
+ 
+ #if DO_NOT_USE_XKBLIB == TRUE 
+ #define USE_XKBLIB 0
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@ -15,6 +15,11 @@ USE_XORG=	x11 xext xpm xmu xaw xt sm ice

 MAKE_JOBS_UNSAFE=	yes

+CFLAGS+=		-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
 PLIST_FILES=	bin/seyon lib/X11/app-defaults/Seyon \
 		lib/X11/app-defaults/Seyon-color lib/X11/seyon.help \
 		man/man1/${PORTNAME}.1.gz
--- a/converters/psiconv/files/patch-program_psiconv_psiconv.c
+++ b/converters/psiconv/files/patch-program_psiconv_psiconv.c
@ -0,0 +1,11 @@
+--- program/psiconv/psiconv.c.orig	2020-08-28 22:46:41 UTC
+++ program/psiconv/psiconv.c
+@@ -44,6 +44,8 @@
+ #include "psiconv.h"
+ #include "gen.h"
+ 
+psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+
+ static void print_help(void);
+ static void print_version(void);
+ static void strtoupper(char *str);
--- a/converters/psiconv/files/patch-program_psiconv_psiconv.h
+++ b/converters/psiconv/files/patch-program_psiconv_psiconv.h
@ -0,0 +1,11 @@
+--- program/psiconv/psiconv.h.orig	2020-08-28 22:46:41 UTC
+++ program/psiconv/psiconv.h
+@@ -52,7 +52,7 @@ typedef struct fileformat_s {
+   output_function *output;
+ } *fileformat;
+ 
+-psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+extern psiconv_list fileformat_list; /* of struct psiconv_fileformat */
+ 
+ 
+ #endif /* PSICONV_H */
--- a/databases/dbow/Makefile
+++ b/databases/dbow/Makefile
@ -14,6 +14,9 @@ USES=		mysql
 MAKE_ENV+=	MYSQL_INC=${LOCALBASE}/include/mysql \
 		MYSQL_LIB=${LOCALBASE}/lib/mysql

+# Fix build with clang11
+CFLAGS+=	-fcommon
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|CFLAGS=|CFLAGS+=|g" \
 			-e "s|^MYSQL_INC=|MYSQL_INC?=|" \
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@ -39,7 +39,7 @@ LIB_DEPENDS=	libgdal.so:graphics/gdal \
 RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}

-USES=		blaslapack compiler:c11 gl gmake gnome iconv \
+USES=		blaslapack compiler:features gl gmake gnome iconv \
 		jpeg perl5 pkgconfig python:3.6+ readline shebangfix xorg
 SHEBANG_GLOB=	*.py
 SHEBANG_LANG=	nviz
@ -65,6 +65,8 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--enable-largefile \
 		--with-wxwidgets=${WX_CONFIG} \
 		--with-proj-share=${LOCALBASE}/share/proj \
+		--with-proj-includes=${LOCALBASE}/include \
+		--with-proj-libs=${LOCALBASE}/lib \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
@ -135,8 +137,16 @@ ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 PLIST_SUB+=	WOSBRK="@comment "
 .else
 PLIST_SUB+=	WOSBRK=""
-
 .endif
+
+.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
+# clang 7.x and 8.x do not build properly on 11i386
+CPP=		clang-cpp${LLVM_DEFAULT}
+CC=		clang${LLVM_DEFAULT}
+CXX=		clang++${LLVM_DEFAULT}
+BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
+.endif
+
 .if !defined (GRASS_INST_DIR)
 GRASS_INST_DIR=	${PORTNAME}${VER}
 .endif
@ -144,10 +154,6 @@ GRASS_INST_DIR=	${PORTNAME}${VER}
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1

 post-patch:
-#	${REINPLACE_CMD} -e \
-#		's|-lblas|${BLASLIB}|g ; \
-#		 s|-llapack|${LAPACKLIB}|g ; \
-#		 s|g2c|f2c|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e \
 		's|make -C|$$(MAKE) -C| ; \
 		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
--- a/databases/pointcloud/Makefile
+++ b/databases/pointcloud/Makefile
@ -6,6 +6,9 @@ PORTVERSION=	1.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases geography

+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	270f3e112519.patch:-p1
+
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	LIDAR types for PostgreSQL

@ -24,4 +27,7 @@ USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgpointcloud

+post-install:
+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/postgresql/pointcloud-${PORTVERSION:R}.so
+
 .include <bsd.port.mk>
--- a/databases/pointcloud/distinfo
+++ b/databases/pointcloud/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1595926980
+TIMESTAMP = 1598684578
 SHA256 (pgpointcloud-pointcloud-v1.2.1_GH0.tar.gz) = 90742b6f5f9164e273afbb3d0f93335f44d202a8c2df3ff71769de6471d1e427
 SIZE (pgpointcloud-pointcloud-v1.2.1_GH0.tar.gz) = 317926
+SHA256 (270f3e112519.patch) = 81e4252ee94184f7572ee0a3c14d5fffe9104dd5c00b5628661ecbf5f4c79ec1
+SIZE (270f3e112519.patch) = 1571
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@ -5,6 +5,9 @@ PORTVERSION=	3.4.1
 PORTREVISION=	7
 CATEGORIES=	deskutils

+PATCH_SITES=	https://github.com/Cairo-Dock/cairo-dock-plug-ins/commit/
+PATCHFILES=	d08541a0afb4377ce2f35feb280fbe443870b587.patch:-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cairo-Dock-Plugins for Cairo-Dock

--- a/deskutils/cairo-dock-plugins/distinfo
+++ b/deskutils/cairo-dock-plugins/distinfo
@ -1,2 +1,5 @@
+TIMESTAMP = 1598613717
 SHA256 (Cairo-Dock-cairo-dock-plug-ins-3.4.1_GH0.tar.gz) = 321113fb8fa214d965c9827b82890651dc4cd0beb23aef0e2d3f5caf806ebdc2
 SIZE (Cairo-Dock-cairo-dock-plug-ins-3.4.1_GH0.tar.gz) = 7398005
+SHA256 (d08541a0afb4377ce2f35feb280fbe443870b587.patch) = 298f8dd8df6dd632b4b07e17be1cd204c5bb832153bfa43df077e029daddf989
+SIZE (d08541a0afb4377ce2f35feb280fbe443870b587.patch) = 5784
--- a/deskutils/glabels/files/patch-src_font-history.h
+++ b/deskutils/glabels/files/patch-src_font-history.h
@ -0,0 +1,11 @@
+--- src/font-history.h.orig	2020-08-28 23:00:51 UTC
+++ src/font-history.h
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+ 
+ 
+-glFontHistoryModel *gl_font_history;
+extern glFontHistoryModel *gl_font_history;
+ 
+ 
+ void            gl_font_history_init (void);
--- a/deskutils/glabels/files/patch-src_template-history.h
+++ b/deskutils/glabels/files/patch-src_template-history.h
@ -0,0 +1,11 @@
+--- src/template-history.h.orig	2020-08-28 23:00:22 UTC
+++ src/template-history.h
+@@ -28,7 +28,7 @@
+ G_BEGIN_DECLS
+ 
+ 
+-glTemplateHistoryModel *gl_template_history;
+extern glTemplateHistoryModel *gl_template_history;
+ 
+ 
+ void            gl_template_history_init (void);
--- a/deskutils/just/Makefile
+++ b/deskutils/just/Makefile
@ -2,8 +2,7 @@

 PORTNAME=	just
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.1
-PORTREVISION=	2
+DISTVERSION=	0.7.2
 CATEGORIES=	deskutils

 MAINTAINER=	yuri@FreeBSD.org
@ -21,11 +20,11 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		ansi_term-0.12.1 \
 		atty-0.2.14 \
 		bitflags-1.2.1 \
-		cc-1.0.58 \
+		cc-1.0.59 \
 		cfg-if-0.1.10 \
-		clap-2.33.1 \
+		clap-2.33.3 \
 		ctor-0.1.15 \
-		ctrlc-3.1.5 \
+		ctrlc-3.1.6 \
 		derivative-2.1.1 \
 		difference-2.0.0 \
 		doc-comment-0.3.3 \
@ -37,14 +36,14 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		hermit-abi-0.1.15 \
 		humantime-1.3.0 \
 		lazy_static-1.4.0 \
-		libc-0.2.72 \
+		libc-0.2.76 \
 		log-0.4.11 \
 		memchr-2.3.3 \
 		nix-0.17.0 \
 		output_vt100-0.1.2 \
-		ppv-lite86-0.2.8 \
+		ppv-lite86-0.2.9 \
 		pretty_assertions-0.6.1 \
-		proc-macro2-1.0.18 \
+		proc-macro2-1.0.19 \
 		quick-error-1.2.3 \
 		quote-1.0.7 \
 		rand-0.7.3 \
@ -58,7 +57,7 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		snafu-0.6.8 \
 		snafu-derive-0.6.8 \
 		strsim-0.8.0 \
-		syn-1.0.34 \
+		syn-1.0.39 \
 		target-1.0.0 \
 		tempfile-3.1.0 \
 		termcolor-1.1.0 \
@ -71,7 +70,7 @@ CARGO_CRATES=	aho-corasick-0.7.13 \
 		vec_map-0.8.2 \
 		void-1.0.2 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
-		which-4.0.1 \
+		which-4.0.2 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
--- a/deskutils/just/distinfo
+++ b/deskutils/just/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1595259358
+TIMESTAMP = 1598646691
 SHA256 (rust/crates/aho-corasick-0.7.13.tar.gz) = 043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86
 SIZE (rust/crates/aho-corasick-0.7.13.tar.gz) = 111381
 SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
@ -9,16 +9,16 @@ SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e9
 SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470
 SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
 SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
-SHA256 (rust/crates/cc-1.0.58.tar.gz) = f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518
-SIZE (rust/crates/cc-1.0.58.tar.gz) = 52896
+SHA256 (rust/crates/cc-1.0.59.tar.gz) = 66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381
+SIZE (rust/crates/cc-1.0.59.tar.gz) = 53238
 SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
 SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
-SHA256 (rust/crates/clap-2.33.1.tar.gz) = bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129
-SIZE (rust/crates/clap-2.33.1.tar.gz) = 201567
+SHA256 (rust/crates/clap-2.33.3.tar.gz) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.tar.gz) = 201925
 SHA256 (rust/crates/ctor-0.1.15.tar.gz) = 39858aa5bac06462d4dd4b9164848eb81ffc4aa5c479746393598fd193afa227
 SIZE (rust/crates/ctor-0.1.15.tar.gz) = 4686
-SHA256 (rust/crates/ctrlc-3.1.5.tar.gz) = 54dedab740bc412d514cfbc4a1d9d5d16fed02c4b14a7be129003c07fdc33b9b
-SIZE (rust/crates/ctrlc-3.1.5.tar.gz) = 12644
+SHA256 (rust/crates/ctrlc-3.1.6.tar.gz) = d0b676fa23f995faf587496dcd1c80fead847ed58d2da52ac1caca9a72790dd2
+SIZE (rust/crates/ctrlc-3.1.6.tar.gz) = 12665
 SHA256 (rust/crates/derivative-2.1.1.tar.gz) = cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f
 SIZE (rust/crates/derivative-2.1.1.tar.gz) = 45571
 SHA256 (rust/crates/difference-2.0.0.tar.gz) = 524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198
@ -41,8 +41,8 @@ SHA256 (rust/crates/humantime-1.3.0.tar.gz) = df004cfca50ef23c36850aaaa59ad52cc7
 SIZE (rust/crates/humantime-1.3.0.tar.gz) = 17020
 SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
-SHA256 (rust/crates/libc-0.2.72.tar.gz) = a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701
-SIZE (rust/crates/libc-0.2.72.tar.gz) = 478292
+SHA256 (rust/crates/libc-0.2.76.tar.gz) = 755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3
+SIZE (rust/crates/libc-0.2.76.tar.gz) = 506496
 SHA256 (rust/crates/log-0.4.11.tar.gz) = 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
 SIZE (rust/crates/log-0.4.11.tar.gz) = 36276
 SHA256 (rust/crates/memchr-2.3.3.tar.gz) = 3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400
@ -51,12 +51,12 @@ SHA256 (rust/crates/nix-0.17.0.tar.gz) = 50e4785f2c3b7589a0d0c1dd60285e1188adac4
 SIZE (rust/crates/nix-0.17.0.tar.gz) = 195654
 SHA256 (rust/crates/output_vt100-0.1.2.tar.gz) = 53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9
 SIZE (rust/crates/output_vt100-0.1.2.tar.gz) = 4062
-SHA256 (rust/crates/ppv-lite86-0.2.8.tar.gz) = 237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea
-SIZE (rust/crates/ppv-lite86-0.2.8.tar.gz) = 20848
+SHA256 (rust/crates/ppv-lite86-0.2.9.tar.gz) = c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20
+SIZE (rust/crates/ppv-lite86-0.2.9.tar.gz) = 20933
 SHA256 (rust/crates/pretty_assertions-0.6.1.tar.gz) = 3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427
 SIZE (rust/crates/pretty_assertions-0.6.1.tar.gz) = 61551
-SHA256 (rust/crates/proc-macro2-1.0.18.tar.gz) = beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa
-SIZE (rust/crates/proc-macro2-1.0.18.tar.gz) = 36252
+SHA256 (rust/crates/proc-macro2-1.0.19.tar.gz) = 04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12
+SIZE (rust/crates/proc-macro2-1.0.19.tar.gz) = 36390
 SHA256 (rust/crates/quick-error-1.2.3.tar.gz) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
 SIZE (rust/crates/quick-error-1.2.3.tar.gz) = 15066
 SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
@ -83,8 +83,8 @@ SHA256 (rust/crates/snafu-derive-0.6.8.tar.gz) = ebf8f7d5720104a9df0f7076a868202
 SIZE (rust/crates/snafu-derive-0.6.8.tar.gz) = 17529
 SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
 SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
-SHA256 (rust/crates/syn-1.0.34.tar.gz) = 936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b
-SIZE (rust/crates/syn-1.0.34.tar.gz) = 205051
+SHA256 (rust/crates/syn-1.0.39.tar.gz) = 891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9
+SIZE (rust/crates/syn-1.0.39.tar.gz) = 224707
 SHA256 (rust/crates/target-1.0.0.tar.gz) = 10000465bb0cc031c87a44668991b284fd84c0e6bd945f62d4af04e9e52a222a
 SIZE (rust/crates/target-1.0.0.tar.gz) = 4390
 SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
@ -109,8 +109,8 @@ SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacf
 SIZE (rust/crates/void-1.0.2.tar.gz) = 2356
 SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
 SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
-SHA256 (rust/crates/which-4.0.1.tar.gz) = b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131
-SIZE (rust/crates/which-4.0.1.tar.gz) = 7497
+SHA256 (rust/crates/which-4.0.2.tar.gz) = 87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef
+SIZE (rust/crates/which-4.0.2.tar.gz) = 7531
 SHA256 (rust/crates/winapi-0.3.9.tar.gz) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.tar.gz) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
@ -119,5 +119,5 @@ SHA256 (rust/crates/winapi-util-0.1.5.tar.gz) = 70ec6ce85bb158151cae5e5c87f95a8e
 SIZE (rust/crates/winapi-util-0.1.5.tar.gz) = 10164
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (casey-just-v0.7.1_GH0.tar.gz) = eb721634a725b24d1c00caa8bc14c2993d5d512a8d040993ada0e4744e180669
-SIZE (casey-just-v0.7.1_GH0.tar.gz) = 168738
+SHA256 (casey-just-v0.7.2_GH0.tar.gz) = 85c2992bc0c24940842db8006aca8d0ae5f487a60133212066d5da57bdde6ea2
+SIZE (casey-just-v0.7.2_GH0.tar.gz) = 170026
--- a/devel/R-cran-glue/Makefile
+++ b/devel/R-cran-glue/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	glue
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/devel/R-cran-glue/distinfo
+++ b/devel/R-cran-glue/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1589432213
-SHA256 (glue_1.4.1.tar.gz) = f8b687d35cacb5ee7fcada6e9c26ea20c04d0bdc9d37e919a03abd1137513bc8
-SIZE (glue_1.4.1.tar.gz) = 98581
+TIMESTAMP = 1597197388
+SHA256 (glue_1.4.2.tar.gz) = 9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad
+SIZE (glue_1.4.2.tar.gz) = 99049
--- a/devel/R-cran-tidyr/Makefile
+++ b/devel/R-cran-tidyr/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	tidyr
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}

@ -21,10 +21,10 @@ CRAN_DEPENDS=	R-cran-dplyr>=0.8.2:math/R-cran-dplyr \
 		R-cran-tidyselect>=1.1.0:devel/R-cran-tidyselect \
 		R-cran-vctrs>=0.3.0:devel/R-cran-vctrs \
 		R-cran-lifecycle>0:devel/R-cran-lifecycle \
-		R-cran-cpp11>0:devel/R-cran-cpp11
+		R-cran-cpp11>=0.2.1:devel/R-cran-cpp11
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}

-USES=	cran:auto-plist,compiles
+USES=	compiler:c++11-lang cran:auto-plist,compiles

 .include <bsd.port.mk>
--- a/devel/R-cran-tidyr/distinfo
+++ b/devel/R-cran-tidyr/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1596357873
-SHA256 (tidyr_1.1.1.tar.gz) = 50d23f00e0f885f490f6561852315b044bf3e9df39f5aff50b62766510207b15
-SIZE (tidyr_1.1.1.tar.gz) = 879411
+TIMESTAMP = 1597196004
+SHA256 (tidyr_1.1.2.tar.gz) = 08fccb67824515b33187886f3ca2cf2fe747a778514892dbbf5e565edf0dfd6c
+SIZE (tidyr_1.1.2.tar.gz) = 881544
--- a/devel/R-cran-vctrs/Makefile
+++ b/devel/R-cran-vctrs/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	vctrs
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	devel
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/devel/R-cran-vctrs/distinfo
+++ b/devel/R-cran-vctrs/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1595023158
-SHA256 (vctrs_0.3.2.tar.gz) = 624599bda2f44af65cf6ae31235692da57b46d039ed4c308a95149a2ebd84817
-SIZE (vctrs_0.3.2.tar.gz) = 958372
+TIMESTAMP = 1597172198
+SHA256 (vctrs_0.3.3.tar.gz) = 1b68a621a2bd47d53738934ceee58bb035844f528f65e3b1a4df1dc15e0dd904
+SIZE (vctrs_0.3.3.tar.gz) = 995034
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@ -12,6 +12,12 @@ COMMENT=	Set of portable software build utilities
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR}

+CFLAGS+=	-fcommon
+
+EXPIRATION_DATE=	2020-09-30
+DEPRECATED=		Unmaintained and dead upstream
+
+
 OPTIONS_DEFINE=	DOCS

 post-patch:
--- a/devel/cligen/files/patch-cligen__getline.h
+++ b/devel/cligen/files/patch-cligen__getline.h
@ -0,0 +1,20 @@
+--- cligen_getline.h.orig	2020-08-28 17:05:52 UTC
+++ cligen_getline.h
+@@ -48,11 +48,11 @@ void	gl_redraw(cligen_handle h);	/* issue \n and redra
+ int     gl_regfd(int, cligen_fd_cb_t *, void *);
+ int     gl_unregfd(int);
+ 
+-int 	(*gl_in_hook)(void *, char *);
+-int 	(*gl_out_hook)(void*, char *);
+-int	(*gl_tab_hook)(cligen_handle, int *);
+-cligen_susp_cb_t *gl_susp_hook;
+-cligen_interrupt_cb_t *gl_interrupt_hook;
+-int	(*gl_qmark_hook)(cligen_handle, char *);
+extern int 	(*gl_in_hook)(void *, char *);
+extern int 	(*gl_out_hook)(void*, char *);
+extern int	(*gl_tab_hook)(cligen_handle, int *);
+extern cligen_susp_cb_t *gl_susp_hook;
+extern cligen_interrupt_cb_t *gl_interrupt_hook;
+extern int	(*gl_qmark_hook)(cligen_handle, char *);
+ 
+ #endif /* CLIGEN_GETLINE_H */
--- a/devel/dia2code/files/patch-dia2code_dia2code.h
+++ b/devel/dia2code/files/patch-dia2code_dia2code.h
@ -0,0 +1,14 @@
+--- dia2code/dia2code.h.orig	2020-08-28 18:44:14 UTC
+++ dia2code/dia2code.h
+@@ -305,8 +305,8 @@ param_list * d2c_parameter_set(char *name, char *value
+ char * d2c_parameter_value(char *name);
+ param_list *d2c_parameter_find(char *name);
+ 
+-int indent_count;
+-int indent_open_brace_on_newline;
+-int generate_backup;
+extern int indent_count;
+extern int indent_open_brace_on_newline;
+extern int generate_backup;
+ 
+ #endif
--- a/devel/dia2code/files/patch-dia2code_main.c
+++ b/devel/dia2code/files/patch-dia2code_main.c
@ -0,0 +1,10 @@
+--- dia2code/main.c.orig	2020-08-28 18:45:26 UTC
+++ dia2code/main.c
+@@ -72,6 +72,7 @@ char *outdir = NULL;   /* Output directory */
+ 
+ int INDENT_CNT = 4; /* This should be a parameter in the command line */
+ int bOpenBraceOnNewline = 1; /* This should also be a command-line parameter */
+int generate_backup;
+ 
+ int main(int argc, char **argv) {
+     int i;
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@ -8,6 +8,9 @@ DISTVERSION=	3.3.3
 PORTREVISION=	2
 CATEGORIES=	devel

+PATCH_SITES=	https://github.com/distcc/distcc/commit/
+PATCHFILES=	307f6cfe58ff3fb7e4b3ef1044a5dfc2006f95f5.patch:-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Distribute compilation of C(++) code across machines on a network

--- a/devel/distcc/distinfo
+++ b/devel/distcc/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1597859002
+TIMESTAMP = 1598642085
 SHA256 (distcc-distcc-v3.3.3_GH0.tar.gz) = b7f37d314704fbaf006d747514ff6e4d0d722102ef7d2aea132f97cf170f5169
 SIZE (distcc-distcc-v3.3.3_GH0.tar.gz) = 1000021
+SHA256 (307f6cfe58ff3fb7e4b3ef1044a5dfc2006f95f5.patch) = bdb625de75400a79f873f323691fb980bbbe5373b24300e055edd475c6c23144
+SIZE (307f6cfe58ff3fb7e4b3ef1044a5dfc2006f95f5.patch) = 1378
--- a/devel/djgpp-binutils/files/patch-gas_dwarf2dbg.h
+++ b/devel/djgpp-binutils/files/patch-gas_dwarf2dbg.h
@ -0,0 +1,11 @@
+--- gas/dwarf2dbg.h.orig	2020-08-28 19:16:43 UTC
+++ gas/dwarf2dbg.h
+@@ -78,7 +78,7 @@ extern void dwarf2_emit_label (symbolS *);
+ /* True when we're supposed to set the basic block mark whenever a label
+    is seen.  Unless the target is doing Something Weird, just call 
+    dwarf2_emit_label.  */
+-bfd_boolean dwarf2_loc_mark_labels;
+extern bfd_boolean dwarf2_loc_mark_labels;
+ 
+ extern void dwarf2_finish (void);
+ 
--- a/devel/etcd34/Makefile
+++ b/devel/etcd34/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	etcd
-PORTVERSION=	3.4.12
+PORTVERSION=	3.4.13
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	coreos-
--- a/devel/etcd34/distinfo
+++ b/devel/etcd34/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1598003136
-SHA256 (coreos-etcd-v3.4.12_GH0.tar.gz) = 9219feb530a5831b9867e359ad44df919c22f5409da5f9634d667155d82939c2
-SIZE (coreos-etcd-v3.4.12_GH0.tar.gz) = 8958069
+TIMESTAMP = 1598604358
+SHA256 (coreos-etcd-v3.4.13_GH0.tar.gz) = 2c19f286909a746c4be3b220c8b39474bd5edc33dde92b990ac47765e25f2089
+SIZE (coreos-etcd-v3.4.13_GH0.tar.gz) = 9181594
--- a/devel/genie/Makefile
+++ b/devel/genie/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	genie
-PORTVERSION=	g2018111101
+PORTVERSION=	g2020082801
 CATEGORIES=	devel

 MAINTAINER=	swills@FreeBSD.org
@ -11,7 +11,7 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	bkaradzic
 GH_PROJECT=	GENie
-GH_TAGNAME=	d054bb1
+GH_TAGNAME=	a503d6e

 MAKE_ARGS=	-C build/gmake.freebsd config=release CC=${CC} CXX=${CXX}
 MAKE_JOBS_UNSAFE=	yes
--- a/devel/genie/distinfo
+++ b/devel/genie/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1541985773
-SHA256 (bkaradzic-GENie-g2018111101-d054bb1_GH0.tar.gz) = 07b942fad7e6faaa7a7f1ddf06c3ec0ae7e1f9f422affe2211d05f1c6878975d
-SIZE (bkaradzic-GENie-g2018111101-d054bb1_GH0.tar.gz) = 541462
+TIMESTAMP = 1598641181
+SHA256 (bkaradzic-GENie-g2020082801-a503d6e_GH0.tar.gz) = b820925faaeb8fbe9a562b0ea1370a7deb28ac881799f1da0a85c717321db46a
+SIZE (bkaradzic-GENie-g2020082801-a503d6e_GH0.tar.gz) = 553692
--- a/devel/genie/files/patch-src_actions_make_make__cpp.lua
+++ b/devel/genie/files/patch-src_actions_make_make__cpp.lua
@ -1,28 +0,0 @@
--- src/actions/make/make_cpp.lua.orig	2018-11-12 04:25:03 UTC
-+++ src/actions/make/make_cpp.lua
-@@ -435,11 +435,11 @@
- 
- 		_p('  ALL_CPPFLAGS       += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), " "))
- 
-		_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_asm)))
-		_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))
-		_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))
-		_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))
-		_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))
-+		_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_asm)))
-+		_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))
-+		_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))
-+		_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))
-+		_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))
- 
- 		_p('  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',
- 		        make.list(table.join(cc.getdefines(cfg.resdefines),
-@@ -495,7 +495,7 @@
- 			end
- 		else
- 			local tool = iif(cfg.language == "C", "CC", "CXX")
-			_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool)
-+			_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)', tool)
- 		end
- 	end
- 
--- a/devel/genie/files/patch-src_host_scripts.c
+++ b/devel/genie/files/patch-src_host_scripts.c
@ -1,15 +0,0 @@
--- src/host/scripts.c.orig	2018-11-12 04:25:40 UTC
-+++ src/host/scripts.c
-@@ -235,9 +235,9 @@ const char* builtin_scripts[] = {
- 	" do\nif useresponse then\ncfg.objresponsepath = string.format(\"%s.%s.objects\"\n, path.removeext(_MAKE.getmakefilename(prj, true))\n, _MAKE.esc(cfg.shortname)\n)\npremake.generate(prj, cfg.objresponsepath, function()\nfor _, file in ipairs(cfg.files) do\nif path.issourcefile(file) and not is_excluded(prj, cfg, file) then\n_p('%s/%s.o'\n, _MAKE.esc(cfg.objectsdir)\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend)\nend\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(config),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\nlocal targetDir = _MAKE.esc(cfg.buildtarget.directory)\n_p('  ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") ..    'OBJDIR              = %s', _MAKE.esc(cfg.objectsdir))\n_p('  ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR           = %s', iif(targetDir == \"\", \".\", targetDir))\n_p('  ' .. (table.contains("
- 	"premake.make.override,\"TARGET\") and \"override \" or \"\") ..    'TARGET              = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p('  DEFINES            +=%s', make.list(_MAKE.escquote(cc.getdefines(cfg.defines))))\nlocal id  = make.list(cc.getincludedirs(cfg.includedirs));\nlocal uid = make.list(cc.getquoteincludedirs(cfg.userincludedirs))\nlocal sid = make.list(cc.getsystemincludedirs(cfg.systemincludedirs))\nif id ~= \"\" then\n_p('  INCLUDES           +=%s', id)\nend\nif uid ~= \"\" then\n_p('  INCLUDES           +=%s', uid)\nend\nif sid ~= \"\" then\n_p('  INCLUDES           +=%s', sid)\nend\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(prj, cfg, cc)\ntable.sort(cfg.files)\n_p('  OBJECTS := \\\\')\nfor _, file in ipairs(cfg.files) do\nif path.issourcefile(file) then\nif not is_excluded(prj, cfg, file) then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p('  define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo"
- 	" Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define PRELINKCMDS')\nif #cfg.prelinkcommands > 0 then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\n_p('  define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p('  endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p('  CC         = %s', platform.cc)\nend\nif platform.cxx then\n_p('  CXX        = %s', platform.cxx)\nend\nif platform.ar then\n_p('  AR         = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p('  FORCE_INCLUDE      += -include $(OBJDIR)/$(notdir $(PCH))')\n_p('  FORCE_INCLUDE_OBJC"
-	" += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p('  FORCE_INCLUDE      += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p('  ALL_CPPFLAGS       += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_asm)))\n_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)"
-	" $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p('  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n        make.list(table.join(cc.getdefines(cfg.resdefines),\n                                cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nlocal lddeps\nif #cfg.wholearchive > 0 then\nlibdeps = {}\nlddeps  = {}\nfor _, linkcfg in ipairs(premake.getlinks(cfg, \"siblings\", \"object\")) do\nlocal linkpath = path.rebase(linkcfg.linktarget.fullpath, linkcfg.location, cfg.location)\nif table.icontains(cfg.wholearchive, linkcfg.project.name) then\nlddeps = table.join(lddeps, cc.wholearchive(linkpath))\nelse\ntable.insert(lddeps, linkpath)\nend\ntable.insert(libdeps, linkpath)\nend\nlibdeps = make.list(_MAKE.esc(libdeps))\nlddeps  = make.list(_MAKE.esc(lddeps))\nelse\nlibdeps = make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\""
-	")))\nlddeps  = libdeps\nend\n_p('  ALL_LDFLAGS        += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p('  LIBDEPS            +=%s', libdeps)\n_p('  LDDEPS             +=%s', lddeps)\n_p('  LIBS               += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\n_p('  EXTERNAL_LIBS      +=%s', make.list(cc.getlibfiles(cfg)))\n_p('  LINKOBJS            = %s', (cfg.objresponsepath and (\"@\" .. cfg.objresponsepath) or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p('  LINKCMD_NDX         = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ARCH) $(ALL_LDFLA"
-+	" += -include $(OBJDIR)/$(notdir $(PCH))_objc')\nend\nif #cfg.forcedincludes > 0 then\n_p('  FORCE_INCLUDE      += -include %s'\n,_MAKE.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p('  ALL_CPPFLAGS       += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)', table.concat(cc.getcppflags(cfg), \" \"))\n_p('  ALL_ASMFLAGS       += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_asm)))\n_p('  ALL_CFLAGS         += $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p('  ALL_CXXFLAGS       += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p('  ALL_OBJCFLAGS      += $(CFLAGS) $(ALL_CPPFLAGS)%s', make.list(table.join(cc.getcflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p('  ALL_OBJCPPFLAGS    += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS)"
-+	"%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cc.getobjcflags(cfg), cfg.buildoptions, cfg.buildoptions_objcpp)))\n_p('  ALL_RESFLAGS       += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n        make.list(table.join(cc.getdefines(cfg.resdefines),\n                                cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\nlocal libdeps\nlocal lddeps\nif #cfg.wholearchive > 0 then\nlibdeps = {}\nlddeps  = {}\nfor _, linkcfg in ipairs(premake.getlinks(cfg, \"siblings\", \"object\")) do\nlocal linkpath = path.rebase(linkcfg.linktarget.fullpath, linkcfg.location, cfg.location)\nif table.icontains(cfg.wholearchive, linkcfg.project.name) then\nlddeps = table.join(lddeps, cc.wholearchive(linkpath))\nelse\ntable.insert(lddeps, linkpath)\nend\ntable.insert(libdeps, linkpath)\nend\nlibdeps = make.list(_MAKE.esc(libdeps))\nlddeps  = make.list(_MAKE.esc(lddeps))\nelse\nlibdeps = make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\""
-+	")))\nlddeps  = libdeps\nend\n_p('  ALL_LDFLAGS        += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p('  LIBDEPS            +=%s', libdeps)\n_p('  LDDEPS             +=%s', lddeps)\n_p('  LIBS               += $(LDDEPS)%s', make.list(cc.getlinkflags(cfg)))\n_p('  EXTERNAL_LIBS      +=%s', make.list(cc.getlibfiles(cfg)))\n_p('  LINKOBJS            = %s', (cfg.objresponsepath and (\"@\" .. cfg.objresponsepath) or \"$(OBJECTS)\"))\nif cfg.kind == \"StaticLib\" then\nif (not prj.options.ArchiveSplit) then\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\nelse\n_p('  LINKCMD             = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, false)))\n_p('  LINKCMD_NDX         = $(AR) %s $(TARGET)', make.list(cc.getarchiveflags(prj, cfg, true)))\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p('  LINKCMD             = $(%s) -o $(TARGET) $(LINKOBJS) $(RESOURCES) $(ALL_LDFLA"
- 	"GS) $(LIBS)', tool)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath, pch)\nif os.isfile(testname) then\npch = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p('  PCH                 = %s', _MAKE.esc(pch))\n_p('  GCH                 = $(OBJDIR)/$(notdir $(PCH)).gch')\n_p('  GCH_OBJC            = $(OBJDIR)/$(notdir $(PCH))_objc.gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH) $(MAKEFILE) | $(OBJDIR)')\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_CFLAGS) -x c-header\", \"$(CXX) $(ALL_CXXFLAGS) -x c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('')\n_p('$(GCH_OBJC): $(PCH) $(MAKEFILE) | $"
- 	"(OBJDIR)')\nif prj.msgprecompile then\n_p('\\t@echo ' .. prj.msgprecompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nlocal cmd = iif(prj.language == \"C\", \"$(CC) $(ALL_OBJCFLAGS) -x objective-c-header\", \"$(CXX) $(ALL_OBJCPPFLAGS) -x objective-c++-header\")\n_p('\\t$(SILENT) %s $(DEFINES) $(INCLUDES) -o \"$@\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj, cc)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\ntable.sort(prj.allfiles)\nfor _, file in ipairs(prj.allfiles or {}) do\nif path.issourcefile(file) then\nif (path.isobjcfile(file)) then\n_p('$(OBJDIR)/%s.o: %s $(GCH_OBJC) $(MAKEFILE) | $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nelse\n_p('$(OBJDIR)/%s.o: %s $(GCH) $(MAKEFILE) | $(OBJDIR)/%s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n, _MAKE.esc(path.getdirectory(path.trimdots(file)))\n)\nend\nif (path.isobjcfile(file) an"
- 	"d prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\nif (path.iscfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nelse\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCPPFLAGS) $(FORCE_INCLUDE_OBJC) -o \"$@\" -c \"$<\"')\nend\nelseif (path.isasmfile(file)) then\n_p('\\t$(SILENT) $(CC) $(ALL_ASMFLAGS) -o \"$@\" -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\nfor _, task in ipairs(prj.postcompiletasks or {}) do\n_p('\\t$(SILENT) %s', task)\n_p('')\nend\n_p('')\nelseif (path.getextension(file) == \".rc\") then\n_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\nif prj.msgresource then\n_p('\\t@echo ' .. prj.msgresource)\nelse\n_p('\\t@echo $(notdir $<)')\nend\n_p('\\t$(SILENT) $(RESCOMP) $< -O coff -o \"$@\" $(ALL_RESFLAGS)')\n_p('')\nend\nend\ne"
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	git-codereview
-PORTVERSION=	0.0.0.2016030201
-PORTREVISION=	1
+PORTVERSION=	0.0.0.2020082801
 CATEGORIES=	devel

 MAINTAINER=	swills@FreeBSD.org
@ -13,7 +12,7 @@ USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
 GH_PROJECT=	review
-GH_TAGNAME=	77ae237
+GH_TAGNAME=	a2b90d2

 GO_PKGNAME=	golang.org/x/review
 GO_TARGET=	./git-codereview
--- a/devel/git-codereview/distinfo
+++ b/devel/git-codereview/distinfo
@ -1,2 +1,3 @@
-SHA256 (golang-review-0.0.0.2016030201-77ae237_GH0.tar.gz) = 3ca9ccb2938592f822014a502ff8985b7da6da19eedcb90b50350e79a63ad48a
-SIZE (golang-review-0.0.0.2016030201-77ae237_GH0.tar.gz) = 50358
+TIMESTAMP = 1598640852
+SHA256 (golang-review-0.0.0.2020082801-a2b90d2_GH0.tar.gz) = 5cb93c80baf6f9190084da175044455a6adeb8a6a83521b0bfedcc4511cbeaef
+SIZE (golang-review-0.0.0.2020082801-a2b90d2_GH0.tar.gz) = 57929
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	gitaly
-DISTVERSION=	13.3.0
+DISTVERSION=	13.3.2
 PORTREVISION=	0
 CATEGORIES=	devel

@ -42,7 +42,7 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	acbb9772e864cae2e0a8f6b015a75e1ee7199de6
+GL_COMMIT=	ffa009f1d830f7ce710e89c5a8d9870fff42e252

 # for go dependencies
 USE_GITHUB=	nodefault
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@ -1,4 +1,4 @@
-TIMESTAMP = 1598284290
+TIMESTAMP = 1598640996
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@ -99,8 +99,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-acbb9772e864cae2e0a8f6b015a75e1ee7199de6_GL0.tar.gz) = 5fca740be1fb0e1c325630b40cba55aae6de321890dd25935714cff67c891c8a
-SIZE (gitlab-org-gitaly-acbb9772e864cae2e0a8f6b015a75e1ee7199de6_GL0.tar.gz) = 3098698
+SHA256 (gitlab-org-gitaly-ffa009f1d830f7ce710e89c5a8d9870fff42e252_GL0.tar.gz) = b77fa434c5ac1e740e4e6a15a64f8e35f3e21d390e183df89fc01f0d8d357138
+SIZE (gitlab-org-gitaly-ffa009f1d830f7ce710e89c5a8d9870fff42e252_GL0.tar.gz) = 3099031
 SHA256 (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 9a2a40a6c44802b1de7ff46bc9c6bc97c8be179d0ca4fe755c22044650d3f84c
 SIZE (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 65840
 SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95
--- a/devel/jiri/Makefile
+++ b/devel/jiri/Makefile
@ -1,30 +1,31 @@
 # $FreeBSD$

 PORTNAME=	jiri
-PORTVERSION=	g2019.01.03.01
+PORTVERSION=	g${TIMESTAMP:S/-/./g:C/T.*//g}
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/swills
-DISTNAME=	${GITHASH}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	jiri

 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Tool for multi-repo development

 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKDIR}/src/fuchsia.googlesource.com/jiri/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	cmake:devel/cmake \
 		ninja:devel/ninja
 RUN_DEPENDS=	git:devel/git

-USES=		go
+USES=		go:modules

-GITHASH=	56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1
-TIMESTAMP=	2019-01-03T00:00:00.000000
-EXTRACT_AFTER_ARGS=	-s "!^!src/fuchsia.googlesource.com/jiri/!"
+GITHASH=	1eee1043d12d1baabae7f2466cc0b1646395e32c
+TIMESTAMP=	2020-08-28T00:00:00.000000
 PLIST_FILES=	bin/jiri
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:net:a7b16738d86b:golang_net/vendor/golang.org/x/net \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync

-GO_PKGNAME=	fuchsia.googlesource.com/jiri
 GO_TARGET=	./cmd/jiri
 GO_BUILDFLAGS=	-ldflags="\
 		-s -w \
--- a/devel/jiri/distinfo
+++ b/devel/jiri/distinfo
@ -1,3 +1,7 @@
-TIMESTAMP = 1546968530
-SHA256 (jiri/56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1.tar.gz) = 450e22775b373e3568d7ecf437c662323835f8c4cdc237a7ed9738a93da61ca7
-SIZE (jiri/56b2a541f92f3bd9d28b29e1cbcb16f96d6bc6c1.tar.gz) = 226330
+TIMESTAMP = 1598646913
+SHA256 (jiri/jiri-g2020.08.28.tar.gz) = d0200c5ee9ddb0ab898ec38746200e676cf336fc22581536bceff4d58bc01fb4
+SIZE (jiri/jiri-g2020.08.28.tar.gz) = 275099
+SHA256 (jiri/golang-net-a7b16738d86b_GH0.tar.gz) = 77cc2a72affacce9d23ef787cc88852d69d52988b0d1cda7dded0d83b5b97722
+SIZE (jiri/golang-net-a7b16738d86b_GH0.tar.gz) = 1099935
+SHA256 (jiri/golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (jiri/golang-sync-112230192c58_GH0.tar.gz) = 16832
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	libzim
-PORTVERSION=	6.1.8
+PORTVERSION=	6.2.0
 CATEGORIES=	devel

 MAINTAINER=	swills@FreeBSD.org
--- a/devel/libzim/distinfo
+++ b/devel/libzim/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1595027958
-SHA256 (openzim-libzim-6.1.8_GH0.tar.gz) = 1be605b1d22a0a7c225e80eab2cb1a249bf0f1b500ec8ed42e1091fc96c49fb3
-SIZE (openzim-libzim-6.1.8_GH0.tar.gz) = 28589142
+TIMESTAMP = 1598621169
+SHA256 (openzim-libzim-6.2.0_GH0.tar.gz) = 58ea026dd397027b66aa20db7b1070c349d58216e8eaf38d812d5b9b9c2d761f
+SIZE (openzim-libzim-6.2.0_GH0.tar.gz) = 28594832
--- a/devel/libzim/files/patch-meson.build
+++ b/devel/libzim/files/patch-meson.build
@ -1,23 +0,0 @@
--- meson.build.orig	2020-07-15 14:24:54 UTC
-+++ meson.build
-@@ -7,7 +7,8 @@ if build_machine.system() != 'windows'
-   add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp')
- endif
- 
-sizeof_off_t = meson.get_compiler('cpp').sizeof('off_t')
-+cpp = meson.get_compiler('cpp')
-+sizeof_off_t = cpp.sizeof('off_t')
- 
- conf = configuration_data()
- conf.set('VERSION', '"@0@"'.format(meson.project_version()))
-@@ -32,6 +33,10 @@ lzma_dep = dependency('liblzma', static:static_linkage
- 
- zstd_dep = dependency('libzstd', required:false, static:static_linkage)
- conf.set('ENABLE_ZSTD', zstd_dep.found())
-+
-+if target_machine.system() == 'freebsd'
-+    execinfo_dep = cpp.find_library('execinfo')
-+endif
- 
- xapian_dep = dependency('xapian-core',
-                         required:false,
--- a/devel/libzim/files/patch-src_buffer.cpp
+++ b/devel/libzim/files/patch-src_buffer.cpp
@ -1,11 +0,0 @@
--- src/buffer.cpp.orig	2020-07-15 14:24:54 UTC
-+++ src/buffer.cpp
-@@ -48,6 +48,8 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_
-   _offset = offset-pa_offset;
- #if defined(__APPLE__) || defined(__OpenBSD__)
-   #define MAP_FLAGS MAP_PRIVATE
-+#elif defined(__FreeBSD__)
-+  #define MAP_FLAGS MAP_PRIVATE|MAP_PREFAULT_READ
- #else
-   #define MAP_FLAGS MAP_PRIVATE|MAP_POPULATE
- #endif
--- a/devel/libzim/files/patch-src_fs__unix.cpp
+++ b/devel/libzim/files/patch-src_fs__unix.cpp
@ -1,11 +0,0 @@
--- src/fs_unix.cpp.orig	2020-07-15 14:24:54 UTC
-+++ src/fs_unix.cpp
-@@ -34,7 +34,7 @@ namespace unix {
- 
- zsize_t FD::readAt(char* dest, zsize_t size, offset_t offset) const
- {
-#if defined(__APPLE__) || defined(__OpenBSD__)
-+#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- # define PREAD pread
- #else
- # define PREAD pread64
--- a/devel/libzim/files/patch-src_meson.build
+++ b/devel/libzim/files/patch-src_meson.build
@ -1,13 +0,0 @@
--- src/meson.build.orig	2020-07-15 14:24:54 UTC
-+++ src/meson.build
-@@ -56,6 +56,10 @@ if zstd_dep.found()
-     deps += [zstd_dep]
- endif
- 
-+if target_machine.system() == 'freebsd'
-+    deps += [execinfo_dep]
-+endif
-+
- if xapian_dep.found()
-     sources += xapian_sources
-     sources += lib_resources
--- a/devel/p5-Future/Makefile
+++ b/devel/p5-Future/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Future
-PORTVERSION=	0.42
+PORTVERSION=	0.45
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PEVANS
--- a/devel/p5-Future/distinfo
+++ b/devel/p5-Future/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578315948
-SHA256 (Future-0.42.tar.gz) = 18d4d6cde072740712eab0b5de94611358fe44f881cb77c095b817b933700140
-SIZE (Future-0.42.tar.gz) = 93704
+TIMESTAMP = 1598606225
+SHA256 (Future-0.45.tar.gz) = ce8cab6bb940434ffbf2465771bf6ed55df36ddca5bebc1024e7d4d07802a6c0
+SIZE (Future-0.45.tar.gz) = 95758
--- a/devel/p5-Test-Compile/Makefile
+++ b/devel/p5-Test-Compile/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	Test-Compile
-PORTVERSION=	2.3.1
+PORTVERSION=	2.4.1
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EGILES
--- a/devel/p5-Test-Compile/distinfo
+++ b/devel/p5-Test-Compile/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1578318312
-SHA256 (Test-Compile-v2.3.1.tar.gz) = 1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf
-SIZE (Test-Compile-v2.3.1.tar.gz) = 18096
+TIMESTAMP = 1598616878
+SHA256 (Test-Compile-v2.4.1.tar.gz) = 56a7a3459db5de0f92419029cf1b4d51c44dd02d4690cff3c4eedf666f6d8d46
+SIZE (Test-Compile-v2.4.1.tar.gz) = 18425
--- a/devel/py-blessed/Makefile
+++ b/devel/py-blessed/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	blessed
-DISTVERSION=	1.17.9
+DISTVERSION=	1.17.10
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,8 +12,8 @@ COMMENT=	Easy, practical library for making terminal apps
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${PY_FLAVOR}

 USES=		python
 USE_PYTHON=	distutils autoplist
--- a/devel/py-blessed/distinfo
+++ b/devel/py-blessed/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1597373474
-SHA256 (blessed-1.17.9.tar.gz) = 0d497a5be8a808b7300c00bf8303e7ba9fd11f6063a67bb924a475e5bfa7a9bb
-SIZE (blessed-1.17.9.tar.gz) = 6648453
+TIMESTAMP = 1598655315
+SHA256 (blessed-1.17.10.tar.gz) = 58b9464609f54e2eca5f5926db590a5b01fefef882844ce05064f483b8f96c26
+SIZE (blessed-1.17.10.tar.gz) = 6697685
--- a/Show More
+++ b/Show More