Update to 1.1.r4

PR:		90852
Submitted by:	Babak Farrokhi <babak@farrokhi.net>
Approved by:	maintainer timeout

4 files changed, 15 insertions, 37 deletions

diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index f5dfd9aaf93f..a02a431af673 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	sipp
-PORTVERSION=	1.1.r2
+PORTVERSION=	1.1.r4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	sipp
-DISTNAME=	${PORTNAME}.1.1rc2
+DISTNAME=	${PORTNAME}-1.1rc4
 
 MAINTAINER=	jesper@jdn.dk
 COMMENT=	SIP testing tool
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}.cumulus.2005-12-21
+
 PLIST_FILES=	bin/sipp
 MAN1=		sipp.1
 
-MAKE_ENV=	CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}"
+MAKE_ENV+=	CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}"
 
 .include <bsd.port.pre.mk>
 
@@ -27,11 +28,8 @@ MAKE_ENV=	CPP="${CXX}" CPPFLAGS="${CXXFLAGS}" CCLINK="${CXX}"
 BROKEN=		"Does not compile - patch needed by someone who can test it"
 .endif
 
-pre-install:
-	@${CP} ${FILESDIR}/${MAN1} ${WRKSRC}/
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sipp.1 ${PREFIX}/man/man1/sipp.1
+	${INSTALL_MAN} ${FILESDIR}/sipp.1 ${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/benchmarks/sipp/distinfo b/benchmarks/sipp/distinfo
index 61e189052ed1..71e3f171e46c 100644
--- a/benchmarks/sipp/distinfo
+++ b/benchmarks/sipp/distinfo
@@ -1,2 +1,3 @@
-MD5 (sipp.1.1rc2.tar.gz) = 37e095368ff616c9cace03590705ca7c
-SIZE (sipp.1.1rc2.tar.gz) = 86456
+MD5 (sipp-1.1rc4.tar.gz) = cf70c1e10057a032b96fb2023732c0ad
+SHA256 (sipp-1.1rc4.tar.gz) = f0a55e2cec27e9cc9a2f5c985ecb4135639fce467d0a57d00ebec4d9a4c00616
+SIZE (sipp-1.1rc4.tar.gz) = 130699
diff --git a/benchmarks/sipp/files/patch-Makefile b/benchmarks/sipp/files/patch-Makefile
index 3ff53349ff04..8c57e9d39f6b 100644
--- a/benchmarks/sipp/files/patch-Makefile
+++ b/benchmarks/sipp/files/patch-Makefile
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Fri Dec 23 15:49:38 2005
++++ Makefile	Fri Dec 23 15:51:24 2005
 @@ -64,7 +64,7 @@
  CC_tru64=cc  
  CC_SunOS=gcc
@@ -25,8 +25,8 @@ $FreeBSD$
  CFLAGS_tru64=-D__OSF1 -pthread
  CFLAGS_SunOS=-g
  CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
--CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS)
-+CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS)
+-CFLAGS=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY)
++CFLAGS+=$(CFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY)
  
  #C++ Compiler Flags
  CPPFLAGS_hpux=-AA -mt -D__HPUX +W829 
@@ -34,8 +34,8 @@ $FreeBSD$
  CPPFLAGS_tru64=-D__OSF1 -pthread
  CPPFLAGS_SunOS=-g
  CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
--CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS)
-+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS)
+-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY)
++CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) -D__3PCC__ $(TLS) $(PCAPPLAY)
  
  #Linker mapping
  CCLINK_hpux=aCC
diff --git a/benchmarks/sipp/files/patch-comp.c b/benchmarks/sipp/files/patch-comp.c
deleted file mode 100644
index 2b687ac9328f..000000000000
--- a/benchmarks/sipp/files/patch-comp.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- comp.c.orig	Sun Sep 11 18:39:50 2005
-+++ comp.c	Sun Sep 11 18:40:09 2005
-@@ -40,15 +40,15 @@
-   }
-   
-   *(void **)(&comp_compress) = dlsym(handle, "comp_compress");
--  if((error = dlerror()))  
-+  if((error = (char *) dlerror()))  
-     { strcpy(comp_error, error); return comp_error; }
-   
-   *(void **)(&comp_uncompress) = dlsym(handle, "comp_uncompress");
--  if((error = dlerror()))  
-+  if((error = (char *) dlerror()))  
-     { strcpy(comp_error, error); return comp_error; }
-   
-   *(void **)(&comp_free) = dlsym(handle, "comp_free");
--  if((error = dlerror()))  
-+  if((error = (char *) dlerror()))  
-     { strcpy(comp_error, error); return comp_error; }
-   
-   return 0;