From udo.schweigert@siemens.com  Wed Mar  5 04:55:37 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 0DA4537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Mar 2003 04:55:37 -0800 (PST)
Received: from goliath.siemens.de (goliath.siemens.de [192.35.17.28])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A761943F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Mar 2003 04:55:35 -0800 (PST)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11])
	by goliath.siemens.de (8.11.6/8.11.6) with ESMTP id h25CtYX22579
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 5 Mar 2003 13:55:34 +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 h25CtXA28799
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 5 Mar 2003 13:55:34 +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 h25CtW3R044677
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 5 Mar 2003 13:55:32 +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 h25CtWAY067042
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 5 Mar 2003 13:55:32 +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 h25CtWeU037216;
	Wed, 5 Mar 2003 13:55:32 +0100 (CET)
	(envelope-from ust)
Message-Id: <200303051255.h25CtWeU037216@alaska.cert.siemens.de>
Date: Wed, 5 Mar 2003 13:55:32 +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:         48944
>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:   Wed Mar 05 05:00:29 PST 2003
>Closed-Date:    Wed Mar 05 05:50:48 PST 2003
>Last-Modified:  Wed Mar 05 05:50:48 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 #50: Tue Mar 4 10:39:16 CET 2003 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386


	
>Description:

Maintainer-update of mail/mutt:

	- Use "grouped" patch-files and -sites
	- Add WITH_MUTT_XFACE knob for mutt's use with slrnface.

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile	Sat Feb 22 06:32:12 2003
+++ ./Makefile	Wed Mar  5 11:37:05 2003
@@ -18,15 +18,13 @@
 		ftp://pgp.rasip.fer.hr/pub/mutt/international/
 DISTFILES=	${DISTNAME}i${EXTRACT_SUFX}
 
-PATCH_SITES=	http://www.mutt.org.ua/download/${PKGNAME}/ \
-		http://www.spinnaker.de/mutt/compressed/ \
-		http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
-		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
-		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/
-PATCHFILES=	patch-${PORTVERSION}.rr.compressed.1.gz \
-		patch-${PORTVERSION}.vvv.initials.gz
+PATCH_SITES=	http://www.spinnaker.de/mutt/compressed/:spinnaker \
+		http://www.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
+		http://www2.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \
+		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}.vvv.initials.gz:vvv
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	udo.schweigert@siemens.com
@@ -55,6 +53,10 @@
 .if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no"
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
+.if defined(WITH_MUTT_XFACE)
+PATCH_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract
+RUN_DEPENDS+=	slrnface:${PORTSDIR}/news/slrnface
+.endif
 
 DIST_SUBDIR=	mutt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
@@ -85,6 +87,14 @@
 MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
 MAN5=		mbox.5 muttrc.5
 
+.if defined(WITH_MUTT_XFACE)
+post-patch:
+	@${ECHO} "===>  Applying XFACE patch"
+	@slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \
+			-name slrnface-\*`; \
+	cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
+.endif
+
 # XXX
 # this should be done automagically by aclocal but ....
 # for now, this will have to do
@@ -122,6 +132,17 @@
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
 .endif
+.endif
+
+.if defined(WITH_MUTT_XFACE)
+	@${ECHO} ""
+	@${ECHO} "************************************************************"
+	@${ECHO} "  To enable the XFACE support in mutt you also have to add"
+	@${ECHO} "        set xface=yes"
+	@${ECHO} "  to your ~/.muttrc"
+	@${ECHO} "  Additional information is provided by news/slrnface"
+	@${ECHO} "************************************************************"
+	@${ECHO} ""
 .endif
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Wed Mar 5 05:49:48 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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