From: Sergey Matveev <stargrave@stargrave.org>
Date: Sat, 29 Apr 2017 15:40:45 +0000 (+0300)
Subject: Do not touch configuration files and spool directory
X-Git-Tag: 0.7^2~13
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=8cc8f892613a38e73cbad0b837d80737fb7e0cc4

Do not touch configuration files and spool directory
---

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index c921e39..97293b9 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -20,7 +20,7 @@ MAKEFILE=	BSDmakefile
 USE_RC_SUBR=	nncp-caller nncp-daemon nncp-toss
 REQUIRE=	DAEMON
 
-SUB_FILES=	pkg-message pkg-deinstall nncp.newsyslog.conf
+SUB_FILES=	pkg-message pkg-install pkg-deinstall nncp.newsyslog.conf.sample
 
 PORTDOCS=	AUTHORS NEWS README README.RU THANKS
 INFO=		nncp
@@ -42,12 +42,10 @@ PLIST_FILES=	bin/nncp-call \
 		bin/nncp-stat \
 		bin/nncp-toss \
 		bin/nncp-xfer \
-		etc/newsyslog.conf.d/nncp.conf
-PLIST_DIRS=	/var/spool/nncp
+		"@sample etc/newsyslog.conf.d/nncp.conf.sample"
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
-	${INSTALL_DATA} ${WRKDIR}/nncp.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nncp.conf
-	${MKDIR} ${STAGEDIR}/var/spool/nncp
+	${INSTALL_DATA} ${WRKDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/nncp.conf.sample
 
 .include <bsd.port.mk>
diff --git a/ports/nncp/files/nncp.newsyslog.conf.in b/ports/nncp/files/nncp.newsyslog.conf.sample.in
similarity index 100%
rename from ports/nncp/files/nncp.newsyslog.conf.in
rename to ports/nncp/files/nncp.newsyslog.conf.sample.in
diff --git a/ports/nncp/files/pkg-deinstall.in b/ports/nncp/files/pkg-deinstall.in
index af0ca73..0c9f4f1 100644
--- a/ports/nncp/files/pkg-deinstall.in
+++ b/ports/nncp/files/pkg-deinstall.in
@@ -1,13 +1,9 @@
 #!/bin/sh
 
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
+[ "$2" = "POST-DEINSTALL" ] || exit 0
 
 if [ -e %%PREFIX%%/etc/nncp.yaml ]; then
 	echo "%%PREFIX%%/etc/nncp.yaml with your private keys is not removed!"
 fi
 
-if [ -e /var/spool/nncp ]; then
-	echo "/var/spool/nncp is not removed!"
-fi
+exec rmdir /var/spool/nncp
diff --git a/ports/nncp/files/pkg-install.in b/ports/nncp/files/pkg-install.in
new file mode 100644
index 0000000..ff6cd87
--- /dev/null
+++ b/ports/nncp/files/pkg-install.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$2" = "POST-INSTALL" ] || exit 0
+
+[ -e /var/spool/nncp ] || exec mkdir -p /var/spool/nncp