diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-12 16:49:30 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-11-12 16:49:30 +0000 |
commit | 245e8a7237aa020fdbbe3420c4f910c75bd9ef4b (patch) | |
tree | 7e6a3724fb9fa7792188cd10e8c0f8d4999ec784 | |
parent | . javavmwrapper uses PATH to make sure it gets the system version of (diff) |
The 4.X base system version of Kerberos is not supported, and does not
work with ximian-connector, so use security/heimdal even if Kerberos
is in the base system on 4.X.
PR: 73845
Submitted by: Joe Kelsey <joe@zircon.seattle.wa.us>
Notes
Notes:
svn path=/head/; revision=121461
-rw-r--r-- | mail/evolution-exchange/Makefile | 9 | ||||
-rw-r--r-- | mail/ximian-connector/Makefile | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 5ab39285bf6c..c0c5b1c14c97 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -36,14 +36,7 @@ PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 && defined(MAKE_KERBEROS5) && \ - exists(/usr/lib/libkrb5.so) && !defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --with-krb5=/usr -.elif ( ${OSVERSION} < 500000 && !defined(MAKE_KERBEROS5) ) || \ - defined(PACKAGE_BUILDING) -LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} -.elif ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ +.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr .else diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile index 5ab39285bf6c..c0c5b1c14c97 100644 --- a/mail/ximian-connector/Makefile +++ b/mail/ximian-connector/Makefile @@ -36,14 +36,7 @@ PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 && defined(MAKE_KERBEROS5) && \ - exists(/usr/lib/libkrb5.so) && !defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --with-krb5=/usr -.elif ( ${OSVERSION} < 500000 && !defined(MAKE_KERBEROS5) ) || \ - defined(PACKAGE_BUILDING) -LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} -.elif ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ +.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ exists(/usr/lib/libkrb5.so) CONFIGURE_ARGS+= --with-krb5=/usr .else |