Date: Sat, 4 Nov 2006 12:12:55 +0100 (CET) From: Udo Schweigert <udo.schweigert@siemens.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/105141: maintainer-update of mail/mutt Message-ID: <200611041112.kA4BCtFD050759@alaska.cert.siemens.com> Resent-Message-ID: <200611041748.kA4Hmg6c015568@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105141
>Category: ports
>Synopsis: maintainer-update of mail/mutt
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 04 17:48:32 GMT 2006
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611041112.kA4BCtFD050759>