- Staging support

- Use SHEBANGFIX
- Use dirrmtry in plist where appropriate
- Fix plist
- Modernize

While here:

- Echo back the actual installation commands
- Remove one ".bak" file from WRKDIR during install phase to avoid
  staging orphans
- Update patch file name

PR:		ports/189166
Submitted by:	Matthew D.Fuller <fullermd@over-yonder.net>
Approved by:	Gianmarco Giovannelli <gmarco@gufi.org> (maintainer)

4 files changed, 54 insertions, 37 deletions

diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
index ec71f205b4ad..c3cc346c64c9 100644
--- a/mail/minimalist/Makefile
+++ b/mail/minimalist/Makefile
@@ -6,50 +6,51 @@ PORTVERSION=	2.5.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mml.org.ua/LIST/ \
 		http://utenti.gufi.org/~gmarco/files/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-/}
 
 MAINTAINER=	gmarco@gufi.org
 COMMENT=	A minimalistic mailing list manager
 
-USES=		perl5
+USES=		shebangfix perl5
 USE_PERL5=	run
 NO_BUILD=	yes
-EXTRA_SUB_FILES=docs/README minimalist.conf-sample minimalist.pl \
-		contrib/minimalist_request.pl
+SUB_FILES=	pkg-message
+SHEBANG_FILES=	minimalist.pl contrib/minimalist_request.pl
 
-NO_STAGE=	yes
 post-patch:
