Index: net/nncp/Makefile =================================================================== --- net/nncp/Makefile (revision 517745) +++ net/nncp/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nncp -DISTVERSION= 4.0 +DISTVERSION= 5.0.0 CATEGORIES= net MASTER_SITES= http://www.nncpgo.org/download/ @@ -8,22 +8,23 @@ 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 +INFO= nncp +PORTDOCS= AUTHORS NEWS NEWS.RU README README.RU THANKS + OPTIONS_DEFINE= DOCS -PORTDOCS= AUTHORS NEWS NEWS.RU README README.RU THANKS -INFO= nncp -MAKE_ARGS= INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH} - post-install: ${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample Index: net/nncp/distinfo =================================================================== --- net/nncp/distinfo (revision 517745) +++ net/nncp/distinfo (working copy) @@ -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: net/nncp/files/nncp-caller.in =================================================================== --- net/nncp/files/nncp-caller.in (revision 517745) +++ net/nncp/files/nncp-caller.in (working copy) @@ -11,7 +11,7 @@ # # 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 @@ -21,7 +21,7 @@ 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 &" Index: net/nncp/files/nncp-daemon.in =================================================================== --- net/nncp/files/nncp-daemon.in (revision 517745) +++ net/nncp/files/nncp-daemon.in (working copy) @@ -11,7 +11,7 @@ # # 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". @@ -23,7 +23,7 @@ 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 Index: net/nncp/files/nncp-toss.in =================================================================== --- net/nncp/files/nncp-toss.in (revision 517745) +++ net/nncp/files/nncp-toss.in (working copy) @@ -11,7 +11,7 @@ # # 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". @@ -23,7 +23,7 @@ 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 Index: net/nncp/files/pkg-deinstall.in =================================================================== --- net/nncp/files/pkg-deinstall.in (revision 517745) +++ net/nncp/files/pkg-deinstall.in (working copy) @@ -2,8 +2,8 @@ [ "$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: net/nncp/files/pkg-message.in =================================================================== --- net/nncp/files/pkg-message.in (revision 517745) +++ net/nncp/files/pkg-message.in (working copy) @@ -15,7 +15,7 @@ - Generate NNCP configuration file using the command: # umask 077 - # nncp-cfgnew > %%PREFIX%%/etc/nncp.yaml + # nncp-cfgnew > %%PREFIX%%/etc/nncp.hjson EOM } ]