From ust@cert.siemens.de  Tue Nov 27 14:07:33 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 07A5237B416
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Nov 2001 14:07:31 -0800 (PST)
Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11])
	by david.siemens.de (8.11.6/8.11.6) with ESMTP id fARM7TS03540
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Nov 2001 23:07:29 +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 fARM7Tg18698
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Nov 2001 23:07:29 +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.18 ]) with ESMTP id fARM7TPU071103
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Nov 2001 23:07:29 +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.10 ]) with ESMTP id fARM7TOW063953
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 27 Nov 2001 23:07:29 +0100 (CET)
Received: (from ust@localhost)
	by reims.mchp.siemens.de (8.12.1/8.12.1/alaska [ $Revision: 1.2 ]) id fARM7SGG063830;
	Tue, 27 Nov 2001 23:07:28 +0100 (CET)
Message-Id: <200111272207.fARM7SGG063830@reims.mchp.siemens.de>
Date: Tue, 27 Nov 2001 23:07:28 +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-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         32341
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lioux
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 27 14:10:01 PST 2001
>Closed-Date:    Sun Dec 2 11:37:21 PST 2001
>Last-Modified:  Sun Dec 02 11:37:30 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 #27: Mon Nov 26 14:24:39 CET 2001 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386


>Description:

Update of port mail/mutt-devel:

	- Add WITH_MUTT_CYRUS_SASL knob to use IMAP with SASL.

Requested by: Volker Jahns <Volker.Jahns@thalreit.de>

>How-To-Repeat:
>Fix:

diff --exclude=CVS -ru /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Wed Nov 14 08:13:21 2001
+++ mutt-devel/Makefile	Mon Nov 26 20:38:57 2001
@@ -83,6 +83,10 @@
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-inews
 .endif
 .endif
+.if defined(WITH_MUTT_CYRUS_SASL)
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+.endif
+
 
 .if defined(WITH_MUTT_LOCALES_FIX)
 CONFIGURE_ARGS+=	--enable-locales-fix
@@ -100,6 +104,11 @@
 .endif
 .if defined(WITH_MUTT_IMAP)
 CONFIGURE_ARGS+=	--enable-imap
+.endif
+.if defined(WITH_MUTT_CYRUS_SASL)
+CONFIGURE_ARGS+=	--enable-imap \
+			--with-sasl=${LOCALBASE}
+WITH_MUTT_IMAP=		yes
 .endif
 .if defined(WITH_MUTT_POP_IMAP)
 CONFIGURE_ARGS+=	--enable-pop --enable-imap
diff --exclude=CVS -ru /usr/ports/mail/mutt-devel/files/patch-01 mutt-devel/files/patch-01
--- /usr/ports/mail/mutt-devel/files/patch-01	Thu Jul 26 09:29:14 2001
+++ mutt-devel/files/patch-01	Mon Nov 26 20:30:32 2001
@@ -1,5 +1,14 @@
---- configure.in.orig	Tue Jul 24 23:27:40 2001
-+++ configure.in	Wed Jul 25 07:51:00 2001
+--- configure.in.orig	Thu Nov  8 23:39:59 2001
++++ configure.in	Mon Nov 26 20:29:39 2001
+@@ -569,7 +569,7 @@
+         then
+           if test "$with_sasl" != "yes"
+           then
+-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
+             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
+           fi
+ 
 @@ -674,7 +674,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
>Release-Note:
>Audit-Trail:

From: "David W. Chapman Jr." <dwcjr@inethouston.net>
To: Udo Schweigert <udo.schweigert@siemens.com>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/32341: maintainer-update of mail/mutt-devel
Date: Tue, 27 Nov 2001 22:10:22 -0600

 Just FYI.  Its not the accepted standard to patch configure.in 
 anymore.  Instead patch configure whenever possible.  I don't think 
 it will hold on this commit, but please keep that on your todo list.
 
 -- 
 David W. Chapman Jr.
 dwcjr@inethouston.net	Raintree Network Services, Inc. <www.inethouston.net>
 dwcjr@freebsd.org	FreeBSD Committer <www.FreeBSD.org>