-	@(cd ${WRKSRC}; ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},;s,#!/bin/perl,${PERL},;s,--fqdn,,;s,/usr/lib/sendmail,/usr/sbin/sendmail,' ${EXTRA_SUB_FILES})
+	${REINPLACE_CMD} -e 's,--fqdn,,' ${WRKSRC}/minimalist.conf-sample
+	${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
+		${WRKSRC}/contrib/minimalist_request.pl
+	${REINPLACE_CMD} \
+		-e 's,/usr/local/sbin,${PREFIX}/bin,' \
+		-e 's,/usr/local,${PREFIX},' \
+		${WRKSRC}/docs/README \
+		${WRKSRC}/contrib/minimalist_request.pl \
+		${WRKSRC}/docs/virtual-domains.txt \
+		${WRKSRC}/docs/FAQ/sendmail.smrsh \
+		${WRKSRC}/minimalist.pl
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/minimalist/FAQ
-	@${MKDIR} ${PREFIX}/share/minimalist/FAQ
-	@${MKDIR} ${PREFIX}/share/minimalist/sample
-	@${INSTALL_SCRIPT} ${WRKSRC}/minimalist.pl ${PREFIX}/bin/
-	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/minimalist_request.pl ${PREFIX}/bin/
-	@${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample ${PREFIX}/share/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample ${PREFIX}/etc/minimalist.conf-sample
-	@${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/share/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/docs/README ${PREFIX}/share/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/docs/virtual-domains.txt ${PREFIX}/share/minimalist/
-	@${INSTALL_DATA} ${WRKSRC}/docs/FAQ/* ${PREFIX}/share/minimalist/FAQ/
-	@${INSTALL_DATA} ${WRKSRC}/sample/lists.lst ${PREFIX}/share/minimalist/list.lst-sample
-	@${INSTALL_DATA} ${WRKSRC}/sample/sample/* ${PREFIX}/share/minimalist/sample/
-	@${ECHO_MSG} "-------------------------------------------------------------------"
-	@${ECHO_MSG} "Minimalist files are in: ${PREFIX}/share/minimalist"
-	@${ECHO_MSG} "Minimalist binary is: ${PREFIX}/bin/minimalist.pl"
-	@${ECHO_MSG} "Minimalist main config is: ${PREFIX}/etc/minimalist.conf-sample"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "To finish the installation: "
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Edit the ${PREFIX}/etc/minimalist.conf-sample and then copy "
-	@${ECHO_MSG} "or rename it to ${PREFIX}/etc/minimalist.conf"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Check the ${PREFIX}/share/minimalist/README file to know how to modify"
-	@${ECHO_MSG} "aliases file"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "A sample configuration for a mailing list can be"
-	@${ECHO_MSG} "found in ${PREFIX}/share/minimalist/sample."
-	@${ECHO_MSG} "-------------------------------------------------------------------"
+	@${RM} ${WRKSRC}/docs/FAQ/sendmail.smrsh.bak
+	${MKDIR} \
+		${STAGEDIR}${PREFIX}/share/minimalist/FAQ \
+		${STAGEDIR}${PREFIX}/share/minimalist/sample
+	${INSTALL_SCRIPT} \
+		${WRKSRC}/minimalist.pl \
+		${WRKSRC}/contrib/minimalist_request.pl \
+		${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/minimalist.conf-sample \
+		${STAGEDIR}${PREFIX}/etc/
+	${INSTALL_DATA} \
+		${WRKSRC}/minimalist.conf-sample \
+		${WRKSRC}/docs/CHANGES.txt \
+		${WRKSRC}/docs/README \
+		${WRKSRC}/docs/virtual-domains.txt \
+		${STAGEDIR}${PREFIX}/share/minimalist/
+	${INSTALL_DATA} ${WRKSRC}/docs/FAQ/* \
+		${STAGEDIR}${PREFIX}/share/minimalist/FAQ/
+	${INSTALL_DATA} ${WRKSRC}/sample/lists.lst \
+		${STAGEDIR}${PREFIX}/share/minimalist/lists.lst-sample
+	${INSTALL_DATA} ${WRKSRC}/sample/sample/* \
+		${STAGEDIR}${PREFIX}/share/minimalist/sample/
 
 .include <bsd.port.mk>
diff --git a/mail/minimalist/files/patch-aa b/mail/minimalist/files/patch-minimalist.conf-sample
index 263c6bf6b481..263c6bf6b481 100644
--- a/mail/minimalist/files/patch-aa
+++ b/mail/minimalist/files/patch-minimalist.conf-sample
diff --git a/mail/minimalist/files/pkg-message.in b/mail/minimalist/files/pkg-message.in
new file mode 100644
index 000000000000..72ab298a7624
--- /dev/null
+++ b/mail/minimalist/files/pkg-message.in
@@ -0,0 +1,16 @@
+-------------------------------------------------------------------
+Minimalist files are in: %%PREFIX%%/share/minimalist
+Minimalist binary is: %%PREFIX%%/bin/minimalist.pl
+Minimalist main config is: %%PREFIX%%/etc/minimalist.conf-sample
+
+To finish the installation: 
+
+Edit the %%PREFIX%%/etc/minimalist.conf-sample and then copy 
+or rename it to %%PREFIX%%/etc/minimalist.conf
+
+Check the %%PREFIX%%/share/minimalist/README file to know how to modify
+aliases file
+
+A sample configuration for a mailing list can be
+found in %%PREFIX%%/share/minimalist/sample.
+-------------------------------------------------------------------
diff --git a/mail/minimalist/pkg-plist b/mail/minimalist/pkg-plist
index 129165f67fee..e16d27d8d0a6 100644
--- a/mail/minimalist/pkg-plist
+++ b/mail/minimalist/pkg-plist
@@ -5,7 +5,7 @@ share/minimalist/FAQ/postfix.mailloop
 share/minimalist/FAQ/sendmail.smrsh
 share/minimalist/README
 share/minimalist/CHANGES.txt
-share/minimalist/list.lst-sample
+share/minimalist/lists.lst-sample
 share/minimalist/minimalist.conf-sample
 share/minimalist/sample/config
 share/minimalist/sample/footer
@@ -13,4 +13,4 @@ share/minimalist/sample/info
 share/minimalist/virtual-domains.txt
 @dirrm share/minimalist/FAQ
 @dirrm share/minimalist/sample
-@dirrm share/minimalist
+@dirrmtry share/minimalist