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.

7 files changed, 115 insertions, 13 deletions

diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index f6abb9989d5..c3d92a0dacd 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2010/09/16 08:06:15 adam Exp $
+# $NetBSD: Makefile,v 1.10 2012/01/18 14:32:10 adam Exp $
 
-DISTNAME=	avenger-0.8.1
-PKGREVISION=	1
+DISTNAME=	avenger-0.8.2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mailavenger.org/
 COMMENT=	SMTP server with filtering capabilities
+LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/avenger/distinfo b/mail/avenger/distinfo
index 2b0366b43dd..c914c77e63d 100644
--- a/mail/avenger/distinfo
+++ b/mail/avenger/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.4 2010/06/02 12:39:44 adam Exp $
+$NetBSD: distinfo,v 1.5 2012/01/18 14:32:10 adam Exp $
 
-SHA1 (avenger-0.8.1.tar.gz) = 0ee3b47fbb444644e504fe8a6010a3757afd9b55
-RMD160 (avenger-0.8.1.tar.gz) = a3faf1ed31546d91107d9a9e1315555d8959a966
-Size (avenger-0.8.1.tar.gz) = 830234 bytes
-SHA1 (patch-aa) = e4ed84071813fd0d4266d540c3d46f073bf0f6d5
+SHA1 (avenger-0.8.2.tar.gz) = bd645143289d28fac54eb1943b3f114ea396e205
+RMD160 (avenger-0.8.2.tar.gz) = 539b1163fd805e34a432d988c255c92c0fee8963
+Size (avenger-0.8.2.tar.gz) = 874426 bytes
+SHA1 (patch-aa) = c7ae855eab4995164de44c861480f263adbb4bc9
 SHA1 (patch-ab) = 831944e8447433b2697db2b3a58650aab19f4a19
 SHA1 (patch-ac) = 9b3625a090e0f9091468b86a99d0bea6535ac371
+SHA1 (patch-libasync_ihash.h) = 745cadbcd9778182e0a17afbbd5e84d91572468e
+SHA1 (patch-libasync_itree.h) = 52fdac5183e5be5406c1b67c0f97c5552a18a1ec
+SHA1 (patch-libasync_qhash.h) = 8bc832dee629cc8e0f7efc25e9011d9883f08e92
+SHA1 (patch-libasync_vec.h) = 91a4db8114a6ae8915f29610ab11fafdf4427cde
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);