From fecaff66575c6049700c43e61998d326b37821f1 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 18 Jul 2011 09:08:22 +0000 Subject: [PATCH] We can do without patches. --- x11/gnome3/mail/evolution/Makefile | 11 ++++------- ...patch-plugins_bogo-junk-plugin_bf-junk-filter_c | 12 ------------ .../patch-plugins_sa-junk-plugin_em-junk-filter_c | 14 -------------- 3 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 x11/gnome3/mail/evolution/patches/patch-plugins_bogo-junk-plugin_bf-junk-filter_c delete mode 100644 x11/gnome3/mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c diff --git a/x11/gnome3/mail/evolution/Makefile b/x11/gnome3/mail/evolution/Makefile index f6ac95fa964..5dd454bf6fc 100644 --- a/x11/gnome3/mail/evolution/Makefile +++ b/x11/gnome3/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2011/07/14 16:27:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2011/07/18 09:08:22 ajacoutot Exp $ COMMENT-main= integrated email and PIM software for GNOME COMMENT-plugins= additionnal plugins for evolution @@ -9,7 +9,7 @@ GNOME_VERSION= 3.0.2 PKGNAME-main= ${DISTNAME} PKGNAME-plugins= evolution-plugins-${GNOME_VERSION} -REVISION-main= 1 +REVISION-main= 2 REVISION-plugins= 0 # Only get the first x.y which is needed in the PLIST. @@ -124,7 +124,8 @@ YACC= bison AUTOCONF_VERSION= 2.65 AUTOMAKE_VERSION= 1.9 CONFIGURE_STYLE= autoconf -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}lib \ -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \ -Wl,--as-needed" @@ -143,10 +144,6 @@ CONFIGURE_ARGS+= --disable-image-inline FAKE_FLAGS= autostartdir=${PREFIX}/share/examples/evolution/xdg/autostart -pre-configure: - ${SUBST_CMD} ${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c \ - ${WRKSRC}/plugins/sa-junk-plugin/em-junk-filter.c - # needed to prevent lazy bindings failures on pthreads(3) functions post-configure: perl -pi -e 's|-Wl,--as-needed||g' \ diff --git a/x11/gnome3/mail/evolution/patches/patch-plugins_bogo-junk-plugin_bf-junk-filter_c b/x11/gnome3/mail/evolution/patches/patch-plugins_bogo-junk-plugin_bf-junk-filter_c deleted file mode 100644 index 4f5fda47231..00000000000 --- a/x11/gnome3/mail/evolution/patches/patch-plugins_bogo-junk-plugin_bf-junk-filter_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-plugins_bogo-junk-plugin_bf-junk-filter_c,v 1.1.1.1 2011/07/13 13:11:45 ajacoutot Exp $ ---- plugins/bogo-junk-plugin/bf-junk-filter.c.orig Mon Sep 13 14:18:11 2010 -+++ plugins/bogo-junk-plugin/bf-junk-filter.c Wed Sep 29 19:20:37 2010 -@@ -49,7 +49,7 @@ - #include "shell/e-shell.h" - - #ifndef BOGOFILTER_BINARY --#define BOGOFILTER_BINARY "/usr/bin/bogofilter" -+#define BOGOFILTER_BINARY "${LOCALBASE}/bin/bogofilter" - #endif - - #define BOGOFILTER_ERROR 3 diff --git a/x11/gnome3/mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c b/x11/gnome3/mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c deleted file mode 100644 index 57f694c4191..00000000000 --- a/x11/gnome3/mail/evolution/patches/patch-plugins_sa-junk-plugin_em-junk-filter_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-plugins_sa-junk-plugin_em-junk-filter_c,v 1.1.1.1 2011/07/13 13:11:45 ajacoutot Exp $ ---- plugins/sa-junk-plugin/em-junk-filter.c.orig Mon Sep 13 14:18:11 2010 -+++ plugins/sa-junk-plugin/em-junk-filter.c Wed Sep 29 19:20:37 2010 -@@ -82,8 +82,8 @@ static volatile gboolean em_junk_sa_local_only; - static volatile gboolean em_junk_sa_use_daemon; - static gchar * em_junk_sa_preferred_socket_path; - --static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "/usr/bin/spamc", "/usr/sbin/spamc", NULL}; --static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "/usr/bin/spamd", "/usr/sbin/spamd", NULL}; -+static const gchar *em_junk_sa_spamc_binaries [4] = {"spamc", "${LOCALBASE}/bin/spamc", "/usr/sbin/spamc", NULL}; -+static const gchar *em_junk_sa_spamd_binaries [4] = {"spamd", "${LOCALBASE}/bin/spamd", "/usr/sbin/spamd", NULL}; - - #define SPAMD_RESTARTS_SIZE 8 - static time_t em_junk_sa_spamd_restarts[SPAMD_RESTARTS_SIZE] = {0, 0, 0, 0, 0, 0, 0, 0};