From udo.schweigert@siemens.com  Sat Mar 22 14:15:45 2003
Return-Path: <udo.schweigert@siemens.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1884937B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 14:15:45 -0800 (PST)
Received: from thoth.sbs.de (thoth.sbs.de [192.35.17.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 85A4843FA3
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 14:15:43 -0800 (PST)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11])
	by thoth.sbs.de (8.11.6/8.11.6) with ESMTP id h2MMFg003297
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 23:15:42 +0100 (MET)
Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17])
	by mail2.siemens.de (8.11.6/8.11.6) with ESMTP id h2MMFfP20439
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 23:15:41 +0100 (MET)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134])
	by mars.cert.siemens.de (8.12.8/8.12.6/$SiemensCERT: mail/cert.mc,v 1.42 2003/02/21 12:06:56 ust Exp $) with ESMTP id h2MMFfWa034436
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 23:15:41 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1])
	by alaska.cert.siemens.de (8.12.8/8.12.8/$Ust: hosts/alaska/mail/config.mc,v 1.15 2002/12/31 15:32:17 ust Exp $) with ESMTP id h2MMFfOY031947
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 Mar 2003 23:15:41 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: (from ust@localhost)
	by alaska.cert.siemens.de (8.12.8/8.12.8/$Ust: hosts/alaska/mail/submit.mc,v 1.4 2002/12/31 15:32:17 ust Exp $) id h2MMFfx2071522;
	Sat, 22 Mar 2003 23:15:41 +0100 (CET)
	(envelope-from ust)
Message-Id: <200303222215.h2MMFfx2071522@alaska.cert.siemens.de>
Date: Sat, 22 Mar 2003 23:15:41 +0100 (CET)
From: Udo Schweigert <udo.schweigert@siemens.com>
Reply-To: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: maintainer-update of mail/mutt
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50197
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 22 14:20:09 PST 2003
>Closed-Date:    Wed Mar 26 10:21:19 PST 2003
>Last-Modified:  Wed Mar 26 10:21:19 PST 2003
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.8-RC FreeBSD 4.8-RC #52: Fri Mar 21 19:26:10 CET 2003 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386

>Description:

Maintainer-update of mail/mutt:
	- Integrate the new "initials"-patch.
	- Honor the MUTT_CONFIGURE_ARGS variable, if present.

>How-To-Repeat:
>Fix:


diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile	Fri Mar 21 06:31:45 2003
+++ ./Makefile	Sat Mar 22 22:17:42 2003
@@ -24,7 +24,7 @@
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \
 		ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv
 PATCHFILES=	patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker \
