ports/189166: [PATCH] Stagification and general cleanup of mail/minimalist

[Matthew D.Fuller]

>Number:         189166
>Category:       ports
>Synopsis:       [PATCH] Stagification and general cleanup of mail/minimalist
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 01 08:10:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Matthew D. Fuller
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD draco.over-yonder.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r251584: Sun Jun 9 14:23:33 CDT 2013 root at draco.over-yonder.net:/usr/obj/usr/src/sys/DRACO amd64


	
>Description:
	STAGE-ify.  Move echo'd stuff into pkg-message.  Take out DISTNAME
	munging that's a decade-OBE.  Make subs more explicit and targetted.
	Use SHEBANGFIX instead of doing it manually.  Fix one installed file
	to be under the name the package expects it to be.  dirrmtry instead
	of dirrm for base dir since it may fail (e.g., if you've made any
	lists).

>How-To-Repeat:
	
>Fix:


Index: Makefile
===================================================================
--- Makefile	(revision 352735)
+++ Makefile	(working copy)
@@ -6,50 +6,50 @@
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mml.org.ua/LIST/ \
 		http://utenti.gufi.org/~gmarco/files/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-/}
 
 MAINTAINER=	gmarco at 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} "-------------------------------------------------------------------"
+	@${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>
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 0)
+++ files/pkg-message.in	(working copy)
@@ -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.
+-------------------------------------------------------------------

Property changes on: files/pkg-message.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 352735)
+++ pkg-plist	(working copy)
@@ -5,7 +5,7 @@
 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/virtual-domains.txt
 @dirrm share/minimalist/FAQ
 @dirrm share/minimalist/sample
- at dirrm share/minimalist
+ at dirrmtry share/minimalist

>Release-Note:
>Audit-Trail:
>Unformatted: