summaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-03 14:15:33 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2010-01-03 14:15:33 +0800
commitd7fac3605be2f8456d71ff30f3d646ea8890ff59 (patch)
tree5f1e88e8431bd13525307c7c09cea9f686a8bb96 /mail
parent66241df70c8121588ac8375d172736dab56766b5 (diff)
downloadmarcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar.gz
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar.bz2
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar.lz
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar.xz
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.tar.zst
marcuscom-ports-d7fac3605be2f8456d71ff30f3d646ea8890ff59.zip
Sync Heimdal changes from mail/evolution.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13351 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'mail')
-rw-r--r--mail/evolution-exchange/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index e9bf6d210..4c062c907 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -3,7 +3,7 @@
# Whom: Adam Weinberger, based off kiesel's ximian-exchange port
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/mail/evolution-exchange/Makefile,v 1.148 2009/12/27 20:57:40 kwm Exp $
#
PORTNAME= evolution-exchange
@@ -40,18 +40,17 @@ GCONF_SCHEMAS= apps_exchange_addressbook-${VERSION}.schemas
.include <bsd.port.pre.mk>
-.if !defined(NO_KERBEROS) && exists(/usr/lib/libkrb5.so)
-CONFIGURE_ARGS+= --with-krb5=/usr
-.else
+.if defined(HEIMDAL_HOME) || defined(WITH_HEIMDAL) || defined(NO_KERBEROS)
+HEIMDAL_HOME?= ${LOCALBASE}
LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal
-.if defined(HEIMDAL_HOME)
-CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include
-.else
-CONFIGURE_ARGS+= --with-krb5=${LOCALBASE}
-.endif
+CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} \
+ --with-krb5-includes=${HEIMDAL_HOME}/include
+KRB5_LIB= `${HEIMDAL_HOME}/bin/krb5-config gssapi --libs`
+.elif !defined(NO_KERBEROS)
+CONFIGURE_ARGS+= --with-krb5=/usr
+KRB5_LIB= `/usr/bin/krb5-config gssapi --libs`
.endif
-
.if ${ARCH} == "amd64"
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC"
.endif
@@ -62,6 +61,7 @@ IGNORE= build fails when ${LOCALBASE}/include/mapi.h exists in system, run pkg_i
post-patch:
@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \
+ -e 's|heimlibs".*"|heimlibs="${KRB5_LIB}"|g' \
-e 's|-Wmissing-include-dirs||g' \
${WRKSRC}/configure