From 7b46a49633afec24c1083e469d2ad93dca3d38c2 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 18 Jul 2016 16:41:19 +0000
Subject: Don't echo in post-install, use pkg-message.  Also, don't "fix"
 pkg-message in post-install, use SUB_FILES/SUB_LIST.

Sponsored by:	Absolight
---
 news/noffle/Makefile             | 4 +---
 news/noffle/files/pkg-message.in | 7 +++++++
 news/noffle/pkg-message          | 7 -------
 3 files changed, 8 insertions(+), 10 deletions(-)
 create mode 100644 news/noffle/files/pkg-message.in
 delete mode 100644 news/noffle/pkg-message

(limited to 'news')

diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index d0180dc95ff4..6564d53fee7a 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -21,6 +21,7 @@ LIBS+=		-L${LOCALBASE}/lib
 
 SPOOL_DIR=	/var/spool/noffle
 PLIST_SUB+=	SPOOL_DIR=${SPOOL_DIR}
+SUB_FILES=	pkg-message
 
 DOCS=		ChangeLog docs/FAQ INSTALL docs/INTERNALS README \
 		docs/testing.txt docs/noffle.lsm
@@ -51,7 +52,4 @@ do-install:
 		${STAGEDIR}${SPOOL_DIR}/requested
 
 
-post-install:
-	${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/news/noffle/files/pkg-message.in b/news/noffle/files/pkg-message.in
new file mode 100644
index 000000000000..38a3ab92bbb1
--- /dev/null
+++ b/news/noffle/files/pkg-message.in
@@ -0,0 +1,7 @@
+
+****************************************************************************
+To enable the noffle-daemon, add the following line to your /etc/inetd.conf:
+
+nntp stream tcp nowait news %%PREFIX%%/bin/noffle -r
+****************************************************************************
+
diff --git a/news/noffle/pkg-message b/news/noffle/pkg-message
deleted file mode 100644
index da487e076731..000000000000
--- a/news/noffle/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-
-****************************************************************************
-To enable the noffle-daemon, add the following line to your /etc/inetd.conf:
-
-nntp stream tcp nowait news /usr/local/bin/noffle -r
-****************************************************************************
-
-- 
cgit v1.2.3