Bug 189166 - [PATCH] Stagification and general cleanup of mail/minimalist
Summary: [PATCH] Stagification and general cleanup of mail/minimalist
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Guido Falsi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-05-01 09:10 UTC by fullermd
Modified: 2014-05-01 21:30 UTC (History)
0 users

See Also:


Attachments
file.diff (4.66 KB, patch)
2014-05-01 09:10 UTC, fullermd
no flags Details | Diff
file.diff (597 bytes, patch)
2014-05-01 09:10 UTC, fullermd
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description fullermd 2014-05-01 09:10:02 UTC
	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).

Fix: 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
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-01 09:10:19 UTC
Maintainer of mail/minimalist,

Please note that PR ports/189166 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189166

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-05-01 09:10:20 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 gmarco 2014-05-01 17:09:17 UTC
At 10:10 01/05/2014, Edwin Groothuis wrote:
 >Maintainer of mail/minimalist,
 >
 >Please note that PR ports/189166 has just been submitted.
 >
 >If it contains a patch for an upgrade, an enhancement or a bug fix
 >you agree on, reply to this email stating that you approve the patch
 >and a committer will take care of it.
 >
 >The full text of the PR can be found at:
 >    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/189166

I agree ... It can be committed, thanks.

Best Regards,
Gianmarco Giovannelli ,  "Unix expert since yesterday"
http://utenti.gufi.org/~gmarco/
Comment 4 Guido Falsi freebsd_committer freebsd_triage 2014-05-01 17:33:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2014-05-01 21:20:52 UTC
Author: madpilot
Date: Thu May  1 20:20:47 2014
New Revision: 352765
URL: http://svnweb.freebsd.org/changeset/ports/352765
QAT: https://qat.redports.org/buildarchive/r352765/

Log:
  - 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)

Added:
  head/mail/minimalist/files/patch-minimalist.conf-sample
     - copied unchanged from r352764, head/mail/minimalist/files/patch-aa
  head/mail/minimalist/files/pkg-message.in   (contents, props changed)
Deleted:
  head/mail/minimalist/files/patch-aa
Modified:
  head/mail/minimalist/Makefile
  head/mail/minimalist/pkg-plist

Modified: head/mail/minimalist/Makefile
==============================================================================
--- head/mail/minimalist/Makefile	Thu May  1 18:36:20 2014	(r352764)
+++ head/mail/minimalist/Makefile	Thu May  1 20:20:47 2014	(r352765)
@@ -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>

Copied: head/mail/minimalist/files/patch-minimalist.conf-sample (from r352764, head/mail/minimalist/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/minimalist/files/patch-minimalist.conf-sample	Thu May  1 20:20:47 2014	(r352765, copy of r352764, head/mail/minimalist/files/patch-aa)
@@ -0,0 +1,11 @@
+--- minimalist.conf-sample.orig	Tue Aug 10 14:58:15 1999
++++ minimalist.conf-sample	Sun Oct 31 12:51:16 1999
+@@ -7,7 +7,7 @@
+ 
+ # The directory for minimalist's files - default to /var/spool/minimalist
+ #
+-#directory = /var/spool/minimalist
++directory = /usr/local/minimalist
+ 
+ # The Minimalist administrator's e-mail address.
+ #

Added: head/mail/minimalist/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/minimalist/files/pkg-message.in	Thu May  1 20:20:47 2014	(r352765)
@@ -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.
+-------------------------------------------------------------------

Modified: head/mail/minimalist/pkg-plist
==============================================================================
--- head/mail/minimalist/pkg-plist	Thu May  1 18:36:20 2014	(r352764)
+++ head/mail/minimalist/pkg-plist	Thu May  1 20:20:47 2014	(r352765)
@@ -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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Guido Falsi freebsd_committer freebsd_triage 2014-05-01 21:20:55 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!