- Add DOCS to OPTIONS_DEFINE

- Use ETCDIR
- Support STAGEDIR
- While I'm here:
  - Fix STAGEDIR prefix in PREFIX/sbin/rmail
  - Convert to new options helper
  - Simplify Makefile
  - Sort PLIST

PR:		ports/189661
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com> (maintainer)

3 files changed, 53 insertions, 55 deletions

diff --git a/mail/masqmail/Makefile b/mail/masqmail/Makefile
index a668fb7f2888..64fb1f41bde9 100644
--- a/mail/masqmail/Makefile
+++ b/mail/masqmail/Makefile
@@ -3,55 +3,43 @@
 
 PORTNAME=	masqmail
 PORTVERSION=	0.3.4
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://marmaro.de/prog/masqmail/files/
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Mail server for hosts, not permanently connected to the internet
 
-.if !defined (NO_INSTALL_MANPAGES)
-MAN1=		mservdetect.1
-MAN5=		masqmail.aliases.5 masqmail.conf.5 masqmail.route.5
-MAN8=		masqmail.8 rmail.8
-.endif
+LICENSE=	GPLv2
 
 USE_GNOME=	glib20
 USES=		pkgconfig
 USE_RC_SUBR=	masqmail
 GNU_CONFIGURE=	yes
 CFLAGS+=	-Wno-trigraphs
-CONFIGURE_ARGS+=	--with-user=mailnull --with-group=mail \
-		--with-confdir=${PREFIX}/etc/masqmail --with-logdir=/var/log/masqmail
+CONFIGURE_ARGS=	--with-user=mailnull --with-group=mail \
+		--with-confdir=${ETCDIR} --with-logdir=/var/log/masqmail
 
-OPTIONS_DEFINE=	RESOLVER AUTH DEBUG
+OPTIONS_DEFINE=	RESOLVER AUTH DEBUG DOCS
 OPTIONS_DEFAULT=	RESOLVER AUTH
 RESOLVER_DESC=	Resolver
 AUTH_DESC=	SMTP AUTH (RFC2554) support
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+AUTH_CONFIGURE_ENABLE=	auth
+DEBUG_CONFIGURE_ENABLE=	debug
+RESOLVER_CONFIGURE_ENABLE=	resolver
 
-.if ! ${PORT_OPTIONS:MRESOLVER}
-CONFIGURE_ARGS+=	--disable-resolver
-.endif
-.if ${PORT_OPTIONS:MAUTH}
-CONFIGURE_ARGS+=	--enable-auth
-.endif
-.if ! ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--disable-debug
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e '/sed.*SENDMAIL/ s|$$(DESTDIR)||' ${WRKSRC}/Makefile.in
 
 post-install:
-	${CHOWN} mailnull:mail ${PREFIX}/etc/masqmail
-	${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/masqmail.conf ${PREFIX}/etc/masqmail/masqmail.conf-dist
-	${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/example.route ${PREFIX}/etc/masqmail/masqmail.route-dist
-	${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/localnet.route ${PREFIX}/etc/masqmail/localnet.route-dist
-	${INSTALL_DATA} -o mailnull -g mail ${WRKSRC}/examples/openssl.route ${PREFIX}/etc/masqmail/openssl.route-dist
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/docs
-	cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/docs/)
-.endif
-
-.include <bsd.port.post.mk>
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/masqmail.conf ${STAGEDIR}${ETCDIR}/masqmail.conf-dist
+	${INSTALL_DATA} ${WRKSRC}/examples/example.route ${STAGEDIR}${ETCDIR}/masqmail.route-dist
+	${INSTALL_DATA} ${WRKSRC}/examples/localnet.route ${STAGEDIR}${ETCDIR}/localnet.route-dist
+	${INSTALL_DATA} ${WRKSRC}/examples/openssl.route ${STAGEDIR}${ETCDIR}/openssl.route-dist
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
+	cd ${WRKSRC} && ${CP} ChangeLog NEWS AUTHORS COPYING README TODO INSTALL THANKS ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/docs/
+
+.include <bsd.port.mk>
diff --git a/mail/masqmail/files/patch-Makefile.in b/mail/masqmail/files/patch-Makefile.in
index b914ce4bf337..f6c96a56b12d 100644
--- a/mail/masqmail/files/patch-Makefile.in
+++ b/mail/masqmail/files/patch-Makefile.in
@@ -5,7 +5,7 @@
  
  
 -install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir doc_dir rmail
-+install-data-local: log_dir spool_dir uid_bit conf_dir tpl_dir run_dir rmail
++install-data-local: uid_bit conf_dir tpl_dir rmail
  
  uninstall-local: rm-rmail rm-doc_dir rm-tpl_dir rm-conf_dir rm-run_dir rm-spool_dir rm-log_dir
  
diff --git a/mail/masqmail/pkg-plist b/mail/masqmail/pkg-plist
index ab56ca69d901..d81a68c53191 100644
--- a/mail/masqmail/pkg-plist
+++ b/mail/masqmail/pkg-plist
@@ -1,8 +1,18 @@
 bin/mservdetect
-etc/masqmail/masqmail.conf-dist
-etc/masqmail/masqmail.route-dist
-etc/masqmail/localnet.route-dist
-etc/masqmail/openssl.route-dist
+@owner mailnull
+@group mail
+%%ETCDIR%%/localnet.route-dist
+%%ETCDIR%%/masqmail.conf-dist
+%%ETCDIR%%/masqmail.route-dist
+%%ETCDIR%%/openssl.route-dist
+@owner
+@group
+man/man1/mservdetect.1.gz
+man/man5/masqmail.aliases.5.gz
+man/man5/masqmail.conf.5.gz
+man/man5/masqmail.route.5.gz
+man/man8/masqmail.8.gz
+man/man8/rmail.8.gz
 sbin/masqmail
 sbin/rmail
 %%DATADIR%%/tpl/failmsg.tpl
@@ -13,30 +23,30 @@ sbin/rmail
 %%DATADIR%%/tpl/warnmsg.tpl.de
 %%DATADIR%%/tpl/warnmsg.tpl.fr
 %%DATADIR%%/tpl/warnmsg.tpl.it
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.ipaq
-%%PORTDOCS%%%%DOCSDIR%%/docs/ppp-setup
-%%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup
-%%PORTDOCS%%%%DOCSDIR%%/docs/oem-option
-%%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup
-%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.agenda
-%%PORTDOCS%%%%DOCSDIR%%/docs/howto-release
-%%PORTDOCS%%%%DOCSDIR%%/docs/howto-static-linking
-%%PORTDOCS%%%%DOCSDIR%%/docs/README
-%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.linux
-%%PORTDOCS%%%%DOCSDIR%%/docs/agenda-config.site
-%%PORTDOCS%%%%DOCSDIR%%/docs/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup
-%%PORTDOCS%%%%DOCSDIR%%/docs/howto-report-bugs
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.agenda
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.ipaq
+%%PORTDOCS%%%%DOCSDIR%%/docs/INSTALL.linux
+%%PORTDOCS%%%%DOCSDIR%%/docs/README
+%%PORTDOCS%%%%DOCSDIR%%/docs/agenda-config.site
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-release
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-report-bugs
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto-static-linking
+%%PORTDOCS%%%%DOCSDIR%%/docs/oem-option
+%%PORTDOCS%%%%DOCSDIR%%/docs/ppp-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/simple-local-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/simple-relay-setup
+%%PORTDOCS%%%%DOCSDIR%%/docs/uucp-setup
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/tpl
 @dirrm %%DATADIR%%
-@dirrm etc/masqmail
+@dirrm %%ETCDIR%%