From dba7bc7b1fd1395c79caa4b8eb94919e35916c6d Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 13 Mar 2004 20:22:36 +0000 Subject: Remove Kerberos support. libcrypto has a symbol conflict with nss :-(. One of these days, I'm going to rename the MD5 symbol in nss...or otherwise get these two to coexist. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2048 df743ca5-7f9a-e211-a948-0013205c9059 --- mail/evolution/Makefile | 4 ++-- mail/evolution/files/patch-aa | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'mail/evolution') diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 734e59311..0bcad6ff1 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -7,6 +7,7 @@ PORTNAME= evolution PORTVERSION= 1.5.5 +PORTREVISION= 1 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.5 @@ -31,8 +32,7 @@ CONFIGURE_ARGS= --enable-nss=yes \ --with-nspr-includes=${LOCALBASE}/include/nspr \ --with-nspr-libs=${LOCALBASE}/lib \ --enable-openssl=no \ - --with-sub-version="FreeBSD GNOME Team Port" \ - --with-krb5=/usr + --with-sub-version="FreeBSD GNOME Team Port" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS}" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index c3f99f109..485bdff3d 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Sat Mar 6 04:31:08 2004 +++ configure Sat Mar 6 04:35:09 2004 -@@ -24518,7 +24518,7 @@ - LDFLAGS_save="$LDFLAGS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" -- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" -+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" - echo "$as_me:$LINENO: checking for Kerberos 5" >&5 - echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 - if test "${ac_cv_lib_kerberos5+set}" = set; then @@ -25368,10 +25368,10 @@ Example: --with-nspr-libs=/usr/lib" >&2;} { (exit 1); exit 1; }; } -- cgit v1.2.3