diff options
| author | William Grzybowski <wg@FreeBSD.org> | 2014-07-28 17:46:24 +0000 |
|---|---|---|
| committer | William Grzybowski <wg@FreeBSD.org> | 2014-07-28 17:46:24 +0000 |
| commit | b612d70edc46c5de660cc1a901186fa36c774812 (patch) | |
| tree | 8862f663ba83f213db9f4aab8609357375170ef1 /mail/dbmail/files | |
| parent | devel/hub: update to 1.12.2 (diff) | |
mail/dbmail: update to 3.1.17
PR: 192189
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=363203
Diffstat (limited to 'mail/dbmail/files')
| -rw-r--r-- | mail/dbmail/files/patch-acinclude.m4 | 58 | ||||
| -rw-r--r-- | mail/dbmail/files/patch-src_dbmail.h.in | 16 |
2 files changed, 0 insertions, 74 deletions
diff --git a/mail/dbmail/files/patch-acinclude.m4 b/mail/dbmail/files/patch-acinclude.m4 deleted file mode 100644 index f4333658a12f..000000000000 --- a/mail/dbmail/files/patch-acinclude.m4 +++ /dev/null @@ -1,58 +0,0 @@ ---- acinclude.m4.orig 2013-05-31 14:03:59.000000000 +0100 -+++ acinclude.m4 2013-05-31 14:45:49.000000000 +0100 -@@ -23,7 +23,7 @@ - SOCKETS: $SOCKETLIB - MATH: $MATHLIB - MHASH: $MHASHLIB -- LIBEVENT: $EVENTLIB -+ LIBEVENT: $ac_event_libs - OPENSSL: $SSLLIB - ZDB: $ZDBLIB - JEMALLOC: $JEMALLOCLIB -@@ -342,13 +342,40 @@ - fi - ]) - --AC_DEFUN([DM_CHECK_EVENT], [ -- AC_CHECK_HEADERS([event.h], [EVENTLIB="-levent_pthreads -levent"],[EVENTLIB="failed"], [#include <event2/event.h>]) -- if test [ "x$EVENTLIB" = "xfailed" ]; then -- AC_MSG_ERROR([Could not find EVENT library.]) -- else -- LDFLAGS="$LDFLAGS $EVENTLIB" -+AC_DEFUN([DM_CHECK_EVENT], [dnl -+AC_PATH_PROG(eventconfig,pkg-config) -+if test [ -z "$eventconfig" ] -+then -+ AC_MSG_ERROR([pkg-config executable not found. Make sure pkg-config is in your path]) -+else -+ AC_MSG_CHECKING([Event headers]) -+ ac_event_cflags=`${eventconfig} --cflags libevent_pthreads` -+ if test -z "$ac_event_cflags" -+ then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Unable to locate event development files]) -+ fi -+ -+ CFLAGS="$CFLAGS $ac_event_cflags" -+ AC_MSG_RESULT([$ac_event_cflags]) -+ AC_MSG_CHECKING([Event libraries]) -+ ac_event_libs=`${eventconfig} --libs libevent_pthreads` -+ if test -z "$ac_event_libs" -+ then -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Unable to locate event libaries]) - fi -+ ac_event_minvers="2.0" -+ AC_MSG_CHECKING([Event version >= $ac_event_minvers]) -+ ac_event_vers=`${eventconfig} --atleast-version=$ac_event_minvers libevent_pthreads>/dev/null && echo yes` -+ if test -z "$ac_event_vers" -+ then -+ AC_MSG_ERROR([At least Event version $ac_event_minvers is required.]) -+ fi -+ -+ LDFLAGS="$LDFLAGS $ac_event_libs" -+ AC_MSG_RESULT([$ac_event_libs]) -+fi - ]) - - AC_DEFUN([DM_CHECK_SSL], [ diff --git a/mail/dbmail/files/patch-src_dbmail.h.in b/mail/dbmail/files/patch-src_dbmail.h.in index 73a507e58d88..084ae434334d 100644 --- a/mail/dbmail/files/patch-src_dbmail.h.in +++ b/mail/dbmail/files/patch-src_dbmail.h.in @@ -1,21 +1,5 @@ --- src/dbmail.h.in.orig +++ src/dbmail.h.in -@@ -83,8 +83,14 @@ - #include <mhash.h> - #include <sys/queue.h> - #include <event2/event.h> -+#include <event2/event_compat.h> - #include <event2/thread.h> --#include <evhttp.h> -+#include <event2/http.h> -+#include <event2/http_struct.h> -+#include <event2/http_compat.h> -+#include <event2/buffer.h> -+#include <event2/buffer_compat.h> -+#include <event2/keyvalq_struct.h> - #include <math.h> - #include <openssl/ssl.h> - @@ -154,6 +160,11 @@ #include <endian.h> #endif |