From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 2 Feb 2018 19:47:52 +0000 (+0300)
Subject: Actualize FreeBSD port
X-Git-Tag: 3.0^2~18
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=6b25673ea31dc03b123fabe8b0a6c20e7a4b8d7d

Actualize FreeBSD port
---

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 2b3805f..4c53918 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
-# $FreeBSD$
+# $FreeBSD: head/net/nncp/Makefile 460314 2018-01-29 16:17:45Z yuri $
 
 PORTNAME=	nncp
-PORTVERSION=	2.0
+DISTVERSION=	2.0
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
@@ -15,38 +15,17 @@ BUILD_DEPENDS=	go:lang/go
 
 USES=		tar:xz
 MAKEFILE=	BSDmakefile
-
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
-REQUIRE=	DAEMON
+INSTALL_TARGET=	install-strip
+
+SUB_FILES=	pkg-message pkg-install pkg-deinstall
 
-SUB_FILES=	pkg-message pkg-install pkg-deinstall nncp.newsyslog.conf.sample
+OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
 INFO=		nncp
-INSTALL_TARGET=	install-strip
-
-PLIST_FILES=	bin/nncp-bundle \
-		bin/nncp-call \
-		bin/nncp-caller \
-		bin/nncp-cfgenc \
-		bin/nncp-cfgmin \
-		bin/nncp-cfgnew \
-		bin/nncp-check \
-		bin/nncp-daemon \
-		bin/nncp-file \
-		bin/nncp-freq \
-		bin/nncp-log \
-		bin/nncp-mail \
-		bin/nncp-pkt \
-		bin/nncp-reass \
-		bin/nncp-rm \
-		bin/nncp-stat \
-		bin/nncp-toss \
-		bin/nncp-xfer \
-		"@sample etc/newsyslog.conf.d/nncp.conf.sample"
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
-	${INSTALL_DATA} ${WRKDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nncp.conf.sample
+	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
 
 .include <bsd.port.mk>
diff --git a/ports/nncp/files/nncp.newsyslog.conf.sample.in b/ports/nncp/files/nncp.newsyslog.conf.sample
similarity index 100%
rename from ports/nncp/files/nncp.newsyslog.conf.sample.in
rename to ports/nncp/files/nncp.newsyslog.conf.sample
diff --git a/ports/nncp/files/pkg-message.in b/ports/nncp/files/pkg-message.in
index 56713d2..a68f1a3 100644
--- a/ports/nncp/files/pkg-message.in
+++ b/ports/nncp/files/pkg-message.in
@@ -13,5 +13,5 @@
 - Generate NNCP configuration file using the command:
 
     # umask 077
-    # nncp-newcfg > %%PREFIX%%/etc/nncp.yaml
+    # nncp-cfgnew > %%PREFIX%%/etc/nncp.yaml
 ======================================================================
diff --git a/ports/nncp/pkg-plist b/ports/nncp/pkg-plist
new file mode 100644
index 0000000..5da0b92
--- /dev/null
+++ b/ports/nncp/pkg-plist
@@ -0,0 +1,19 @@
+bin/nncp-bundle
+bin/nncp-call
+bin/nncp-caller
+bin/nncp-cfgenc
+bin/nncp-cfgmin
+bin/nncp-cfgnew
+bin/nncp-check
+bin/nncp-daemon
+bin/nncp-file
+bin/nncp-freq
+bin/nncp-log
+bin/nncp-mail
+bin/nncp-pkt
+bin/nncp-reass
+bin/nncp-rm
+bin/nncp-stat
+bin/nncp-toss
+bin/nncp-xfer
+@sample etc/nncp.conf.sample etc/newsyslog.conf.d/nncp.conf