From: Udo Schweigert <Udo.Schweigert@siemens.com>
To: freebsd-gnats-submit@FreeBSD.org, freebsd-ports@FreeBSD.org
Cc:  
Subject: Re: ports/32341: maintainer-update of mail/mutt-devel
Date: Wed, 28 Nov 2001 17:42:18 +0100

 And here is an updated patch, reflecting the most recent changes to
 Mk/bsd.port.mk and thus using the new AUTO{CONF,MAKE} variables.
 
 Now the port again uses USE_AUTOMAKE_VER which in turn calls AUTOMAKE, but
 there is no other way of getting ACLOCAL to be defined (ACLOCAL is the
 only part of AUTOMAKE which is really needed)
 
 The first submitted patch is included in this one.
 
 Best regards
 
 --
 Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
 CT IC 3, Siemens CERT        | Fax        : +49 89 636 41166
 D-81730 Muenchen / Germany   | email      : udo.schweigert@siemens.com
 
 diff -ru /usr/ports/mail/mutt-devel/Makefile mutt-devel/Makefile
 --- /usr/ports/mail/mutt-devel/Makefile	Wed Nov 14 08:13:21 2001
 +++ mutt-devel/Makefile	Wed Nov 28 17:33:37 2001
 @@ -31,8 +31,8 @@
  
  .include <bsd.port.pre.mk>
  
 -USE_AUTOCONF=	yes
 -AUTOCONF=	autoconf
 +USE_AUTOCONF=		yes
 +USE_AUTOMAKE_VER=	15
  
  .if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \
  		defined(WITH_MUTT_RU_PATCH) || defined(WITH_MUTT_QUOTE_PATCH)
 @@ -46,8 +46,6 @@
  PATCH_VERSION=	${PORTVERSION}
  .endif
  
 -BUILD_DEPENDS+=	automake:${PORTSDIR}/devel/automake \
 -		autoconf:${PORTSDIR}/devel/autoconf
  .if defined(PACKAGE_BUILDING)
  WITH_MUTT_SLANG=	yes
  WITH_MUTT_IMAP=		yes
 @@ -83,6 +81,10 @@
  	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-inews
  .endif
  .endif
 +.if defined(WITH_MUTT_CYRUS_SASL)
 +LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 +.endif
 +
  
  .if defined(WITH_MUTT_LOCALES_FIX)
  CONFIGURE_ARGS+=	--enable-locales-fix
 @@ -101,6 +103,11 @@
  .if defined(WITH_MUTT_IMAP)
  CONFIGURE_ARGS+=	--enable-imap
  .endif
 +.if defined(WITH_MUTT_CYRUS_SASL)
 +CONFIGURE_ARGS+=	--enable-imap \
 +			--with-sasl=${LOCALBASE}
 +WITH_MUTT_IMAP=		yes
 +.endif
  .if defined(WITH_MUTT_POP_IMAP)
  CONFIGURE_ARGS+=	--enable-pop --enable-imap
  .endif
 @@ -134,7 +141,7 @@
  	 @${CHMOD} 700 ${WRKSRC}/patchlist.sh
  
  pre-configure::
 -	(cd ${WRKSRC}; aclocal -I m4)
 +	(cd ${WRKSRC}; ${ACLOCAL} -I m4)
  
  .if !defined(NOPORTDOCS)
  post-build:
 diff -ru /usr/ports/mail/mutt-devel/files/patch-01 mutt-devel/files/patch-01
 --- /usr/ports/mail/mutt-devel/files/patch-01	Thu Jul 26 09:29:14 2001
 +++ mutt-devel/files/patch-01	Wed Nov 28 17:12:55 2001
 @@ -1,5 +1,14 @@
 ---- configure.in.orig	Tue Jul 24 23:27:40 2001
 -+++ configure.in	Wed Jul 25 07:51:00 2001
 +--- configure.in.orig	Thu Nov  8 23:39:59 2001
 ++++ configure.in	Mon Nov 26 20:29:39 2001
 +@@ -569,7 +569,7 @@
 +         then
 +           if test "$with_sasl" != "yes"
 +           then
 +-            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
 ++            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl"
 +             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
 +           fi
 + 
  @@ -674,7 +674,7 @@
           mutt_save_LIBS="$LIBS"
           LIBS="$LIBS $LIBICONV"

