Index: net-mgmt/nsca-ng/Makefile
===================================================================
--- net-mgmt/nsca-ng/Makefile
+++ net-mgmt/nsca-ng/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	nsca-ng
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.6
+DISTVERSIONPREFIX=v
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://www.nsca-ng.org/download/ http://www.nsca-ng.org/download/
 
 MAINTAINER=	alexander@sulfrian.net
 COMMENT=	Nagios Service Check Acceptor
@@ -21,12 +20,15 @@
 
 CONFLICTS?=	nsca-2.* nsca27-2.*
 
-USES=		ssl
+USES=		ssl autoreconf
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/spool/nagios
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
+USE_GITHUB=	true
+GH_ACCOUNT=	weiss
+
 .if !defined(PKGNAMESUFFIX)
 USE_RC_SUBR=	nsca-ng
 CONFIGURE_ARGS+=	--enable-server
@@ -38,11 +40,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	cannot link with OpenSSL
-BROKEN_FreeBSD_13=	cannot link with OpenSSL
-.endif
-
 .if ${SSL_DEFAULT:Mlibressl*}
 IGNORE=	Requires PSK which is unsupported by the selected LibreSSL
 .endif
Index: net-mgmt/nsca-ng/distinfo
===================================================================
--- net-mgmt/nsca-ng/distinfo
+++ net-mgmt/nsca-ng/distinfo
@@ -1,2 +1,3 @@
-SHA256 (nsca-ng-1.4.tar.gz) = 25f8e0439104e72443325e5f2503ed39329dccb7928de162dbb7fe6df7196a29
-SIZE (nsca-ng-1.4.tar.gz) = 354012
+TIMESTAMP = 1591782852
+SHA256 (weiss-nsca-ng-v1.6_GH0.tar.gz) = 215e9e06293e46ca825d6dbc9f57e74180dc928d98d3f24b234086d3face75c2
+SIZE (weiss-nsca-ng-v1.6_GH0.tar.gz) = 233563
Index: net-mgmt/nsca-ng/files/patch-src_common_tls.c
===================================================================
--- net-mgmt/nsca-ng/files/patch-src_common_tls.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/common/tls.c.orig	2018-10-10 00:47:13 UTC
-+++ src/common/tls.c
-@@ -102,6 +102,7 @@
- #include <ev.h>
- #include <openssl/conf.h>
- #include <openssl/err.h>
-+#include <openssl/opensslv.h>
- #include <openssl/ssl.h>
- 
- #include "log.h"
-@@ -419,7 +420,9 @@ initialize_openssl(const SSL_METHOD *method, const cha
- 
- 	(void)SSL_library_init();
- 	SSL_load_error_strings();
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	(void)atexit(ERR_free_strings);
-+#endif
- 
- 	/*
- 	 * In earlier versions, we called