Index: head/net/nncp/Makefile
===================================================================
--- head/net/nncp/Makefile	(revision 517818)
+++ head/net/nncp/Makefile	(revision 517819)
@@ -1,30 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	nncp
-DISTVERSION=	4.0
+DISTVERSION=	5.0.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
 MAINTAINER=	stargrave@stargrave.org
 COMMENT=	Utilities for secure store-and-forward files, mail, command exchanging
 
-LICENSE=	GPLv3+
+LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		go:no_targets tar:xz
-MAKEFILE=	BSDmakefile
+
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
+
+MAKE_ARGS=	INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
 INSTALL_TARGET=	install-strip
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
 
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
 INFO=		nncp
-MAKE_ARGS=	INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
+PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
+
+OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/nncp/distinfo
===================================================================
--- head/net/nncp/distinfo	(revision 517818)
+++ head/net/nncp/distinfo	(revision 517819)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556461726
-SHA256 (nncp-4.0.tar.xz) = eafa627222e355fceb772a90fc6dea8eae1f16953f48a4a357ada0b4ff918452
-SIZE (nncp-4.0.tar.xz) = 1256872
+TIMESTAMP = 1573851723
+SHA256 (nncp-5.0.0.tar.xz) = 3696d7eeb0783e9187e5eef4efc35235104523537c51fa4c9bd3cbeea22678b3
+SIZE (nncp-5.0.0.tar.xz) = 1126312
Index: head/net/nncp/files/nncp-caller.in
===================================================================
--- head/net/nncp/files/nncp-caller.in	(revision 517818)
+++ head/net/nncp/files/nncp-caller.in	(revision 517819)
@@ -1,29 +1,29 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nncp-caller
 # REQUIRE: DAEMON NETWORKING FILESYSTEMS
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # nncp_caller_enable (bool):	Set to NO by default.
 #				Set it to YES to enable nncp-caller.
-# nncp_caller_config (path):	Set to %%PREFIX%%/etc/nncp.yaml by default.
+# nncp_caller_config (path):	Set to %%PREFIX%%/etc/nncp.hjson by default.
 
 . /etc/rc.subr
 
 name=nncp_caller
 rcvar=nncp_caller_enable
 
 load_rc_config $name
 
 : ${nncp_caller_enable:="NO"}
-: ${nncp_caller_config="%%PREFIX%%/etc/nncp.yaml"}
+: ${nncp_caller_config="%%PREFIX%%/etc/nncp.hjson"}
 
 command=%%PREFIX%%/bin/nncp-caller
 command_args="-quiet -cfg $nncp_caller_config &"
 
 run_rc_command "$1"
Index: head/net/nncp/files/nncp-daemon.in
===================================================================
--- head/net/nncp/files/nncp-daemon.in	(revision 517818)
+++ head/net/nncp/files/nncp-daemon.in	(revision 517819)
@@ -1,32 +1,32 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nncp-daemon
 # REQUIRE: DAEMON NETWORKING FILESYSTEMS
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # nncp_daemon_enable (bool):	Set to NO by default.
 #				Set it to YES to enable nncp-daemon.
-# nncp_daemon_config (path):	Set to %%PREFIX%%/etc/nncp.yaml by default.
+# nncp_daemon_config (path):	Set to %%PREFIX%%/etc/nncp.hjson by default.
 # nncp_daemon_bind (string):	Address:port to bind to
 #				Default is "[::]:5400".
 
 . /etc/rc.subr
 
 name=nncp_daemon
 rcvar=nncp_daemon_enable
 
 load_rc_config $name
 
 : ${nncp_daemon_enable:="NO"}
-: ${nncp_daemon_config="%%PREFIX%%/etc/nncp.yaml"}
+: ${nncp_daemon_config="%%PREFIX%%/etc/nncp.hjson"}
 : ${nncp_daemon_bind="[::]:5400"}
 
 command=%%PREFIX%%/bin/nncp-daemon
 command_args="-quiet -bind $nncp_daemon_bind -cfg $nncp_daemon_config &"
 
 run_rc_command "$1"
Index: head/net/nncp/files/nncp-toss.in
===================================================================
--- head/net/nncp/files/nncp-toss.in	(revision 517818)
+++ head/net/nncp/files/nncp-toss.in	(revision 517819)
@@ -1,32 +1,32 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nncp-toss
 # REQUIRE: DAEMON NETWORKING FILESYSTEMS
 # KEYWORD: shutdown
 #
 # Add these lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # nncp_toss_enable (bool):	Set to NO by default.
 #				Set it to YES to enable nncp-toss.
-# nncp_toss_config (path):	Set to %%PREFIX%%/etc/nncp.yaml by default.
+# nncp_toss_config (path):	Set to %%PREFIX%%/etc/nncp.hjson by default.
 # nncp_toss_cycle   (int):	Repeat tossing after that number of seconds.
 #				Default is "60".
 
 . /etc/rc.subr
 
 name=nncp_toss
 rcvar=nncp_toss_enable
 
 load_rc_config $name
 
 : ${nncp_toss_enable:="NO"}
-: ${nncp_toss_config="%%PREFIX%%/etc/nncp.yaml"}
+: ${nncp_toss_config="%%PREFIX%%/etc/nncp.hjson"}
 : ${nncp_toss_cycle="60"}
 
 command=%%PREFIX%%/bin/nncp-toss
 command_args="-quiet -cycle $nncp_toss_cycle -cfg $nncp_toss_config &"
 
 run_rc_command "$1"
Index: head/net/nncp/files/pkg-deinstall.in
===================================================================
--- head/net/nncp/files/pkg-deinstall.in	(revision 517818)
+++ head/net/nncp/files/pkg-deinstall.in	(revision 517819)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 [ "$2" = "POST-DEINSTALL" ] || exit 0
 
-if [ -e %%PREFIX%%/etc/nncp.yaml ]; then
-	echo "%%PREFIX%%/etc/nncp.yaml with your private keys is not removed!"
+if [ -e %%PREFIX%%/etc/nncp.hjson ]; then
+	echo "%%PREFIX%%/etc/nncp.hjson with your private keys is not removed!"
 fi
 
 exec rmdir /var/spool/nncp
Index: head/net/nncp/files/pkg-message.in
===================================================================
--- head/net/nncp/files/pkg-message.in	(revision 517818)
+++ head/net/nncp/files/pkg-message.in	(revision 517819)
@@ -1,21 +1,21 @@
 [
 { type: install
   message: <<EOM
 - Add the following lines to /etc/rc.conf to enable nncp-daemon,
   nncp-caller and nncp-toss:
 
     nncp_daemon_enable="YES"
     nncp_caller_enable="YES"
     nncp_toss_enable="YES"
 
 - %%PREFIX%%/etc/newsyslog.conf.d/nncp.conf
   log rotation configuration has been installed.
 - /var/spool/nncp is the packet spool directory.
 - Look in nncp.info how to integrate mail exchanging with Postfix.
 - Generate NNCP configuration file using the command:
 
     # umask 077
-    # nncp-cfgnew > %%PREFIX%%/etc/nncp.yaml
+    # nncp-cfgnew > %%PREFIX%%/etc/nncp.hjson
 EOM
 }
 ]