From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
To: Udo Schweigert <Udo.Schweigert@siemens.com>
Cc: freebsd-gnats-submit@FreeBSD.ORG, freebsd-ports@FreeBSD.ORG
Subject: Re: ports/32341: maintainer-update of mail/mutt-devel
Date: Thu, 29 Nov 2001 00:46:51 -0200

 On Wed, Nov 28, 2001 at 05:41:56PM +0100, Udo Schweigert wrote:
 > And here is an updated patch, reflecting the most recent changes to
 > Mk/bsd.port.mk and thus using the new AUTO{CONF,MAKE} variables.
 > 
 > Now the port again uses USE_AUTOMAKE_VER which in turn calls AUTOMAKE, but
 > there is no other way of getting ACLOCAL to be defined (ACLOCAL is the
 > only part of AUTOMAKE which is really needed)
 
 	Hummm, I see your problem. You need automake installed but
 you don't want USE_AUTOMAKE to run it for you..... Since no ports
 use the new variables yet.  WE can discuss a change in the behavior.
 Although, I am not sure whether it is a good idea.
 	What do people think? Should USE_AUTOMAKE_VER select and
 install the correct dependency as well as set the appropriate
 ACLOCAL/AUTOMAKE variables but run automake unless USE_AUTOMAKE is
 set? Of course, we would do the equivalent move in USE_AUTOCONF_VER...
 :)
 	Don't know, I'm not sure I want this since it will make
 these incompatible with POLA but this should be be brought since
 it does give interesting possibilities. POLA is for our benefit not
 meant as a straight jacket.
 
 	Regards,
 
 -- 
 Mario S F Ferreira - DF - Brazil - "I guess this is a signature."
 Computer Science Undergraduate | FreeBSD Committer | CS Developer
 flames to beloved devnull@someotherworldbeloworabove.org
 feature, n: a documented bug | bug, n: an undocumented feature

From: Udo Schweigert <udo.schweigert@siemens.com>
To: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.ORG>
Cc: Udo Schweigert <Udo.Schweigert@siemens.com>,
	freebsd-gnats-submit@FreeBSD.ORG, freebsd-ports@FreeBSD.ORG
Subject: Re: ports/32341: maintainer-update of mail/mutt-devel
Date: Thu, 29 Nov 2001 08:34:09 +0100

 On Thu, Nov 29, 2001 at 00:46:51 -0200, Mario Sergio Fujikawa Ferreira wrote:
 > On Wed, Nov 28, 2001 at 05:41:56PM +0100, Udo Schweigert wrote:
 >> And here is an updated patch, reflecting the most recent changes to
 >> Mk/bsd.port.mk and thus using the new AUTO{CONF,MAKE} variables.
 >> 
 >> Now the port again uses USE_AUTOMAKE_VER which in turn calls AUTOMAKE, but
 >> there is no other way of getting ACLOCAL to be defined (ACLOCAL is the
 >> only part of AUTOMAKE which is really needed)
 > 
 > 	Hummm, I see your problem. You need automake installed but
 > you don't want USE_AUTOMAKE to run it for you..... Since no ports
 > use the new variables yet.  WE can discuss a change in the behavior.
 > Although, I am not sure whether it is a good idea.
 > 	What do people think? Should USE_AUTOMAKE_VER select and
 > install the correct dependency as well as set the appropriate
 > ACLOCAL/AUTOMAKE variables but run automake unless USE_AUTOMAKE is
 > set? Of course, we would do the equivalent move in USE_AUTOCONF_VER...
 ::)
 
 I don't really know if this is really nessesary. For me it works this
 way, although the last committer of my patches told me not to use
 USE_AUTOMAKE if only using ACLOCAL. But I think a superfluous call to
 AUTOMAKE can be tolerated for some Makefile-polish.
 
 Best regards
 
 --
 Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
 CT IC 3, Siemens CERT        | Fax        : +49 89 636 41166
 D-81730 Muenchen / Germany   | email      : udo.schweigert@siemens.com
Responsible-Changed-From-To: freebsd-ports->lioux 
Responsible-Changed-By: lioux 
Responsible-Changed-When: Sun Dec 2 10:07:37 PST 2001 
Responsible-Changed-Why:  
I'll handle this 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=32341 
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Sun Dec 2 11:37:21 PST 2001 
State-Changed-Why:  
Committed, thanks! 

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