From udo.schweigert@siemens.com  Sat Nov  4 11:12:58 2006
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 F3D6A16A412
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Nov 2006 11:12:57 +0000 (UTC)
	(envelope-from udo.schweigert@siemens.com)
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 40ADA43D53
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  4 Nov 2006 11:12:56 +0000 (GMT)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.12.6/8.12.6) with ESMTP id kA4BCtBt006988
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Nov 2006 12:12:55 +0100
Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9])
	by mail1.siemens.de (8.12.6/8.12.6) with ESMTP id kA4BCtNx011407
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Nov 2006 12:12:55 +0100
Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64])
	by mars.cert.siemens.com (8.13.8/8.13.8/$SiemensCERT: mail/cert.mc.pre,v 1.68 2006/06/21 05:37:51 mailadm Exp $) with ESMTP id kA4BCtjI038608
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Nov 2006 12:12:55 +0100 (CET)
Received: from alaska.cert.siemens.com (alaska.cert.siemens.com [139.25.19.64])
	by alaska.cert.siemens.com (8.13.8/8.13.8/$Ust: hosts/alaska/mail/config.mc,v 1.20 2006/06/21 05:39:02 ust Exp $) with ESMTP id kA4BCtmL052353
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 4 Nov 2006 12:12:55 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.com)
Received: (from ust@localhost)
	by alaska.cert.siemens.com (8.13.8/8.13.8/$Ust: hosts/alaska/mail/submit.mc,v 1.6 2004/08/29 16:18:57 ust Exp $) id kA4BCtFD050759;
	Sat, 4 Nov 2006 12:12:55 +0100 (CET)
	(envelope-from ust)
Message-Id: <200611041112.kA4BCtFD050759@alaska.cert.siemens.com>
Date: Sat, 4 Nov 2006 12:12:55 +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:         105141
>Category:       ports
>Synopsis:       maintainer-update of mail/mutt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 04 17:48:32 GMT 2006
>Closed-Date:    Sun Nov 05 08:38:37 GMT 2006
>Last-Modified:  Sun Nov  5 08:40:38 GMT 2006
>Originator:     Udo Schweigert
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:

>Description:

Maintainer update of mail/mutt:

	- Fix GSSAPI for FreeBSD 4.x.

>How-To-Repeat:
>Fix:

diff -ru  /usr/ports/mail/mutt/Makefile ./Makefile
--- /usr/ports/mail/mutt/Makefile	Wed Oct  4 06:08:07 2006
+++ ./Makefile	Sat Nov  4 11:58:04 2006
@@ -29,6 +29,7 @@
 COMMENT?=	The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.)
 
 CONFLICTS=	mutt-devel-*
+.include <bsd.port.pre.mk>
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 .if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE)
@@ -122,8 +123,9 @@
 .if exists(${LOCALBASE}/bin/krb5-config)
 LIB_DEPENDS+=		gssapi_krb5:${PORTSDIR}/security/krb5
 CONFIGURE_ARGS+=	--with-gss=${LOCALBASE}
-.else
+.elif (defined(MAKE_KERBEROS5) && (${OSVERSION} > 500105)) || exists(/usr/lib/libkrb5.a)
 CONFIGURE_ARGS+=	--with-gss
+USE_KRB5_SYS=YES
 .endif
 .endif
 MAN1=		mutt.1 mutt_dotlock.1
@@ -147,7 +149,7 @@
 
 pre-configure::
 	@(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
-.if !exists(${LOCALBASE}/bin/krb5-config)
+.if defined(USE_KRB5_SYS)
 	@${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in
 	@${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \
 		${WRKSRC}/imap/auth_gss.c
@@ -209,4 +211,4 @@
 	@${ECHO} ""
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Nov 4 18:32:06 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105141 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Nov 5 08:38:35 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=105141 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/105141: commit references a PR
Date: Sun,  5 Nov 2006 08:38:36 +0000 (UTC)

 miwi        2006-11-05 08:38:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/mutt            Makefile 
   Log:
   - Fix GSSAPI for FreeBSD 4.x.
   
   PR:             ports/105141
   Submitted by:   Udo Schweigert <udo.schweigert@siemens.com> (maintainer)
   Sponsored by:   FreeBSD Bug-a-thon #2
   
   Revision  Changes    Path
   1.174     +5 -3      ports/mail/mutt/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