-		patch-${PORTVERSION:C/\.[0-9]*$//}.vvv.initials.gz:vvv
+		patch-${PORTVERSION}.vvv.initials.gz:vvv
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	udo.schweigert@siemens.com
@@ -72,6 +72,9 @@
 		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
 		--with-libiconv-prefix=${PREFIX} \
 		--enable-compressed
+.if defined(MUTT_CONFIGURE_ARGS)
+CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
+.endif
 .if defined(WITH_LOCALES_FIX)
 CONFIGURE_ARGS+=	--enable-locales-fix
 .endif
diff -ru  /usr/ports/mail/mutt/distinfo ./distinfo
--- /usr/ports/mail/mutt/distinfo	Fri Mar 21 06:31:45 2003
+++ ./distinfo	Sat Mar 22 22:26:06 2003
@@ -1,3 +1,3 @@
 MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847
 MD5 (mutt/patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11
-MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66
+MD5 (mutt/patch-1.4.1.vvv.initials.gz) = 467a4ba3a0aae4ea94ab4d31a94540ab

>Release-Note:
>Audit-Trail:

From: Udo Schweigert <Udo.Schweigert@siemens.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:  
Subject: Re: ports/50197: maintainer-update of mail/mutt
Date: Sun, 23 Mar 2003 00:24:21 +0100

 Sorry, here is another improvement:
 
 	- Fix the PATH for gpg in the rc-example.
 
 Apply this patch to the previous one:
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/work/ports/mutt/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 --- Makefile	22 Mar 2003 21:26:39 -0000	1.14
 +++ Makefile	22 Mar 2003 23:19:43 -0000
 @@ -90,8 +90,12 @@
  MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
  MAN5=		mbox.5 muttrc.5
  
 +post-patch::
 +	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 +		${WRKSRC}/contrib/gpg.rc
 +
  .if defined(WITH_MUTT_XFACE)
 -post-patch:
 +post-patch::
  	@${ECHO} "===>  Applying XFACE patch"
  	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
  			-name slrnface-\*`; \

From: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc: Udo Schweigert <udo.schweigert@siemens.com>
Subject: Re: ports/50197: maintainer-update of mail/mutt
Date: Wed, 26 Mar 2003 18:42:37 +0100

 On Sat, Mar 22, 2003 at 23:15:41 +0100, Udo Schweigert wrote:
 
 OK, now here is a completely new patch (to be applied against the current
 port in the tree), which does:
 
 	- Integrate the new "initials"-patch.
 	- Honor the MUTT_CONFIGURE_ARGS variable, if present.
 	- Fix the PATH for gpg in the rc-example.
 	- Install the configuration examples in ${PREFIX}/share/examples/mutt.
 
 Committer: cvs add files/patch-examples
 
 =============
 
 diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
 --- /usr/ports/mail/mutt/Makefile	Fri Mar 21 06:31:45 2003
 +++ ./Makefile	Wed Mar 26 13:33:39 2003
 @@ -24,7 +24,7 @@
  		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \
  		ftp://ftp2.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv
  PATCHFILES=	patch-${PORTVERSION}.rr.compressed.1.gz:spinnaker \
 -		patch-${PORTVERSION:C/\.[0-9]*$//}.vvv.initials.gz:vvv
 +		patch-${PORTVERSION}.vvv.initials.gz:vvv
  PATCH_DIST_STRIP=	-p1
  
  MAINTAINER?=	udo.schweigert@siemens.com
 @@ -72,6 +72,9 @@
  		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
  		--with-libiconv-prefix=${PREFIX} \
  		--enable-compressed
 +.if defined(MUTT_CONFIGURE_ARGS)
 +CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 +.endif
  .if defined(WITH_LOCALES_FIX)
  CONFIGURE_ARGS+=	--enable-locales-fix
  .endif
 @@ -87,8 +90,12 @@
  MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
  MAN5=		mbox.5 muttrc.5
  
 +post-patch::
 +	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 +		${WRKSRC}/contrib/gpg.rc
 +
  .if defined(WITH_MUTT_XFACE)
 -post-patch:
 +post-patch::
  	@${ECHO} "===>  Applying XFACE patch"
  	slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
  			-name slrnface-\*`; \
 diff -ru  /usr/ports/mail/mutt/distinfo ./distinfo
 --- /usr/ports/mail/mutt/distinfo	Fri Mar 21 06:31:45 2003
 +++ ./distinfo	Sat Mar 22 22:26:06 2003
 @@ -1,3 +1,3 @@
  MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847
  MD5 (mutt/patch-1.4.1.rr.compressed.1.gz) = b50484f8b12328c3ee69222a3eb1da11
 -MD5 (mutt/patch-1.4.vvv.initials.gz) = 43b4c482d9f8164a016d6d869328ad66
 +MD5 (mutt/patch-1.4.1.vvv.initials.gz) = 467a4ba3a0aae4ea94ab4d31a94540ab
 diff -ru  /usr/ports/mail/mutt/files/patch-examples ./files/patch-examples
 --- /usr/ports/mail/mutt/files/patch-examples	Thu Jan  1 01:00:00 1970
 +++ ./files/patch-examples	Wed Mar 26 13:31:19 2003
 @@ -0,0 +1,50 @@
 +--- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
 ++++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
 +@@ -12,6 +12,7 @@
 + mandir = @mandir@
 + srcdir = @srcdir@
 + docdir = @docdir@
 ++samplesdir = @prefix@/share/examples/mutt
 + top_srcdir = @top_srcdir@
 + top_builddir = ..
 + INSTALL = @INSTALL@
 +@@ -37,12 +38,12 @@
 + check:
 + 
 + install:
 +-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
 ++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
 + 	for f in $(SAMPLES) ; do \
 +-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
 ++		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
 + 	done
 + 	for f in $(srcdir)/iconv/*.rc ; do					\
 +-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
 ++		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
 + 	done
 + 
 + # Nothing needs to be done - uninstall in doc removes samples as well.
 +--- init.h.orig	Wed Mar 26 11:50:36 2003
 ++++ init.h	Wed Mar 26 12:54:37 2003
 +@@ -1347,8 +1347,8 @@
 +   ** .pp
 +   ** For examples on how to configure these formats for the various versions
 +   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
 +-  ** the samples/ subdirectory which has been installed on your system
 +-  ** alongside the documentation.
 ++  ** the share/examples/mutt subdirectory which has been installed on your
 ++  ** system.
 +   */
 +   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
 +   /*
 +--- Makefile.am.orig	Wed Mar 26 13:13:10 2003
 ++++ Makefile.am	Wed Mar 26 13:25:40 2003
 +@@ -13,7 +13,7 @@
 + 
 + bin_SCRIPTS = muttbug flea
 + 
 +-BUILT_SOURCES = keymap_defs.h patchlist.c
 ++BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
 + 
 + bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
 + mutt_SOURCES = $(BUILT_SOURCES) \
 diff -ru  /usr/ports/mail/mutt/pkg-plist ./pkg-plist
 --- /usr/ports/mail/mutt/pkg-plist	Mon Mar 17 08:09:24 2003
 +++ ./pkg-plist	Wed Mar 26 11:49:30 2003
 @@ -21,34 +21,34 @@
  share/doc/mutt/devel-notes.txt
  share/doc/mutt/manual.txt
  share/doc/mutt/patch-notes.txt
 -share/doc/mutt/samples/Mush.rc
 -share/doc/mutt/samples/Pine.rc
 -share/doc/mutt/samples/Tin.rc
 -share/doc/mutt/samples/gpg.rc
 -share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
 -share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
 -share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
 -share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
 -share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
 -share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
 -share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
 -share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
 -share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
 -share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
 -share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
 -share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
 -share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
 -share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
 -share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
 -share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
 -share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
 -share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 -share/doc/mutt/samples/pgp2.rc
 -share/doc/mutt/samples/pgp5.rc
 -share/doc/mutt/samples/pgp6.rc
 -share/doc/mutt/samples/sample.mailcap
 -share/doc/mutt/samples/sample.muttrc
 -share/doc/mutt/samples/sample.muttrc-tlr
 +share/examples/mutt/Mush.rc
 +share/examples/mutt/Pine.rc
 +share/examples/mutt/Tin.rc
 +share/examples/mutt/gpg.rc
 +share/examples/mutt/iconv/iconv.aix-3.2.5.rc
 +share/examples/mutt/iconv/iconv.aix-4.1.5.rc
 +share/examples/mutt/iconv/iconv.aix-4.2.0.rc
 +share/examples/mutt/iconv/iconv.aix-4.3.2.rc
 +share/examples/mutt/iconv/iconv.freebsd-3.3.rc
 +share/examples/mutt/iconv/iconv.glibc-2.1.3.rc
 +share/examples/mutt/iconv/iconv.glibc-2.1.90.rc
 +share/examples/mutt/iconv/iconv.hpux-10.01.rc
 +share/examples/mutt/iconv/iconv.hpux-10.20.rc
 +share/examples/mutt/iconv/iconv.hpux-11.00.rc
 +share/examples/mutt/iconv/iconv.irix-6.5.rc
 +share/examples/mutt/iconv/iconv.osf1-4.0a.rc
 +share/examples/mutt/iconv/iconv.osf1-4.0d.rc
 +share/examples/mutt/iconv/iconv.solaris-2.4.rc
 +share/examples/mutt/iconv/iconv.solaris-2.5.1.rc
 +share/examples/mutt/iconv/iconv.solaris-2.6-cjk.rc
 +share/examples/mutt/iconv/iconv.solaris-2.6.rc
 +share/examples/mutt/iconv/iconv.solaris-2.7.rc
 +share/examples/mutt/pgp2.rc
 +share/examples/mutt/pgp5.rc
 +share/examples/mutt/pgp6.rc
 +share/examples/mutt/sample.mailcap
 +share/examples/mutt/sample.muttrc
 +share/examples/mutt/sample.muttrc-tlr
  share/locale/ca/LC_MESSAGES/mutt.mo
  share/locale/cs/LC_MESSAGES/mutt.mo
  share/locale/da/LC_MESSAGES/mutt.mo
 @@ -75,6 +75,6 @@
  share/locale/uk/LC_MESSAGES/mutt.mo
  share/locale/zh_CN/LC_MESSAGES/mutt.mo
  share/locale/zh_TW/LC_MESSAGES/mutt.mo
 -@dirrm share/doc/mutt/samples/iconv
 -@dirrm share/doc/mutt/samples
 +@dirrm share/examples/mutt/iconv
 +@dirrm share/examples/mutt
  @dirrm share/doc/mutt
 
 
 Best regards
 
 --
 Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
 CT IC CERT, Siemens CERT     | Fax        : +49 89 636 41166
 D-81730 Muenchen / Germany   | email      : udo.schweigert@siemens.com
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Wed Mar 26 10:19:54 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50197 
>Unformatted:
