benchmarks/postal: Upgrade from version 0.62 to 0.70

Despite several additional patches, postal 0.62 wouldn't compile on
DragonFly (broke on stl vectors), so upgrading the package was the
most effective approach to restore this package.
License updated in Makefile.

Summary of changes since version 0.62
=====================================
0.65   Significant improvement, many new features and many bugs fixed!
0.66   Made GNUTLS work in BHM and added Messageld to Postal
0.67   Changed license to GPLv3
0.68   Fixed compiler warnings on GCC 4.3, make it work for OpenSolaris
0.69   Fixed compiler warnings and more GCC 4.3 compatibility work
0.70   Updated man pages and allowed build without SSL support

9 files changed, 72 insertions, 62 deletions

diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index 68727bb6dd2..98a27104ec0 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2010/01/17 12:02:06 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2011/11/24 01:15:41 marino Exp $
 
-DISTNAME=	postal-0.62
-PKGREVISION=	5
+DISTNAME=	postal-0.70
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.coker.com.au/postal/
 EXTRACT_SUFX=	.tgz
@@ -9,6 +8,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	david@silicium.ath.cx
 HOMEPAGE=	http://www.coker.com.au/postal/
 COMMENT=	Tool for benchmarking SMTP/POP servers
+LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/benchmarks/postal/PLIST b/benchmarks/postal/PLIST
index 35ee38cee98..de026ed9396 100644
--- a/benchmarks/postal/PLIST
+++ b/benchmarks/postal/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/03 18:40:33 xtraeme Exp $
-man/man8/postal-list.8
+@comment $NetBSD: PLIST,v 1.2 2011/11/24 01:15:41 marino Exp $
+bin/postal-list
+man/man1/postal-list.1
+man/man8/bhm.8
 man/man8/postal.8
 man/man8/rabid.8
+sbin/bhm
 sbin/postal
-sbin/postal-list
 sbin/rabid
diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo
index c970b016bbb..d32e072b07d 100644
--- a/benchmarks/postal/distinfo
+++ b/benchmarks/postal/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2009/02/09 18:54:05 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 01:15:41 marino Exp $
 
-SHA1 (postal-0.62.tgz) = 6379ac223964921963389c8c600a1ba4b24a6ab3
-RMD160 (postal-0.62.tgz) = 694800444ff33c7c64c5b7915ef5438fdb3605f3
-Size (postal-0.62.tgz) = 84506 bytes
-SHA1 (patch-aa) = ec272095d02d2b8cde4e1f798ac8bfb3212d7874
-SHA1 (patch-ab) = 3a14324d2203fc2f6e0e8028f937906c7d95e7e0
-SHA1 (patch-ac) = 7f888c21b98ffe648bc9d2b055166578cf975ef5
-SHA1 (patch-ad) = 03483392e08df509003e87f513d5dabd95d1b2ea
+SHA1 (postal-0.70.tgz) = d02dc900eb645aa993c5747fa434a0af4b0fb7e0
+RMD160 (postal-0.70.tgz) = 2b23ab0d60abfeaad32adf7ba65134d0f267294a
+Size (postal-0.70.tgz) = 99965 bytes
+SHA1 (patch-aa) = d280c32d86451d2abee8ec95e7a22f91c752ae60
+SHA1 (patch-ab) = bc67f3c2d609f1aeb0969467cdc170e2f6ac08b8
+SHA1 (patch-ad) = 3707f465c6a69c94fd862fb7863a3c8cb6519366
+SHA1 (patch-ae) = 094165c454fb87c9cbacfae6e9ab2bb38f4d15a2
+SHA1 (patch-af) = ddc0280be05d7fac510ac9204146023d9ad58a00
diff --git a/benchmarks/postal/patches/patch-aa b/benchmarks/postal/patches/patch-aa
index 64ad75a9049..6c4826d4d67 100644
--- a/benchmarks/postal/patches/patch-aa
+++ b/benchmarks/postal/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2005/03/14 15:02:14 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/24 01:15:41 marino Exp $
 
---- postal.cpp.orig	Tue Jan 14 12:33:27 2003
-+++ postal.cpp	Sat Mar 12 00:24:43 2005
-@@ -11,6 +11,15 @@
- #include "postal.h"
- #include "logit.h"
+--- postal.cpp.orig	2007-01-14 04:40:23.000000000 +0000
++++ postal.cpp
+@@ -16,6 +16,15 @@
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ #endif
  
 +#ifdef __NetBSD__
 +# include <sys/param.h>
