- Respect NO_INSTALL_MANPAGES

- files/masqmail.sh -> files/masqmail.in
  itectu@: no more .sh
  dougb@: move load_config above variables checks
- use PORTDOCS
- Bump PORTREVISION

PR:		ports/125652
Submitted by:	Philip M. Gollucci pgollucci at p6m7g8.com

3 files changed, 15 insertions, 24 deletions

diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile
index 57e9afe15d0e..01d1e7d0135c 100644
--- a/mail/masqmail/Makefile
+++ b/mail/masqmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	masqmail
 PORTVERSION=	0.2.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
@@ -15,8 +15,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
+.if !defined (NO_INSTALL_MANPAGES)
 MAN5=		masqmail.aliases.5 masqmail.conf.5 masqmail.get.5 masqmail.route.5
 MAN8=		masqmail.8 mservdetect.8
+.endif
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
@@ -25,6 +27,10 @@ CONFIGURE_ARGS+=	--with-user=mailnull --with-group=mail \
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+.if !defined (NOPORTDOCS)
+PORTDOCS=	AUTHORS COPYING INSTALL NEWS README TODO
+.endif
+
 .if defined(WITH_LIBCRYPTO)
 CONFIGURE_ARGS+=	--with-libcrypto
 .endif
@@ -51,15 +57,9 @@ CONFIGURE_ARGS+=	--enable-ident
 .endif
 
 USE_GNOME=	glib20
-USE_RC_SUBR=	yes
-
-post-build:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-	${FILESDIR}/masqmail.sh > ${WRKDIR}/masqmail.sh
+USE_RC_SUBR=	masqmail	
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/masqmail.sh ${PREFIX}/etc/rc.d/masqmail.sh
 	${MKDIR} ${PREFIX}/etc/masqmail
 	${CHOWN} mailnull:mail ${PREFIX}/etc/masqmail
 	${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/masqmail.conf ${PREFIX}/etc/masqmail/masqmail.conf-dist
@@ -68,7 +68,7 @@ post-install:
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in  AUTHORS COPYING INSTALL NEWS README TODO
+.for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/masqmail/files/masqmail.sh b/mail/masqmail/files/masqmail.in
index dc001c15dc1e..dfb441f80a7c 100644
--- a/mail/masqmail/files/masqmail.sh
+++ b/mail/masqmail/files/masqmail.in
@@ -31,6 +31,11 @@ stop_postcmd=stop_postcmd
 
 extra_commands="reload"
 
+load_rc_config $name
+# set defaults
+masqmail_enable=${masqmail_enable:-"NO"}
+masqmail_flags=${masqmail_flags:-"-bd -q30m"}
+
 start_precmd()
 {
   case $sendmail_enable in
@@ -54,10 +59,4 @@ stop_postcmd()
   rm -f $pidfile
 }
 
-# set defaults
-
-masqmail_enable=${masqmail_enable:-"NO"}
-masqmail_flags=${masqmail_flags:-"-bd -q30m"}
-
-load_rc_config $name
 run_rc_command "$1"
diff --git a/mail/masqmail/pkg-plist b/mail/masqmail/pkg-plist
index a5bd33d79a53..030bf23f7ba3 100644
--- a/mail/masqmail/pkg-plist
+++ b/mail/masqmail/pkg-plist
@@ -2,7 +2,6 @@ bin/mservdetect
 etc/masqmail/masqmail.conf-dist
 etc/masqmail/masqmail.get-dist
 etc/masqmail/masqmail.route-dist
-etc/rc.d/masqmail.sh
 sbin/masqmail
 share/masqmail/tpl/failmsg.tpl
 share/masqmail/tpl/failmsg.tpl.de
@@ -11,14 +10,7 @@ share/masqmail/tpl/failmsg.tpl.it
 share/masqmail/tpl/warnmsg.tpl
 share/masqmail/tpl/warnmsg.tpl.de
 share/masqmail/tpl/warnmsg.tpl.fr
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 @dirrm share/masqmail/tpl
 @dirrm share/masqmail
 @dirrm etc/masqmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir /var/log/masqmail 2>/dev/null || true
+@dirrmtry /var/log/masqmail