From ust@cert.siemens.de  Mon Oct 29 04:35:56 2001
Return-Path: <ust@cert.siemens.de>
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
	by hub.freebsd.org (Postfix) with ESMTP
	id B07E037B405; Mon, 29 Oct 2001 04:35:53 -0800 (PST)
Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14])
	by david.siemens.de (8.11.6/8.11.6) with ESMTP id f9TCZaS27692;
	Mon, 29 Oct 2001 13:35:37 +0100 (MET)
Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17])
	by mail3.siemens.de (8.11.6/8.11.6) with ESMTP id f9TCZZF19738169;
	Mon, 29 Oct 2001 13:35:35 +0100 (MET)
Received: from reims.mchp.siemens.de (alaska [139.23.202.134])
	by mars.cert.siemens.de (8.12.1/8.12.1/Siemens CERT [ $Revision: 1.17 ]) with ESMTP id f9TCZZT5042069;
	Mon, 29 Oct 2001 13:35:35 +0100 (CET)
Received: from reims.mchp.siemens.de (localhost [127.0.0.1])
	by reims.mchp.siemens.de (8.12.1/8.12.1/alaska [ $Revision: 1.9 ]) with ESMTP id f9TCZZjp037779;
	Mon, 29 Oct 2001 13:35:35 +0100 (CET)
Received: (from ust@localhost)
	by reims.mchp.siemens.de (8.12.1/8.12.1/alaska [ $Revision: 1.2 ]) id f9TCZZ81037778;
	Mon, 29 Oct 2001 13:35:35 +0100 (CET)
Message-Id: <200110291235.f9TCZZ81037778@reims.mchp.siemens.de>
Date: Mon, 29 Oct 2001 13:35:35 +0100 (CET)
From: Udo Schweigert <ust@cert.siemens.de>
Reply-To: Udo Schweigert <ust@cert.siemens.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: dwcjr@freebsd.org
Subject: maintainer-update of mail/mutt-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         31585
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 29 04:40:01 PST 2001
>Closed-Date:    Mon Oct 29 09:42:17 PST 2001
>Last-Modified:  Mon Oct 29 09:42:29 PST 2001
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.4-STABLE FreeBSD 4.4-STABLE #13: Sun Oct 28 09:25:07 CET 2001 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386


>Description:

Use installed inews program if built with WITH_MUTT_NNTP. If inews is not
installed then use port news/nn and its nn-inews program.

Requested by: Thomas E. Zander <riggs@hadiko.de>

For the committer: New file files/extra-patch-inews

>How-To-Repeat:
>Fix:

diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Thu Oct 11 21:35:07 2001
+++ mutt-devel/Makefile	Mon Oct 29 10:22:44 2001
@@ -74,6 +74,13 @@
 .if defined(WITH_MUTT_HTML)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
+.if defined(WITH_MUTT_NNTP)
+.if ! exists(${LOCALBASE}/bin/inews)
+BUILD_DEPENDS+=	nn-inews:${PORTSDIR}/news/nn
+pre-configure::
+	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-inews
+.endif
+.endif
 
 .if defined(WITH_MUTT_LOCALES_FIX)
 CONFIGURE_ARGS+=	--enable-locales-fix
@@ -122,7 +129,7 @@
 	 @${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 
-pre-configure:
+pre-configure::
 	(cd ${WRKSRC}; aclocal -I m4)
 
 .if !defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/mail/mutt-devel/files/extra-patch-inews mutt-devel/files/extra-patch-inews
--- /usr/ports/mail/mutt-devel/files/extra-patch-inews	Thu Jan  1 01:00:00 1970
+++ mutt-devel/files/extra-patch-inews	Mon Oct 29 10:21:56 2001
@@ -0,0 +1,11 @@
+--- configure.in.orig2	Mon Oct 29 10:12:28 2001
++++ configure.in	Mon Oct 29 10:16:16 2001
+@@ -456,7 +456,7 @@
+ AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
+ [	if test x$enableval = xyes ; then
+ 		AC_DEFINE(USE_NNTP)
+-		AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/sbin:/usr/lib)
++		AC_PATH_PROG(INEWS, nn-inews, no, $PATH:/usr/sbin:/usr/lib)
+ 		AC_DEFINE_UNQUOTED(INEWS, "$ac_cv_path_INEWS -hS")
+ 		MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o"
+ 		need_socket="yes"
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dwcjr 
State-Changed-When: Mon Oct 29 09:42:17 PST 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31585 
>Unformatted:
