6 files changed, 78 insertions, 30 deletions

diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index 320d14d5912c..e6fdb49576ce 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sipp
-PORTVERSION=	1.1.r8.20070116
+PORTVERSION=	1.1.r8.20070130
 CATEGORIES=	net
 MASTER_SITES=	http://sipp.sourceforge.net/snapshots/
-DISTNAME=	${PORTNAME}.2007-01-16
+DISTNAME=	${PORTNAME}.2007-01-30
 
 MAINTAINER=	tut@nhamon.com.ua
 COMMENT=	SIP testing tool
@@ -17,16 +17,25 @@ COMMENT=	SIP testing tool
 PLIST_FILES=	bin/sipp
 MAN1=		sipp.1
 
-MAKE_ENV+=	CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}"
+MAKE_ENV+=	CPP="${CXX}" \
+		CPPFLAGS="${CXXFLAGS}" \
+		CCLINK="${CXX}"
 
 OPTIONS=	OPENSSL		"OpenSSL support (for digest auth and SIP over TLS)" on \
+		GSL		"GSL support (for statistical distributed pauses)" off \
 		PCAPPLAY	"RTP play support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PCAPPLAY)
-BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+.if defined(WITH_GSL)
+LIB_DEPENDS+=	gsl.9:${PORTSDIR}/math/gsl
+
+MAKE_ENV+=	EXTRACPPFLAGS=-DHAVE_GSL \
+		EXTRACFLAGS=-DHAVE_GSL \
+		EXTRALIBS='-lgsl -lgslcblas'
+.endif #defined(WITH_GSL)
 
+.if defined(WITH_PCAPPLAY)
 PCAP_FILES=	dtmf_2833_1.pcap dtmf_2833_2.pcap dtmf_2833_3.pcap \
 		dtmf_2833_4.pcap dtmf_2833_5.pcap dtmf_2833_6.pcap \
 		dtmf_2833_7.pcap dtmf_2833_8.pcap dtmf_2833_9.pcap \
diff --git a/benchmarks/sipp/distinfo b/benchmarks/sipp/distinfo
index 689f7e094eaf..0847adebf01e 100644
--- a/benchmarks/sipp/distinfo
+++ b/benchmarks/sipp/distinfo
@@ -1,3 +1,3 @@
-MD5 (sipp.2007-01-16.tar.gz) = 31814aa7d5b6ddc0d287997dbe762471
-SHA256 (sipp.2007-01-16.tar.gz) = 240021c7f3a4b49d1af3ca02135e3eb76ce91a525bf20d21ab6c18564cca1afd
-SIZE (sipp.2007-01-16.tar.gz) = 171551
+MD5 (sipp.2007-01-30.tar.gz) = b7c7fad1c3191d50c56fbc5d95417d29
+SHA256 (sipp.2007-01-30.tar.gz) = 07221e61f1c5ab0d0f0f0cbebbeb7080f570a4ff23ec455d87b5dfce9f0a4660
+SIZE (sipp.2007-01-30.tar.gz) = 184238
diff --git a/benchmarks/sipp/files/patch-Makefile b/benchmarks/sipp/files/patch-Makefile
index 0c93740279cc..8084206fe46e 100644
--- a/benchmarks/sipp/files/patch-Makefile
+++ b/benchmarks/sipp/files/patch-Makefile
@@ -1,7 +1,5 @@
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Tue Jan 16 11:18:32 2007
++++ Makefile	Tue Jan 30 21:44:15 2007
 @@ -18,8 +18,6 @@
  #           From Hewlett Packard Company.
  #
@@ -34,7 +32,7 @@ $FreeBSD$
  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)
++CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
  
  #C++ Compiler Flags
  CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 
@@ -43,7 +41,7 @@ $FreeBSD$
  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)
++CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
  
  #Linker mapping
  CCLINK_hpux=aCC
@@ -56,7 +54,24 @@ $FreeBSD$
  
  #Linker Flags
  LFLAGS_hpux=-AA -mt
-@@ -153,8 +151,6 @@
+@@ -138,7 +136,7 @@
+ LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
+ LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
+ LIBS_tru64= -lcurses -lpthread
+-LIBS_freebsd= -lcurses -pthread
++LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
+ LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
+ LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
+ LIBS_Darwin= -lcurses
+@@ -146,15 +144,13 @@
+ 
+ # Include directories
+ INCDIR_linux=-I. -I/opt/openssl/include
+-INCDIR_freebsd=-I. -I/opt/openssl/include
++INCDIR_freebsd=-I. -I/usr/local/include
+ INCDIR_hpux=-I. -I/usr/local/include -I/opt/openssl/include
+ INCDIR_tru64=-I. -I/opt/openssl/include
+ INCDIR_SunOS=-I. -I/usr/local/ssl/include/
  INCDIR_Cygwin=-I. -I/usr/include/openssl -I/usr/include -I/usr/lib/WpdPack/Include
  INCDIR_Darwin=-I. -I/usr/local/ssl/include
  INCDIR=$(INCDIR_$(SYSTEM)) 
