svn commit: r347831 - in head/benchmarks/postal: . files
Martin Wilke
miwi at FreeBSD.org
Tue Mar 11 02:36:29 UTC 2014
Author: miwi
Date: Tue Mar 11 02:36:27 2014
New Revision: 347831
URL: http://svnweb.freebsd.org/changeset/ports/347831
QAT: https://qat.redports.org/buildarchive/r347831/
Log:
- Update to 0.73
- Use new options helper
- Update pkg-descr
PR: 187289
Submitted by: ports fury
Added:
head/benchmarks/postal/files/patch-bhmusers.cpp (contents, props changed)
head/benchmarks/postal/files/patch-bhmusers.h (contents, props changed)
head/benchmarks/postal/files/patch-postal.cpp (contents, props changed)
head/benchmarks/postal/files/patch-rabid.cpp (contents, props changed)
head/benchmarks/postal/files/patch-smtp.cpp (contents, props changed)
head/benchmarks/postal/files/patch-smtp.h (contents, props changed)
Modified:
head/benchmarks/postal/Makefile
head/benchmarks/postal/distinfo
head/benchmarks/postal/files/patch-bhm.cpp
head/benchmarks/postal/pkg-descr
Modified: head/benchmarks/postal/Makefile
==============================================================================
--- head/benchmarks/postal/Makefile Tue Mar 11 02:34:23 2014 (r347830)
+++ head/benchmarks/postal/Makefile Tue Mar 11 02:36:27 2014 (r347831)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postal
-PORTVERSION= 0.72
+PORTVERSION= 0.73
CATEGORIES= benchmarks mail
MASTER_SITES= http://www.coker.com.au/postal/
EXTRACT_SUFX= .tgz
@@ -12,31 +12,37 @@ COMMENT= Benchmark SMTP/POP servers
LICENSE= GPLv3
-OPTIONS_DEFINE= SSL
-OPTIONS_DEFAULT= SSL
-
USES= gmake
-USE_GCC= 4.7+ # Uses GCC-specific C++ namespaces.
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-gnutls
-PLIST_FILES= sbin/bhm sbin/postal bin/postal-list sbin/rabid \
- man/man1/postal-list.1.gz man/man8/bhm.8.gz \
- man/man8/postal.8.gz man/man8/rabid.8.gz
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL= yes
-.else
-CONFIGURE_ARGS+= --disable-openssl
-.endif
+PLIST_FILES= bin/postal-list \
+ man/man1/postal-list.1.gz \
+ man/man8/bhm.8.gz \
+ man/man8/postal.8.gz \
+ man/man8/rabid.8.gz \
+ sbin/bhm \
+ sbin/postal \
+ sbin/rabid
+
+OPTIONS_RADIO= TLS
+OPTIONS_RADIO_TLS= GNUTLS OPENSSL
+OPTIONS_DEFAULT= OPENSSL
+
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_USES= pkgconfig
+GNUTLS_CONFIGURE_OFF= --disable-gnutls
+GNUTLS_CPPFLAGS= $$(pkg-config --cflags gnutls)
+GNUTLS_LDFLAGS= $$(pkg-config --libs gnutls)
+OPENSSL_USE= OPENSSL=yes
+OPENSSL_CONFIGURE_OFF= --disable-openssl
post-patch:
@${REINPLACE_CMD} -e \
- 's|-lpthread|-pthread|' ${WRKSRC}/configure
+ 's|-lpthread|-pthread| ; \
+ s|-lgcrypt||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e \
- 's|-O2 -g|| ; \
- s|-lstdc|$${LDFLAGS}|' ${WRKSRC}/Makefile.in
+ 's|-pedantic|| ; \
+ s|-O2 -g|$$(CPPFLAGS)| ; \
+ s|-lstdc++|$$(LDFLAGS)|' ${WRKSRC}/Makefile.in
.include <bsd.port.mk>
Modified: head/benchmarks/postal/distinfo
==============================================================================
--- head/benchmarks/postal/distinfo Tue Mar 11 02:34:23 2014 (r347830)
+++ head/benchmarks/postal/distinfo Tue Mar 11 02:36:27 2014 (r347831)
@@ -1,2 +1,2 @@
-SHA256 (postal-0.72.tgz) = 70d59adf8ab006a6ea389d8f276a265de743330458f5c1affb97d86bb0663bad
-SIZE (postal-0.72.tgz) = 106720
+SHA256 (postal-0.73.tgz) = 25cc208f5a86d393707164d33a8dfb6ca5b9f586d0d401d549fc15179b766030
+SIZE (postal-0.73.tgz) = 106171
Modified: head/benchmarks/postal/files/patch-bhm.cpp
==============================================================================
--- head/benchmarks/postal/files/patch-bhm.cpp Tue Mar 11 02:34:23 2014 (r347830)
+++ head/benchmarks/postal/files/patch-bhm.cpp Tue Mar 11 02:36:27 2014 (r347831)
@@ -1,6 +1,21 @@
--- bhm.cpp.orig Tue Feb 6 16:04:04 2007
+++ bhm.cpp Tue Feb 6 16:05:12 2007
-@@ -13,7 +13,9 @@
+@@ -3,27 +3,25 @@
+ #endif
+
+ #include "bhmusers.h"
+-#include <errno.h>
+-#include <ctype.h>
++#include <cerrno>
++#include <cctype>
+ #include <unistd.h>
+ #include <sys/wait.h>
+-#include <signal.h>
+-#include <stdio.h>
++#include <csignal>
++#include <cstdio>
++#include <cstdlib>
+ #include <sys/poll.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
@@ -10,3 +25,40 @@
#include "postal.h"
#include "logit.h"
+ #include "results.h"
+ #include "basictcp.h"
+-#ifdef USE_GNUTLS
+-#include <errno.h>
+-#include <gcrypt.h>
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-#endif
+
+ int processes = 0;
+ int *thread_status;
+@@ -47,7 +45,7 @@
+
+ int maxMsgSize = 10240;
+ results res;
+-Logit *log;
++Logit *bhm_log;
+
+ int exitCount = 0;
+
+@@ -261,7 +259,7 @@
+
+ void do_work(thread_data *td)
+ {
+- base_tcp t(td->fd, log, td->debug, &res
++ base_tcp t(td->fd, bhm_log, td->debug, &res
+ #ifdef USE_SSL
+ , td->ssl
+ #endif
+@@ -408,7 +406,7 @@
+ #endif
+ "\n");
+
+- log = new Logit("bhm.log", allLog, false, 0);
++ bhm_log = new Logit("bhm.log", allLog, false, 0);
+ Logit *debug = NULL;
+
+ if(debugName)
Added: head/benchmarks/postal/files/patch-bhmusers.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-bhmusers.cpp Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,10 @@
+--- bhmusers.cpp.orig
++++ bhmusers.cpp
+@@ -1,5 +1,6 @@
+ #include "bhmusers.h"
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
+ #include <cstring>
+ #include "expand.h"
+
Added: head/benchmarks/postal/files/patch-bhmusers.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-bhmusers.h Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,44 @@
+--- bhmusers.h.orig
++++ bhmusers.h
+@@ -6,12 +6,16 @@
+ #include <string>
+ #include "conf.h"
+
++#if defined(_LIBCPP_VERSION)
++#include <unordered_map>
++#else
+ #ifdef HAVE_EXT_HASH_MAP
+ using namespace __gnu_cxx;
+ #include <ext/hash_map>
+ #else
+ #include <hash_map.h>
+ #endif
++#endif
+
+ #include "postal.h"
+
+@@ -23,7 +27,12 @@
+ int sync_time;
+ } BHM_DATA;
+
++
++#if defined(_LIBCPP_VERSION)
++namespace std
++#else
+ namespace __gnu_cxx
++#endif
+ {
+ template<> struct hash< std::string >
+ {
+@@ -34,7 +43,11 @@
+ };
+ }
+
++#if defined(_LIBCPP_VERSION)
++typedef std::unordered_map<string, BHM_DATA , hash<string> > NAME_MAP;
++#else
+ typedef hash_map<string, BHM_DATA , hash<string> > NAME_MAP;
++#endif
+
+ class BHMUsers
+ {
Added: head/benchmarks/postal/files/patch-postal.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-postal.cpp Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,21 @@
+--- postal.cpp.orig
++++ postal.cpp
+@@ -6,15 +6,11 @@
+ #include "smtp.h"
+ #include <unistd.h>
+ #include <sys/wait.h>
+-#include <signal.h>
+-#include <stdio.h>
++#include <csignal>
++#include <cstdio>
++#include <cstdlib>
+ #include "postal.h"
+ #include "logit.h"
+-#ifdef USE_GNUTLS
+-#include <errno.h>
+-#include <gcrypt.h>
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
+-#endif
+
+ void usage()
+ {
Added: head/benchmarks/postal/files/patch-rabid.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-rabid.cpp Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,23 @@
+--- rabid.cpp.orig
++++ rabid.cpp
+@@ -7,15 +7,14 @@
+ #include <cstdlib>
+ #include <unistd.h>
+ #include <sys/wait.h>
+-#include <signal.h>
+-#include <stdio.h>
+-#include <strings.h>
++#include <csignal>
++#include <cstdio>
++#include <cstring>
++#include <strings.h>
+ #include "postal.h"
+ #include "logit.h"
+ #ifdef USE_GNUTLS
+-#include <errno.h>
+-#include <gcrypt.h>
+-GCRY_THREAD_OPTION_PTHREAD_IMPL;
++#include <cerrno>
+ #endif
+
+ void usage()
Added: head/benchmarks/postal/files/patch-smtp.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-smtp.cpp Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,10 @@
+--- smtp.cpp.orig
++++ smtp.cpp
+@@ -8,6 +8,7 @@
+ #include "userlist.h"
+ #include "logit.h"
+ #include "results.h"
++#include <cstdlib>
+ #include <cstring>
+
+ smtpData::smtpData()
Added: head/benchmarks/postal/files/patch-smtp.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/benchmarks/postal/files/patch-smtp.h Tue Mar 11 02:36:27 2014 (r347831)
@@ -0,0 +1,34 @@
+--- smtp.h.orig
++++ smtp.h
+@@ -4,14 +4,18 @@
+ using namespace std;
+ #include <string>
+ #include <cstring>
+-#include <time.h>
++#include <ctime>
+ #include "conf.h"
++#if defined(_LIBCPP_VERSION)
++#include <unordered_map>
++#else
+ #ifdef HAVE_EXT_HASH_MAP
+ using namespace __gnu_cxx;
+ #include <ext/hash_map>
+ #else
+ #include <hash_map.h>
+ #endif
++#endif
+ #include "tcp.h"
+ #include "mutex.h"
+
+@@ -30,7 +34,11 @@
+ }
+ };
+
++#if defined(_LIBCPP_VERSION)
++typedef std::unordered_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
++#else
+ typedef hash_map<unsigned long, string *, hash<unsigned long>, eqlng> NAME_MAP;
++#endif
+
+ class smtpData
+ {
Modified: head/benchmarks/postal/pkg-descr
==============================================================================
--- head/benchmarks/postal/pkg-descr Tue Mar 11 02:34:23 2014 (r347830)
+++ head/benchmarks/postal/pkg-descr Tue Mar 11 02:36:27 2014 (r347831)
@@ -1,7 +1,7 @@
Postal is a SMTP benchmark.
-Postal-list will list all the possible expansions for an account name (used
-for creating a list of accounts to create on your test server).
+Postal-list will list all the possible expansions for an account name
+(used for creating a list of accounts to create on your test server).
Rabid is the mad Biff, it is a POP benchmark.
More information about the svn-ports-all
mailing list