From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 3 03:20:19 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A704D16A412 for ; Tue, 3 Oct 2006 03:20:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 326EC43D45 for ; Tue, 3 Oct 2006 03:20:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k933KIOk091913 for ; Tue, 3 Oct 2006 03:20:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k933KIxw091912; Tue, 3 Oct 2006 03:20:18 GMT (envelope-from gnats) Resent-Date: Tue, 3 Oct 2006 03:20:18 GMT Resent-Message-Id: <200610030320.k933KIxw091912@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Shaun Amott Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 395CA16A403 for ; Tue, 3 Oct 2006 03:18:40 +0000 (UTC) (envelope-from shaun@inerd.com) Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124]) by mx1.FreeBSD.org (Postfix) with SMTP id 9864B43D45 for ; Tue, 3 Oct 2006 03:18:39 +0000 (GMT) (envelope-from shaun@inerd.com) Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03]) by dione.picobyte.net (Postfix) with ESMTP for ; Tue, 3 Oct 2006 04:18:37 +0100 (BST) Message-Id: <1159845517.33841@charon.picobyte.net> Date: Tue, 3 Oct 2006 04:18:37 +0100 From: Shaun Amott To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103924: mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Shaun Amott List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2006 03:20:19 -0000 >Number: 103924 >Category: ports >Synopsis: mail/mutt, mail/mutt-devel: Add kerberos (GSSAPI) support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 03 03:20:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: >Description: The patches below enable Kerberos support in mail/mutt and mail/mutt-devel. Since we have this in base, there is no real reason to not compile it in by default. >How-To-Repeat: >Fix: --- mutt.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/mutt/Makefile,v retrieving revision 1.172 diff -u -r1.172 Makefile --- Makefile 18 Jul 2006 14:44:03 -0000 1.172 +++ Makefile 3 Oct 2006 03:14:58 -0000 @@ -118,6 +118,13 @@ .if defined(WITH_MUTT_CYRUS_SASL) CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .endif +.if !defined(WITHOUT_GSSAPI) +.if exists(${LOCALBASE}/bin/krb5-config) +CONFIGURE_ARGS+= --with-gss=${LOCALBASE} +.else +CONFIGURE_ARGS+= --with-gss +.endif +.endif MAN1= mutt.1 mutt_dotlock.1 MAN5= mbox.5 muttrc.5 @@ -140,6 +147,13 @@ pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) +post-configure: +.if !exists(${LOCALBASE}/bin/krb5-config) + @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h + @${REINPLACE_CMD} -e 's|||' \ + ${WRKSRC}/imap/auth_gss.c +.endif + # XXX # this should be done automagically by aclocal but .... # for now, this will have to do --- mutt.diff ends here --- --- mutt-devel.diff begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/mutt-devel/Makefile,v retrieving revision 1.273 diff -u -r1.273 Makefile --- Makefile 13 Sep 2006 21:24:18 -0000 1.273 +++ Makefile 3 Oct 2006 03:15:23 -0000 @@ -373,6 +373,13 @@ .else CONFIGURE_ARGS+= --disable-gpgme .endif +.if !defined(WITHOUT_GSSAPI) +.if exists(${LOCALBASE}/bin/krb5-config) +CONFIGURE_ARGS+= --with-gss=${LOCALBASE} +.else +CONFIGURE_ARGS+= --with-gss +.endif +.endif PATCH_DIST_STRIP= -p1 @@ -442,6 +449,13 @@ pre-configure:: @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) +post-configure: +.if !exists(${LOCALBASE}/bin/krb5-config) + @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in + @${REINPLACE_CMD} -e 's|||' \ + ${WRKSRC}/imap/auth_gss.c +.endif + .if defined(MUTT_SLAVE_HTML_PAGES) SCRIPTS_ENV+= MUTT_SLAVE_HTML_PAGES="${MUTT_SLAVE_HTML_PAGES}" .endif --- mutt-devel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: