- use SUB_FILES & DOCSDIR

PR:             ports/142806
Submitted by:   Sevan Janiyan <venture37@geeklan.co.uk>

3 files changed, 26 insertions, 24 deletions

diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 931058efe633..37cb3afee50c 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/smtpfeed/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SMTP Fast Exploding External Deliverer for Sendmail
 
-NO_PACKAGE=	"complex configuration for sendmail.cf needed"
+NO_PACKAGE=	complex configuration for sendmail.cf needed
 
 GNU_CONFIGURE=	yes
 
@@ -24,6 +24,8 @@ MYPORTDOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 		OPTIONS OPTIONS.j README README.j RELEASE.NOTE SIGNAL \
 		SIGNAL.j TODO smtpfeed.html
 
+SUB_FILES=	pkg-message
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/smtpfeed ${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${MANPREFIX}/man/man8
@@ -33,6 +35,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
-	@${SED} -e 's#/usr/local#${PREFIX}#' ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/smtpfeed/pkg-message b/mail/smtpfeed/files/pkg-message.in
index c9c229b3cfdc..26c7ab052206 100644
--- a/mail/smtpfeed/pkg-message
+++ b/mail/smtpfeed/files/pkg-message.in
@@ -1,5 +1,5 @@
 **************************************************************
-smtpfeed is installed into /usr/local/libexec/smtpfeed.
+smtpfeed is installed into %%PREFIX%%/libexec/smtpfeed.
 You'll need to perform 2 steps, (a) to (b), to make smtpfeed
 work:
 	(a) replace /etc/mail/sendmail.cf
@@ -7,7 +7,7 @@ work:
 
 (a) depends on what kind of configuration tool you are using
 with sendmail.cf.  Read through documentation in
-/usr/local/share/doc/smtpfeed for details.
+%%DOCSDIR%% for details.
 (b) see file named INSTALL in
-/usr/local/share/doc/smtpfeed for details.
+%%DOCSDIR%% for details.
 **************************************************************
diff --git a/mail/smtpfeed/pkg-plist b/mail/smtpfeed/pkg-plist
index 910cbb16e81a..293dde387335 100644
--- a/mail/smtpfeed/pkg-plist
+++ b/mail/smtpfeed/pkg-plist
@@ -1,20 +1,20 @@
 libexec/smtpfeed
-%%PORTDOCS%%share/doc/smtpfeed/COPYRIGHT
-%%PORTDOCS%%share/doc/smtpfeed/FEATURES
-%%PORTDOCS%%share/doc/smtpfeed/FEATURES.j
-%%PORTDOCS%%share/doc/smtpfeed/FYI
-%%PORTDOCS%%share/doc/smtpfeed/FYI.j
-%%PORTDOCS%%share/doc/smtpfeed/INSTALL
-%%PORTDOCS%%share/doc/smtpfeed/INSTALL.j
-%%PORTDOCS%%share/doc/smtpfeed/ML-ADMIN
-%%PORTDOCS%%share/doc/smtpfeed/ML-ADMIN.j
-%%PORTDOCS%%share/doc/smtpfeed/OPTIONS
-%%PORTDOCS%%share/doc/smtpfeed/OPTIONS.j
-%%PORTDOCS%%share/doc/smtpfeed/README
-%%PORTDOCS%%share/doc/smtpfeed/README.j
-%%PORTDOCS%%share/doc/smtpfeed/RELEASE.NOTE
-%%PORTDOCS%%share/doc/smtpfeed/SIGNAL
-%%PORTDOCS%%share/doc/smtpfeed/SIGNAL.j
-%%PORTDOCS%%share/doc/smtpfeed/TODO
-%%PORTDOCS%%share/doc/smtpfeed/smtpfeed.html
-%%PORTDOCS%%@dirrm share/doc/smtpfeed
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES
+%%PORTDOCS%%%%DOCSDIR%%/FEATURES.j
+%%PORTDOCS%%%%DOCSDIR%%/FYI
+%%PORTDOCS%%%%DOCSDIR%%/FYI.j
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
+%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN
+%%PORTDOCS%%%%DOCSDIR%%/ML-ADMIN.j
+%%PORTDOCS%%%%DOCSDIR%%/OPTIONS
+%%PORTDOCS%%%%DOCSDIR%%/OPTIONS.j
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.j
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTE
+%%PORTDOCS%%%%DOCSDIR%%/SIGNAL
+%%PORTDOCS%%%%DOCSDIR%%/SIGNAL.j
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/smtpfeed.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%