Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 7 Dec 2002 00:35:23 +0100 (CET)
From:      Udo Schweigert <udo.schweigert@siemens.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/46043: maintainer-update of mail/mutt-devel
Message-ID:  <200212062335.gB6NZNt7085149@alaska.cert.siemens.de>

next in thread | raw e-mail | index | archive | help

>Number:         46043
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 06 15:40:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.7-STABLE FreeBSD 4.7-STABLE #35: Sun Dec 1 12:49:21 CET 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386

>Description:

Maintainer-update of mail/mutt-devel:

	- Update to mutt-1.5.2

	- Fix a MASTER_SITES directory

Some of the knobs are currently not available due to lacking patches (but
the more important ones are there).

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Fri Dec  6 06:30:59 2002
+++ ./Makefile	Fri Dec  6 22:49:20 2002
@@ -67,15 +67,15 @@
 #  WITH_MUTT_IFDEF_PATCH
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.1
-PORTREVISION?=	4
+PORTVERSION=	1.5.2
+#PORTREVISION?=	0
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
 .endif
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
 		ftp://ftp.parodius.com/pub/mutt/devel/ \
-		ftp://ftp.mutt.org/pub/mutt/devel/
+		ftp://ftp.mutt.org/mutt/devel/
 DISTNAME=	mutt-${PORTVERSION}i
 
 MAINTAINER=	udo.schweigert@siemens.com
@@ -220,20 +220,24 @@
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_EDIT_THREADS)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.edit_threads.9.2
+.error The WITH_MUTT_EDIT_THREADS option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.edit_threads.9.2
 CONFIGURE_ARGS+=	--enable-imap-edit-threads
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_SIGNATURE_MENU)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.signatures_menu.2.1
+.error The WITH_MUTT_SIGNATURE_MENU option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.signatures_menu.2.1
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_IFDEF_PATCH)
-PATCHFILES+=	patch-${PATCH_VERSION}.cd.ifdef.1
+.error The WITH_MUTT_IFDEF_PATCH option is currently not available
+#PATCHFILES+=	patch-${PATCH_VERSION}.cd.ifdef.1
 SGML_NEEDED=	yes
 .endif
 .if defined(WITH_MUTT_MBOX_HOOK_PATCH)
-PATCHFILES+=	patch-1.5.1.dw.mbox-hook.1
+.error The WITH_MUTT_MBOX_HOOK_PATCH option is currently not available
+#PATCHFILES+=	patch-1.5.1.dw.mbox-hook.1
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
diff -ru  /usr/ports/mail/mutt-devel/distinfo ./distinfo
--- /usr/ports/mail/mutt-devel/distinfo	Fri Dec  6 06:30:59 2002
+++ ./distinfo	Fri Dec  6 22:50:19 2002
@@ -1,9 +1,5 @@
-MD5 (mutt/mutt-1.5.1i.tar.gz) = 5f281dcab555e9c206a5cd16a530e0da
-MD5 (mutt/patch-1.5.1.rr.compressed.gz) = 583f434aa7e440806d12f2143ecff3d8
-MD5 (mutt/patch-1.5.1.vvv.nntp.gz) = 5bce8bf3d320808cfa7b822ebcc5086d
-MD5 (mutt/patch-1.5.1.vvv.initials.gz) = 39cd4f8beff1664a3078d4a1a08c7b5e
-MD5 (mutt/patch-1.5.1.vvv.quote.gz) = 83aa6b5a9c1117d7f15df0c59037c318
-MD5 (mutt/patch-1.5.1.cd.edit_threads.9.2) = cbbae803c62b3304cac76a6185745f8f
-MD5 (mutt/patch-1.5.1.cd.signatures_menu.2.1) = 599637b340de9d57ce75545384ad51f3
-MD5 (mutt/patch-1.5.1.cd.ifdef.1) = 3ee107f5ce66f7fb6a5bab698c5b7f90
-MD5 (mutt/patch-1.5.1.dw.mbox-hook.1) = 2a04bc3bae302ed106c1f320398b902f
+MD5 (mutt/mutt-1.5.2i.tar.gz) = d4bdf72fee7b438159048a206a7c2c34
+MD5 (mutt/patch-1.5.2.rr.compressed.gz) = 18733d9d257ebafefb65c723c1447832
+MD5 (mutt/patch-1.5.2.vvv.nntp.gz) = 6b57686dc851079f1565cde2f2034e55
+MD5 (mutt/patch-1.5.2.vvv.initials.gz) = cecf088758e0b18f1b6902db268b842d
+MD5 (mutt/patch-1.5.2.vvv.quote.gz) = 17b56c38941de0a46e629d8bd859ff0b
diff -ru  /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw ./files/extra-patch-pgp-dw
--- /usr/ports/mail/mutt-devel/files/extra-patch-pgp-dw	Fri Dec  6 06:30:59 2002
+++ ./files/extra-patch-pgp-dw	Fri Dec  6 23:49:27 2002
@@ -3,21 +3,21 @@
 +++ PATCHES	31 Aug 2002 22:01:56 -0000
 @@ -0,0 +1 @@
 +patch-1.5.1.dw.pgp-hook.3
---- hook.c	5 Feb 2002 21:30:31 -0000	3.3
-+++ hook.c	31 Aug 2002 22:01:56 -0000
-@@ -118,7 +118,11 @@ int mutt_parse_hook (BUFFER *buf, BUFFER
+--- hook.c.orig	Wed Jul 24 11:01:29 2002
++++ hook.c	Fri Dec  6 23:47:52 2002
+@@ -118,7 +118,11 @@
  	ptr->rx.not == not &&
  	!mutt_strcmp (pattern.data, ptr->rx.pattern))
      {
 +#ifdef M_CRYPTHOOK
-+      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_CRYPTHOOK))
++      if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK))
 +#else
-       if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK))
+       if (data & (M_FOLDERHOOK | M_SENDHOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK))
 +#endif /* M_CRYPTHOOK */
        {
  	/* these hooks allow multiple commands with the same
  	 * pattern, so if we've already seen this pattern/command pair, just
-@@ -445,9 +449,25 @@ char *mutt_iconv_hook (const char *chs)
+@@ -445,9 +449,25 @@
  }
  
  #if defined(HAVE_PGP) || defined(HAVE_SMIME)
diff -ru  /usr/ports/mail/mutt-devel/scripts/generate-plist ./scripts/generate-plist
--- /usr/ports/mail/mutt-devel/scripts/generate-plist	Fri Dec  6 06:30:59 2002
+++ ./scripts/generate-plist	Fri Dec  6 23:16:14 2002
@@ -121,7 +121,7 @@
 fi
 
 if [ "$MUTT_HTML" = "yes" ]; then
-  html=361
+  html=363
   if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
     html=$(($html + 5))
   fi

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

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212062335.gB6NZNt7085149>