Date: Tue, 6 May 2008 17:21:18 GMT From: Artem Naluzhnyy <tut@nhamon.com.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/123470: [maintainer update] benchmarks/sipp: update to 3.1 Message-ID: <200805061721.m46HLIOT008961@www.freebsd.org> Resent-Message-ID: <200805061730.m46HU1qr005473@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123470
>Category: ports
>Synopsis: [maintainer update] benchmarks/sipp: update to 3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 06 17:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Artem Naluzhnyy
>Release:
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN sipp.bak/Makefile sipp/Makefile
--- sipp.bak/Makefile 2008-04-08 16:53:19.000000000 +0300
+++ sipp/Makefile 2008-05-06 18:29:03.000000000 +0300
@@ -6,18 +6,20 @@
#
PORTNAME= sipp
-PORTVERSION= 3.0
-PORTREVISION= 1
+PORTVERSION= 3.1
CATEGORIES= benchmarks net
MASTER_SITES= SF
-DISTNAME= ${PORTNAME}-3.0.src
+DISTNAME= ${PORTNAME}.${PORTVERSION}.src
MAINTAINER= tut@nhamon.com.ua
COMMENT= SIP testing tool
+WRKSRC= ${WRKDIR}/${PORTNAME}.svn
+
PLIST_FILES= bin/sipp
MAN1= sipp.1
+USE_GMAKE= yes
MAKE_ENV+= CPP="${CXX}" \
CPPFLAGS="${CXXFLAGS}" \
CCLINK="${CXX}"
diff -ruN sipp.bak/distinfo sipp/distinfo
--- sipp.bak/distinfo 2008-05-06 15:25:39.000000000 +0300
+++ sipp/distinfo 2008-05-06 15:38:36.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (sipp-3.0.src.tar.gz) = 31906c63eb5efa09e0b148c27435cdac
-SHA256 (sipp-3.0.src.tar.gz) = bb7622e64e0cf971a2b1931b0a0f6d93a4e25ad95dad0bbd64f077d2c35f07dd
-SIZE (sipp-3.0.src.tar.gz) = 195692
+MD5 (sipp.3.1.src.tar.gz) = 452a6f88f2d314dbb2f44e318a60982b
+SHA256 (sipp.3.1.src.tar.gz) = 123391c7c5545fc61594cd62334986540604f5a3a3d405faef5e02dab5200399
+SIZE (sipp.3.1.src.tar.gz) = 9428792
diff -ruN sipp.bak/files/patch-Makefile sipp/files/patch-Makefile
--- sipp.bak/files/patch-Makefile 2007-10-24 23:46:04.000000000 +0300
+++ sipp/files/patch-Makefile 2008-05-06 20:12:16.000000000 +0300
@@ -1,15 +1,17 @@
---- Makefile.orig 2007-09-06 11:51:24.000000000 +0300
-+++ Makefile 2007-09-08 19:16:08.000000000 +0300
-@@ -18,8 +18,6 @@
+--- Makefile.orig 2008-04-11 15:26:37.000000000 +0300
++++ Makefile 2008-05-06 20:11:59.000000000 +0300
+@@ -18,10 +18,6 @@
# From Hewlett Packard Company.
#
--include local.mk
+-SVN_VERSION=$(shell if test -d .svn ; then svnversion . | sed -e 's/^/svn/;' ; else echo unknown ; fi)
+-VERINFO=-DSVN_VERSION="\"$(SVN_VERSION)\""
-
# Output binary to be built
OUTPUT=sipp
-@@ -69,7 +67,7 @@
+@@ -71,7 +67,7 @@
CC_SunOS=gcc
CC_Cygwin=cc
CC_Darwin=cc
@@ -18,7 +20,7 @@
# C++ compiler mapping
CPP_hpux=aCC
-@@ -79,7 +77,7 @@
+@@ -81,7 +77,7 @@
CPP_SunOS=g++
CPP_Cygwin=g++
CPP_Darwin=g++
@@ -27,25 +29,25 @@
#Model specific flags
MFLAGS_ia64=+DD64
-@@ -102,7 +100,7 @@
- CFLAGS_SunOS=-g -D__SUNOS
+@@ -104,7 +100,7 @@
+ CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
CFLAGS_Darwin=-D__DARWIN
--CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
-+CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
+-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
++CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
#C++ Compiler Flags
- CPPFLAGS_hpux=-AA -mt -D__HPUX +W829
-@@ -112,7 +110,7 @@
- CPPFLAGS_SunOS=-g -D__SUNOS
+ CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829
+@@ -114,7 +110,7 @@
+ CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
CPPFLAGS_Darwin=-D__DARWIN
--CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
-+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
+-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
++CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
#Linker mapping
CCLINK_hpux=aCC
-@@ -122,7 +120,7 @@
+@@ -124,7 +120,7 @@
CCLINK_SunOS=gcc
CCLINK_Cygwin=g++
CCLINK_Darwin=g++
@@ -54,7 +56,7 @@
#Linker Flags
LFLAGS_hpux=-AA -mt
-@@ -154,8 +152,6 @@
+@@ -156,8 +152,6 @@
INCDIR_Darwin=-I. -I/usr/local/ssl/include
INCDIR=$(INCDIR_$(SYSTEM))
diff -ruN sipp.bak/files/patch-sipp.cpp sipp/files/patch-sipp.cpp
--- sipp.bak/files/patch-sipp.cpp 2008-01-15 23:04:27.000000000 +0200
+++ sipp/files/patch-sipp.cpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- sipp.cpp.orig 2007-11-28 17:09:53.000000000 +0200
-+++ sipp.cpp 2008-01-15 22:57:14.000000000 +0200
-@@ -3627,7 +3627,7 @@
- }
- exit(EXIT_OTHER);
- case SIPP_OPTION_VERSION:
-- printf("\n SIPp v2.0"
-+ printf("\n SIPp v3.0"
- #ifdef _USE_OPENSSL
- "-TLS"
- #endif
diff -ruN sipp.bak/files/patch-sipp.hpp sipp/files/patch-sipp.hpp
--- sipp.bak/files/patch-sipp.hpp 2008-01-15 23:04:37.000000000 +0200
+++ sipp/files/patch-sipp.hpp 1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@
---- sipp.hpp.orig 2007-11-28 12:33:23.000000000 +0200
-+++ sipp.hpp 2008-01-15 22:57:46.000000000 +0200
-@@ -93,7 +93,7 @@
-
- /************************** Constants **************************/
-
--#define SIPP_VERSION 20071128
-+#define SIPP_VERSION 20071204
- #define T_UDP 0
- #define T_TCP 1
- #define T_TLS 2
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805061721.m46HLIOT008961>