diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2006-11-05 08:38:28 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2006-11-05 08:38:28 +0000 |
commit | d2d689b8b3b348b4eba2c2bbf95443305bd4624f (patch) | |
tree | 7fe7ddd3840caf1487a25d28744150f5b93f4df2 | |
parent | Previous commit was (diff) |
- 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
Notes
Notes:
svn path=/head/; revision=176445
-rw-r--r-- | mail/mutt/Makefile | 8 | ||||
-rw-r--r-- | mail/mutt14/Makefile | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index b1a8eed76a34..38b9a9dd166e 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -29,6 +29,7 @@ MAINTAINER?= udo.schweigert@siemens.com 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 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .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 @@ post-patch:: 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 @@ post-install: @${ECHO} "" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index b1a8eed76a34..38b9a9dd166e 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -29,6 +29,7 @@ MAINTAINER?= udo.schweigert@siemens.com 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 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} .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 @@ post-patch:: 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 @@ post-install: @${ECHO} "" .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> |