diff --git a/net/sipp/Makefile b/net/sipp/Makefile
index 320d14d5912c..e6fdb49576ce 100644
--- a/net/sipp/Makefile
+++ b/net/sipp/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	sipp
-PORTVERSION=	1.1.r8.20070116
+PORTVERSION=	1.1.r8.20070130
 CATEGORIES=	net
 MASTER_SITES=	http://sipp.sourceforge.net/snapshots/
-DISTNAME=	${PORTNAME}.2007-01-16
+DISTNAME=	${PORTNAME}.2007-01-30
 
 MAINTAINER=	tut@nhamon.com.ua
 COMMENT=	SIP testing tool
@@ -17,16 +17,25 @@ COMMENT=	SIP testing tool
 PLIST_FILES=	bin/sipp
 MAN1=		sipp.1
 
-MAKE_ENV+=	CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}"
+MAKE_ENV+=	CPP="${CXX}" \
+		CPPFLAGS="${CXXFLAGS}" \
+		CCLINK="${CXX}"
 
 OPTIONS=	OPENSSL		"OpenSSL support (for digest auth and SIP over TLS)" on \
+		GSL		"GSL support (for statistical distributed pauses)" off \
 		PCAPPLAY	"RTP play support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PCAPPLAY)
-BUILD_DEPENDS=	libnet*>=1.1.2,1:${PORTSDIR}/net/libnet
+.if defined(WITH_GSL)
+LIB_DEPENDS+=	gsl.9:${PORTSDIR}/math/gsl
+
+MAKE_ENV+=	EXTRACPPFLAGS=-DHAVE_GSL \
+		EXTRACFLAGS=-DHAVE_GSL \
+		EXTRALIBS='-lgsl -lgslcblas'
+.endif #defined(WITH_GSL)
 
+.if defined(WITH_PCAPPLAY)
 PCAP_FILES=	dtmf_2833_1.pcap dtmf_2833_2.pcap dtmf_2833_3.pcap \
 		dtmf_2833_4.pcap dtmf_2833_5.pcap dtmf_2833_6.pcap \
 		dtmf_2833_7.pcap dtmf_2833_8.pcap dtmf_2833_9.pcap \
diff --git a/net/sipp/distinfo b/net/sipp/distinfo
index 689f7e094eaf..0847adebf01e 100644
--- a/net/sipp/distinfo
+++ b/net/sipp/distinfo
@@ -1,3 +1,3 @@
-MD5 (sipp.2007-01-16.tar.gz) = 31814aa7d5b6ddc0d287997dbe762471
-SHA256 (sipp.2007-01-16.tar.gz) = 240021c7f3a4b49d1af3ca02135e3eb76ce91a525bf20d21ab6c18564cca1afd
-SIZE (sipp.2007-01-16.tar.gz) = 171551
+MD5 (sipp.2007-01-30.tar.gz) = b7c7fad1c3191d50c56fbc5d95417d29
+SHA256 (sipp.2007-01-30.tar.gz) = 07221e61f1c5ab0d0f0f0cbebbeb7080f570a4ff23ec455d87b5dfce9f0a4660
+SIZE (sipp.2007-01-30.tar.gz) = 184238
diff --git a/net/sipp/files/patch-Makefile b/net/sipp/files/patch-Makefile
index 0c93740279cc..8084206fe46e 100644
--- a/net/sipp/files/patch-Makefile
+++ b/net/sipp/files/patch-Makefile
@@ -1,7 +1,5 @@
-$FreeBSD$
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Tue Jan 16 11:18:32 2007
++++ Makefile	Tue Jan 30 21:44:15 2007
 @@ -18,8 +18,6 @@
  #           From Hewlett Packard Company.
  #
@@ -34,7 +32,7 @@ $FreeBSD$
  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)
++CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
  
  #C++ Compiler Flags
  CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 
@@ -43,7 +41,7 @@ $FreeBSD$
  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)
++CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
  
  #Linker mapping
  CCLINK_hpux=aCC
@@ -56,7 +54,24 @@ $FreeBSD$
  
  #Linker Flags
  LFLAGS_hpux=-AA -mt
-@@ -153,8 +151,6 @@
+@@ -138,7 +136,7 @@
+ LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
+ LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
+ LIBS_tru64= -lcurses -lpthread
+-LIBS_freebsd= -lcurses -pthread
++LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
+ LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
+ LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
+ LIBS_Darwin= -lcurses
+@@ -146,15 +144,13 @@
+ 
+ # Include directories
+ INCDIR_linux=-I. -I/opt/openssl/include
+-INCDIR_freebsd=-I. -I/opt/openssl/include
++INCDIR_freebsd=-I. -I/usr/local/include
+ INCDIR_hpux=-I. -I/usr/local/include -I/opt/openssl/include
+ INCDIR_tru64=-I. -I/opt/openssl/include
+ INCDIR_SunOS=-I. -I/usr/local/ssl/include/
  INCDIR_Cygwin=-I. -I/usr/include/openssl -I/usr/include -I/usr/lib/WpdPack/Include
  INCDIR_Darwin=-I. -I/usr/local/ssl/include
  INCDIR=$(INCDIR_$(SYSTEM))