diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-13 00:44:22 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-13 00:44:22 +0800 |
| commit | 3e45665b8cd8ba5114db651fe2d221039632bf09 (patch) | |
| tree | c142e0aa0d39e62e4bd4508a05b50428bd63548a | |
| parent | e1946cbf40e39614547b6fa22cd004079ff9dbaf (diff) | |
| download | marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar.gz marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar.bz2 marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar.lz marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar.xz marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.tar.zst marcuscom-ports-3e45665b8cd8ba5114db651fe2d221039632bf09.zip | |
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
| -rw-r--r-- | mail/evolution-exchange/Makefile | 4 | ||||
| -rw-r--r-- | mail/evolution-exchange/files/patch-configure | 11 | ||||
| -rw-r--r-- | mail/evolution/Makefile | 6 | ||||
| -rw-r--r-- | mail/evolution/files/patch-aa | 9 |
4 files changed, 4 insertions, 26 deletions
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index 4c062c907..189b7c0c3 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: ports/mail/evolution-exchange/Makefile,v 1.148 2009/12/27 20:57:40 kwm Exp $ +# $MCom: ports/mail/evolution-exchange/Makefile,v 1.149 2010/01/03 06:15:33 marcus Exp $ # PORTNAME= evolution-exchange @@ -61,7 +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|-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi|${KRB5_LIB}|g' \ -e 's|-Wmissing-include-dirs||g' \ ${WRKSRC}/configure diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure deleted file mode 100644 index 8cafdca5d..000000000 --- a/mail/evolution-exchange/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2009-12-26 22:28:16.000000000 +0100 -+++ configure 2009-12-26 22:28:45.000000000 +0100 -@@ -18160,7 +18160,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 -lhx509 -lcrypt" - sunlibs="-lkrb5 -lgss" - if test "${ac_cv_lib_kerberos5+set}" = set; then - $as_echo_n "(cached) " >&6 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 <ade@FreeBSD.org> # # $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 |