- make pkg-message prefix aware

- use rcng style start script
PR:		142799
Submitted by:	Sevan Janiyan

4 files changed, 9 insertions, 17 deletions

diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 60ff0ce8b4c4..7826e0877ee3 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -26,7 +26,7 @@ OPTIONS?=	SMTP_AFTER_POP3 "Enable SMTP-after-POP mode" off \
 		STANDALONE_POP3 "Enable standalone server mode" off \
 		SETPROCTITLE "Enable setproctitle mode" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # honor old flags
 .if defined(STANDALONE_POP3)
@@ -40,9 +40,11 @@ WITH_SMTP_AFTER_POP3=	yes
 STANDALONE_SUFFIX=	-standalone
 PLIST_SUB+=	STANDALONE_POP3=""
 CONFLICTS?=	popa3d-0.* popa3d-before-sendmail-0.*
+USE_RC_SUBR=	popa3d
 PKGMESSAGE=	${NONEXISTENT}
 PKGDEINSTALL=	${NONEXISTENT}
 .else
+SUB_FILES=	pkg-message
 PLIST_SUB+=	STANDALONE_POP3="@comment "
 .endif
 
@@ -60,15 +62,7 @@ CONFLICTS?=	popa3d-standalone-0.* popa3d-before-sendmail-0.*
 EXTRA_PATCHES+=	${FILESDIR}/setproctitle.patch
 .endif
 
-.if defined(WITH_STANDALONE_POP3)
-RC_SUBR=	/etc/rc.subr
-
-post-extract:
-	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
-		-e "s=%%RC_SUBR%%=${RC_SUBR}=g" \
-		${FILESDIR}/popa3d.sh \
-		> ${WRKSRC}/popa3d.sh
-.endif
+.include <bsd.port.pre.mk>
 
 pre-configure:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
@@ -104,9 +98,7 @@ do-install:
 .if defined(WITH_SMTP_AFTER_POP3) && !defined(WITHOUT_POPAUTH_M4)
 	${INSTALL_DATA} ${FILESDIR}/popauth.m4 ${CFDIR}/hack/
 .endif
-.if defined(WITH_STANDALONE_POP3)
-	${INSTALL_SCRIPT} ${WRKSRC}/popa3d.sh ${PREFIX}/etc/rc.d/
-.endif
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/DESIGN ${DOCSDIR}/
diff --git a/mail/popa3d/pkg-message b/mail/popa3d/files/pkg-message.in
index ce3b696eac7f..40e60d29682a 100644
--- a/mail/popa3d/pkg-message
+++ b/mail/popa3d/files/pkg-message.in
@@ -1,12 +1,13 @@
 ===========================================================================
 1. Edit your /etc/inetd.conf to use popa3d. The line should look like this:
 
-pop3	stream	tcp	nowait	root	/usr/local/libexec/popa3d   popa3d
+pop3	stream	tcp	nowait	root	%%PREFIX%%/libexec/popa3d   popa3d
 
 Note: when started via an inetd clone, the logging of connections is left
 up to that inetd clone or TCP wrappers.
 
-2. Restart inetd by sending it a SIGHUP:
+2. Reload inetd
+
+# /etc/rc.d/inetd reload
 
-# killall -HUP inetd
 ===========================================================================
diff --git a/mail/popa3d/files/popa3d.sh b/mail/popa3d/files/popa3d.in
index 8e8b94cf1821..8e8b94cf1821 100644
--- a/mail/popa3d/files/popa3d.sh
+++ b/mail/popa3d/files/popa3d.in
diff --git a/mail/popa3d/pkg-plist b/mail/popa3d/pkg-plist
index fd8496babede..312808740eb0 100644
--- a/mail/popa3d/pkg-plist
+++ b/mail/popa3d/pkg-plist
@@ -1,4 +1,3 @@
-%%STANDALONE_POP3%%etc/rc.d/popa3d.sh
 libexec/popa3d
 %%PORTDOCS%%%%DOCSDIR%%/DESIGN
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE