From 3e45665b8cd8ba5114db651fe2d221039632bf09 Mon Sep 17 00:00:00 2001 From: kwm Date: Tue, 12 Jan 2010 16:44:22 +0000 Subject: Fix build with kerberos on 7.x and hopefully 6.x. Remove obsolete reinplace line in evolution. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13445 df743ca5-7f9a-e211-a948-0013205c9059 --- mail/evolution/Makefile | 6 ++---- mail/evolution/files/patch-aa | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'mail/evolution') diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 79eedcf52..55cb17a00 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,7 +3,7 @@ # Whom: Ade Lovett # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.208 2009/12/27 19:44:46 kwm Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.209 2010/01/03 06:12:02 marcus Exp $ # PORTNAME= evolution @@ -118,11 +118,9 @@ PLIST_SUB+= PST="@comment " post-patch: @${REINPLACE_CMD} -e '/^plugins_standard_always/s/audio-inline//' \ - -e 's|heimlibs".*"|heimlibs="${KRB5_LIB}"|g' \ + -e 's|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|stdlib.n|stdlib.h|' \ - ${WRKSRC}/iconv-detect.c @${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \ ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c @${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \ diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index aee858a58..3b9eb7094 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -34,12 +34,3 @@ #define BUFSIZE (sizeof(struct hostent)+10) -@@ -22223,7 +22234,7 @@ - LIBS_save="$LIBS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" -- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" -+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt -lhx509" - sunlibs="-lkrb5 -lgss" - if test "${ac_cv_lib_kerberos5+set}" = set; then - $as_echo_n "(cached) " >&6 -- cgit v1.2.3