ports/79076: maintainer-update of mail/mutt

[Udo Schweigert]

>Number:         79076
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 21 07:50:00 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt:

	- Fix the pgp6 examples and no longer install pgp5 examples.
	- Fixes also PR 79065

Committer: cvs add files/patch-contrib-Makefile.in 

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile	Sun Jan  9 07:18:39 2005
+++ ./Makefile	Mon Mar 21 08:12:25 2005
@@ -115,6 +115,8 @@
 post-patch::
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
+	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
+		${WRKSRC}/contrib/pgp6.rc
 	@${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \
 		${WRKSRC}/contrib/Makefile.in
 
diff -ru  /usr/ports/mail/mutt/files/patch-contrib-Makefile.in ./files/patch-contrib-Makefile.in
--- /usr/ports/mail/mutt/files/patch-contrib-Makefile.in	Thu Jan  1 01:00:00 1970
+++ ./files/patch-contrib-Makefile.in	Mon Mar 21 08:17:13 2005
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
++++ contrib/Makefile.in	Mon Mar 21 08:12:59 2005
+@@ -20,7 +20,7 @@
+ 
+ subdir = contrib
+ 
+-SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
++SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
+ 	sample.muttrc  sample.mailcap sample.muttrc-tlr
+ 
+ DISTFILES = Makefile.in language.txt language50.txt  \
diff -ru  /usr/ports/mail/mutt/pkg-plist ./pkg-plist
--- /usr/ports/mail/mutt/pkg-plist	Sun Jan  9 07:18:39 2005
+++ ./pkg-plist	Mon Mar 21 08:14:08 2005
@@ -46,7 +46,6 @@
 %%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
 %%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
 %%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp5.rc
 %%EXAMPLESDIR%%/pgp6.rc
 %%EXAMPLESDIR%%/sample.mailcap
 %%EXAMPLESDIR%%/sample.muttrc
>Release-Note:
>Audit-Trail:
>Unformatted: