Index: head/net/nbdkit/Makefile
===================================================================
--- head/net/nbdkit/Makefile	(revision 539753)
+++ head/net/nbdkit/Makefile	(revision 539754)
@@ -1,70 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	nbdkit
-PORTVERSION=	1.20.2
+PORTVERSION=	1.20.4
 CATEGORIES=	net
 # XXX Although nbdkit uses github for its homepage, the release tarballs served
 # by github haven't been through autoconf.  So we must download the sources
 # from libguestfs.org instead.
 MASTER_SITES=	http://download.libguestfs.org/${PORTNAME}/${PORTVERSION:R}-stable/
 
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	Network Block Device server toolkit with stable ABI and permissive license
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		compiler:c11 gmake libtool
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 # Rust consumers will download the Rust plugin from crates.io
 CONFIGURE_ARGS+=	--disable-rust
 # These libraries does not exist on ports
 CONFIGURE_ARGS+=	--without-libnbd
 CONFIGURE_ARGS+=	--without-libguestfs
 # We could theoretically build these other plugins, if anybody cares to.
 CONFIGURE_ARGS+=	--disable-ocaml
 CONFIGURE_ARGS+=	--disable-tcl
 CONFIGURE_ARGS+=	--disable-lua
 CONFIGURE_ARGS+=	--disable-golang
 CONFIGURE_ARGS+=	--disable-vddk
 CONFIGURE_ARGS+=	--without-ext2
 CONFIGURE_ARGS+=	--without-iso
 CONFIGURE_ARGS+=	--without-linuxdisk
 USE_LDCONFIG=		yes
 
 OPTIONS_DEFINE=	CURL GNUTLS LIBVIRT LZMA MANPAGES PERL PYTHON RUBY SSH ZLIB
 GNUTLS_BUILD_DEPENDS=	gnutls>0:security/gnutls
 GNUTLS_RUN_DEPENDS=	gnutls>0:security/gnutls
 
 OPTIONS_DEFAULT=	GNUTLS MANPAGES
 OPTIONS_SUB=		yes
 
 CURL_BUILD_DEPENDS+=	curl:ftp/curl
 CURL_BUILD_DEPENDS+=	pkgconf:devel/pkgconf
 CURL_CONFIGURE_WITH=	curl
 CURL_RUN_DEPENDS+=	curl:ftp/curl
 LIBVIRT_CONFIGURE_WITH=	libvirt
 LIBVIRT_LIB_DEPENDS=	libvirt.so:devel/libvirt
 LZMA_BUILD_DEPENDS+=	pkgconf:devel/pkgconf
 LZMA_CONFIGURE_WITH=	liblzma
 LZMA_LIB_DEPENDS=	liblzma.so:archivers/lzmalib
 MANPAGES_USE+=		perl5=build
 MANPAGES_USES+=		perl5
 PERL_CONFIGURE_ENABLE=	perl
 PERL_USE+=		perl5
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_USES+=		python:3.3+
 RUBY_CONFIGURE_ENABLE=	ruby
 RUBY_USE+=		ruby
 SSH_CONFIGURE_WITH=	ssh
 SSH_LIB_DEPENDS=	libssh.so:security/libssh
 ZLIB_BUILD_DEPENDS+=	pkgconf:devel/pkgconf
 ZLIB_CONFIGURE_WITH=	zlib
 
 .include <bsd.port.mk>
Index: head/net/nbdkit/distinfo
===================================================================
--- head/net/nbdkit/distinfo	(revision 539753)
+++ head/net/nbdkit/distinfo	(revision 539754)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592531771
-SHA256 (nbdkit-1.20.2.tar.gz) = b78a8b59e74284af6a34f8bcb97c42c5d8846dc59dc94a8f4538d8690953dd31
-SIZE (nbdkit-1.20.2.tar.gz) = 1783082
+TIMESTAMP = 1592693228
+SHA256 (nbdkit-1.20.4.tar.gz) = 16c7612cf95ea3908bccfe163d71a58dc3bb4d8b018e0bf86833ed9f7858b48b
+SIZE (nbdkit-1.20.4.tar.gz) = 1790677
Index: head/net/nbdkit/files/patch-plugins_info_Makefile.in
===================================================================
--- head/net/nbdkit/files/patch-plugins_info_Makefile.in	(revision 539753)
+++ head/net/nbdkit/files/patch-plugins_info_Makefile.in	(nonexistent)
@@ -1,14 +0,0 @@
---- plugins/info/Makefile.in.orig	2020-05-02 09:04:51 UTC
-+++ plugins/info/Makefile.in
-@@ -499,7 +499,10 @@ nbdkit_info_plugin_la_CPPFLAGS = \
- 	-I$(top_srcdir)/common/include \
- 	$(NULL)
- 
--nbdkit_info_plugin_la_CFLAGS = $(WARNINGS_CFLAGS)
-+nbdkit_info_plugin_la_CFLAGS = \
-+	$(WARNINGS_CFLAGS) \
-+	$(GNUTLS_CFLAGS)
-+
- nbdkit_info_plugin_la_LDFLAGS = \
- 	-module -avoid-version -shared $(SHARED_LDFLAGS) \
- 	-Wl,--version-script=$(top_srcdir)/plugins/plugins.syms \

Property changes on: head/net/nbdkit/files/patch-plugins_info_Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/nbdkit/files/patch-plugins_ssh_ssh.c
===================================================================
--- head/net/nbdkit/files/patch-plugins_ssh_ssh.c	(revision 539753)
+++ head/net/nbdkit/files/patch-plugins_ssh_ssh.c	(nonexistent)
@@ -1,10 +0,0 @@
---- plugins/ssh/ssh.c.orig	2020-06-18 20:38:31 UTC
-+++ plugins/ssh/ssh.c
-@@ -30,6 +30,7 @@
-  * SUCH DAMAGE.
-  */
- 
-+#include <sys/stat.h>
- #include <config.h>
- 
- #include <stdio.h>

Property changes on: head/net/nbdkit/files/patch-plugins_ssh_ssh.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property