diff options
author | adam <adam@pkgsrc.org> | 2012-01-18 14:32:10 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-01-18 14:32:10 +0000 |
commit | ac51f2eb679ea9fc052c0a7a79a6fb342df49272 (patch) | |
tree | 024e89535032e74e9d930044b4b2f9dab3338c63 /mail/avenger/patches | |
parent | a7a6ba92cf601db150a7a305e0670b7212f7e30f (diff) | |
download | pkgsrc-ac51f2eb679ea9fc052c0a7a79a6fb342df49272.tar.gz |
Changes 0.8.2:
* Look for BerkeleyDB in more places for Debian.
* Fix a few compiler warnings to deal with gcc 4.6.
* Update to newer version numbers of BerkeleyDB.
Diffstat (limited to 'mail/avenger/patches')
-rw-r--r-- | mail/avenger/patches/patch-aa | 10 | ||||
-rw-r--r-- | mail/avenger/patches/patch-libasync_ihash.h | 35 | ||||
-rw-r--r-- | mail/avenger/patches/patch-libasync_itree.h | 15 | ||||
-rw-r--r-- | mail/avenger/patches/patch-libasync_qhash.h | 24 | ||||
-rw-r--r-- | mail/avenger/patches/patch-libasync_vec.h | 24 |
5 files changed, 103 insertions, 5 deletions
diff --git a/mail/avenger/patches/patch-aa b/mail/avenger/patches/patch-aa index 83e252b7710..f761410646f 100644 --- a/mail/avenger/patches/patch-aa +++ b/mail/avenger/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.2 2010/06/02 12:39:44 adam Exp $ +$NetBSD: patch-aa,v 1.3 2012/01/18 14:32:10 adam Exp $ ---- configure.orig 2010-04-13 01:23:37.000000000 +0000 +--- configure.orig 2012-01-12 15:53:35.000000000 +0000 +++ configure -@@ -23861,9 +23861,9 @@ test -z "${with_db+set}" && with_db=yes +@@ -18863,9 +18863,9 @@ test -z "${with_db+set}" && with_db=yes - { $as_echo "$as_me:$LINENO: checking for BerkeleyDB library" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BerkeleyDB library" >&5 $as_echo_n "checking for BerkeleyDB library... " >&6; } -if test "$DB_DIR" -a "$with_db" = yes; then - CPPFLAGS="$CPPFLAGS "'-I$(top_builddir)/'"$DB_DIR/dist" @@ -12,6 +12,6 @@ $NetBSD: patch-aa,v 1.2 2010/06/02 12:39:44 adam Exp $ +if true; then + DB_DIR="${prefix}" + DB_LIB="-l${BDB_TYPE}" - { $as_echo "$as_me:$LINENO: result: using distribution in $DB_DIR subdirectory" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using distribution in $DB_DIR subdirectory" >&5 $as_echo "using distribution in $DB_DIR subdirectory" >&6; } elif test x"$with_db" != xno; then diff --git a/mail/avenger/patches/patch-libasync_ihash.h b/mail/avenger/patches/patch-libasync_ihash.h new file mode 100644 index 00000000000..8020ef8fcac --- /dev/null +++ b/mail/avenger/patches/patch-libasync_ihash.h @@ -0,0 +1,35 @@ +$NetBSD: patch-libasync_ihash.h,v 1.1 2012/01/18 14:32:10 adam Exp $ + +Fix C++ errors + +--- libasync/ihash.h.orig 2012-01-18 14:07:53.000000000 +0000 ++++ libasync/ihash.h +@@ -235,7 +235,7 @@ public: + ihash () : eq (E ()), hash (H ()) {} + ihash (const E &e, const H &h) : eq (e), hash (h) {} + +- void insert (V *elm) { insert_val (elm, hash (elm->*key)); } ++ void insert (V *elm) { this->insert_val (elm, hash (elm->*key)); } + + #if 0 + template<class T> V *operator[] (const T &k) const { +@@ -243,16 +243,16 @@ public: + V *operator[] (const K &k) const { + #endif + V *v; +- for (v = lookup_val (hash (k)); ++ for (v = this->lookup_val (hash (k)); + v && !eq (k, v->*key); +- v = next_val (v)) ++ v = this->next_val (v)) + ; + return v; + } + + V *nextkeq (V *v) { + const K &k = v->*key; +- while ((v = next_val (v)) && !eq (k, v->*key)) ++ while ((v = this->next_val (v)) && !eq (k, v->*key)) + ; + return v; + }; diff --git a/mail/avenger/patches/patch-libasync_itree.h b/mail/avenger/patches/patch-libasync_itree.h new file mode 100644 index 00000000000..33208b3b858 --- /dev/null +++ b/mail/avenger/patches/patch-libasync_itree.h @@ -0,0 +1,15 @@ +$NetBSD: patch-libasync_itree.h,v 1.1 2012/01/18 14:32:10 adam Exp $ + +Fix C++ errors + +--- libasync/itree.h.orig 2012-01-18 14:08:55.000000000 +0000 ++++ libasync/itree.h +@@ -250,7 +250,7 @@ public: + #else + V *operator[] (const K &k) { + // return search (wrap (this, &kvcmp, &k)); +- return search (skvcmp, &kcmp, &k); ++ return this->search (skvcmp, &kcmp, &k); + } + #endif + }; diff --git a/mail/avenger/patches/patch-libasync_qhash.h b/mail/avenger/patches/patch-libasync_qhash.h new file mode 100644 index 00000000000..ea429f594a4 --- /dev/null +++ b/mail/avenger/patches/patch-libasync_qhash.h @@ -0,0 +1,24 @@ +$NetBSD: patch-libasync_qhash.h,v 1.1 2012/01/18 14:32:10 adam Exp $ + +Fix C++ errors + +--- libasync/qhash.h.orig 2012-01-18 14:17:45.000000000 +0000 ++++ libasync/qhash.h +@@ -71,7 +71,7 @@ private: + + slot *getslot (const K &k) const { + slot *s; +- for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s)) ++ for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s)) + ; + return s; + } +@@ -156,7 +156,7 @@ private: + + slot *getslot (const K &k) const { + slot *s; +- for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s)) ++ for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s)) + ; + return s; + } diff --git a/mail/avenger/patches/patch-libasync_vec.h b/mail/avenger/patches/patch-libasync_vec.h new file mode 100644 index 00000000000..9327e02c9d5 --- /dev/null +++ b/mail/avenger/patches/patch-libasync_vec.h @@ -0,0 +1,24 @@ +$NetBSD: patch-libasync_vec.h,v 1.1 2012/01/18 14:32:10 adam Exp $ + +Fix C++ errors + +--- libasync/vec.h.orig 2012-01-18 14:06:37.000000000 +0000 ++++ libasync/vec.h +@@ -102,7 +102,7 @@ protected: + static void destroy (elm_t &e) { e.~elm_t (); } + + void init () { lastp = firstp = basep = def_basep (); limp = def_limp (); } +- void del () { while (firstp < lastp) firstp++->~elm_t (); bfree (basep); } ++ void del () { while (firstp < lastp) firstp++->~elm_t (); this->bfree (basep); } + + #define append(v) \ + do { \ +@@ -143,7 +143,7 @@ public: + elm_t *obasep = basep; + move (static_cast<elm_t *> (txmalloc (nalloc * sizeof (elm_t)))); + limp = basep + nalloc; +- bfree (obasep); ++ this->bfree (obasep); + } + else + move (basep); |