@@ -17,14 +17,14 @@ $NetBSD: patch-aa,v 1.1 2005/03/14 15:02:14 rillig Exp $
 +
  void usage()
  {
-   printf("Usage: postal [-m maximum-message-size] [-p processes] [-l local-address]\n"
-@@ -112,7 +121,9 @@ int main(int argc, char **argv)
-   }
+   printf("Usage: postal [-m maximum-message-size] [-M minimum-message-size] [-t threads]\n"
+@@ -152,7 +161,9 @@ int main(int argc, char **argv)
    struct sigaction sa;
+   sa.sa_sigaction = NULL;
    sa.sa_handler = SIG_IGN;
 +#ifdef HAVE_STRUCT_SIGACTION_SA_SIGACTION
-   sa.sa_sigaction = NULL;
-+#endif
    sa.sa_flags = 0;
++#endif
    if(sigaction(SIGPIPE, &sa, NULL))
    {
+     printf("Can't block SIGPIPE.\n");
diff --git a/benchmarks/postal/patches/patch-ab b/benchmarks/postal/patches/patch-ab
index 8f13b179fc3..5ec5bfb78dd 100644
--- a/benchmarks/postal/patches/patch-ab
+++ b/benchmarks/postal/patches/patch-ab
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/03/14 15:02:14 rillig Exp $
-
---- rabid.cpp.orig	Tue Jan 14 12:33:02 2003
-+++ rabid.cpp	Sat Mar 12 00:25:56 2005
-@@ -11,6 +11,15 @@
- #include "postal.h"
- #include "logit.h"
+--- rabid.cpp.orig	2008-05-26 11:40:30.000000000 +0200
++++ rabid.cpp	2011-11-24 01:18:38.758256000 +0100
+@@ -18,6 +18,15 @@
+ GCRY_THREAD_OPTION_PTHREAD_IMPL;
+ #endif
  
 +#ifdef __NetBSD__
 +# include <sys/param.h>
@@ -18,13 +16,13 @@ $NetBSD: patch-ab,v 1.1 2005/03/14 15:02:14 rillig Exp $
  void usage()
  {
    printf("Usage: rabid [-r max-connections-per-minute] [-p processes] [-l local-address]\n"
-@@ -112,7 +121,9 @@ int main(int argc, char **argv)
+@@ -138,7 +147,9 @@
+   UserList ul(argv[optind + 1], true, strip_domain);
  
    struct sigaction sa;
-   sa.sa_handler = SIG_IGN;
 +#ifdef HAVE_STRUCT_SIGACTION_SA_SIGACTION
    sa.sa_sigaction = NULL;
 +#endif
+   sa.sa_handler = SIG_IGN;
    sa.sa_flags = 0;
    if(sigaction(SIGPIPE, &sa, NULL))
-   {
diff --git a/benchmarks/postal/patches/patch-ac b/benchmarks/postal/patches/patch-ac
deleted file mode 100644
index e8b04311779..00000000000
--- a/benchmarks/postal/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/06/12 02:14:15 joerg Exp $
-
---- Makefile.in.orig	2008-06-11 09:51:31.000000000 +0000
-+++ Makefile.in
-@@ -32,12 +32,12 @@ postal-list: postal-list.cpp expand.o
- 	$(CXX) postal-list.cpp expand.o -o postal-list $(LFLAGS)
- 
- install-bin: $(EXE)
--	mkdir -p $(eprefix)/sbin
--	@INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/sbin
-+	mkdir -p ${DESTDIR}$(eprefix)/sbin
-+	@INSTALL_PROGRAM@ @stripping@ $(EXE) ${DESTDIR}$(eprefix)/sbin
- 
- install: install-bin
--	mkdir -p @mandir@/man8
--	@INSTALL_DATA@ $(MAN8) @mandir@/man8
-+	mkdir -p ${DESTDIR}@mandir@/man8
-+	@INSTALL_DATA@ $(MAN8) ${DESTDIR}@mandir@/man8
- 
- %.o: %.cpp %.h postal.h
- 	$(CXX) -c $<
diff --git a/benchmarks/postal/patches/patch-ad b/benchmarks/postal/patches/patch-ad
index f3a2c02dbad..36c79261774 100644
--- a/benchmarks/postal/patches/patch-ad
+++ b/benchmarks/postal/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.1 2009/02/09 18:54:05 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2011/11/24 01:15:41 marino Exp $
 
---- tcp.h.orig	2009-02-09 19:48:16.000000000 +0100
+--- tcp.h.orig	2007-01-12 07:12:10.000000000 +0000
 +++ tcp.h
-@@ -90,7 +90,11 @@ private:
-   address *m_sourceAddr;
-   Logit *m_debug; // debug file management object (NULL if no debugging)
+@@ -100,7 +100,11 @@ private:
+ 
  #ifdef USE_SSL
+ #ifdef USE_OPENSSL
 +#if OPENSSL_VERSION_NUMBER < 0x00909000L
    SSL_METHOD *m_sslMeth;
 +#else
@@ -13,4 +13,4 @@ $NetBSD: patch-ad,v 1.1 2009/02/09 18:54:05 joerg Exp $
 +#endif
    SSL_CTX* m_sslCtx;
    SSL *m_ssl;
-   bool m_isTLS;
+ #else
diff --git a/benchmarks/postal/patches/patch-ae b/benchmarks/postal/patches/patch-ae
new file mode 100644
index 00000000000..ba33d34697e
--- /dev/null
+++ b/benchmarks/postal/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2011/11/24 01:15:41 marino Exp $
+
+--- basictcp.h.orig	2008-05-26 09:41:40.000000000 +0000
++++ basictcp.h
+@@ -89,7 +89,11 @@ private:
+ 
+ #ifdef USE_SSL
+ #ifdef USE_OPENSSL
++#if OPENSSL_VERSION_NUMBER < 0x00909000L
+   SSL_METHOD *m_sslMeth;
++#else
++  const SSL_METHOD *m_sslMeth;
++#endif
+   SSL_CTX* m_sslCtx;
+   SSL *m_ssl;
+ #else
diff --git a/benchmarks/postal/patches/patch-af b/benchmarks/postal/patches/patch-af
new file mode 100644
index 00000000000..9253aba0c1f
--- /dev/null
+++ b/benchmarks/postal/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2011/11/24 01:15:41 marino Exp $
+
+--- bhm.cpp.orig	2008-05-26 09:43:52.000000000 +0000
++++ bhm.cpp
+@@ -13,6 +13,9 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#if defined (__NetBSD__)
++#include <netinet/in_systm.h>
++#endif
+ #include <netinet/ip.h>
+ 
+ #include "postal.h"