update to version 2.0.2; thanks to Alexandre Anriot

This commit is contained in:
jakob 2005-05-08 21:16:15 +00:00
parent 228c159cca
commit e76f1947d9
6 changed files with 32 additions and 52 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2004/12/16 00:31:22 alek Exp $
# $OpenBSD: Makefile,v 1.11 2005/05/08 21:16:15 jakob Exp $
COMMENT= "tool for measuring maximum TCP and UDP bandwidth"
DISTNAME= iperf-1.7.0
DISTNAME= iperf-2.0.2
CATEGORIES= net
HOMEPAGE= http://dast.nlanr.net/Projects/Iperf/
@ -13,22 +13,19 @@ PERMIT_PACKAGE_CDROM= "no fee license"
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= "no fee license"
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m stdc++
MASTER_SITES= http://dast.nlanr.net/Projects/Iperf/
EXTRACT_SUFX= -source.tar.gz
WANTLIB= c m stdc++ pthread
MASTER_SITES= http://dast.nlanr.net/Projects/Iperf2.0/
CONFIGURE_STYLE=gnu
WRKCONF= ${WRKSRC}/cfg
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/cfg
MAKE_ENV= CC="${CC}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/src/iperf ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/iperf
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/iperf
${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/doc/iperf
NO_REGRESS= Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/iperf ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/iperf
${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/iperf
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (iperf-1.7.0-source.tar.gz) = 3e4aea85822bcf10ed14040f4b26bd26
RMD160 (iperf-1.7.0-source.tar.gz) = 573d325528d5dfdc7c6279ed942bf72948e32bdc
SHA1 (iperf-1.7.0-source.tar.gz) = 6f8058616f2105f8342e3a39366a3362b0f85589
SIZE (iperf-1.7.0-source.tar.gz) = 182773
MD5 (iperf-2.0.2.tar.gz) = bb658aba58a5af0356f5b1342dfe8f53
RMD160 (iperf-2.0.2.tar.gz) = 8e3627f718ddc9aea109fceb0c8a0359cd054447
SHA1 (iperf-2.0.2.tar.gz) = 5cbda4199c2c6c9417d0d0d0cd840de3009fa36a
SIZE (iperf-2.0.2.tar.gz) = 233595

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-cfg_configure,v 1.3 2004/10/16 10:42:31 sturm Exp $
--- cfg/configure.orig Mon Mar 31 22:25:20 2003
+++ cfg/configure Sat Oct 16 09:27:27 2004
@@ -1687,7 +1687,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ac_cv_c_compiler_gnu" = yes ; then
- CFLAGS="$OLD_CFLAGS -Wall -O2"
+ CFLAGS="$OLD_CFLAGS "
else
if test `uname -s` = "HP-UX"; then
CFLAGS="$OLD_CFLAGS -Ae +O2"
@@ -1999,7 +1999,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$ac_cv_c_compiler_gnu" = yes ; then
- CXXFLAGS="$OLD_CXXFLAGS -Wall -O2"
+ CXXFLAGS="$OLD_CXXFLAGS "
else
if test `uname -s` = "HP-UX"; then
CXXFLAGS="$OLD_CXXFLAGS -Ae +O2"
@@ -2400,6 +2400,7 @@ else
fi
rm -f conftest.err conftest.$ac_ext
fi
+ac_cv_header_pthread_h=no
echo "$as_me:2403: result: $ac_cv_header_pthread_h" >&5
echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
if test $ac_cv_header_pthread_h = yes; then

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-include_headers_h,v 1.1 2005/05/08 21:16:15 jakob Exp $
--- include/headers.h.orig Thu May 5 11:19:01 2005
+++ include/headers.h Thu May 5 11:21:35 2005
@@ -179,6 +179,10 @@ typedef struct sockaddr_in iperf_sockadd
// Rationalize stdint definitions and sizeof, thanks to ac_create_stdint_h.m4
// from the gnu archive
+#if defined( __OpenBSD__ )
+typedef unsigned long uintmax_t;
+#endif
+
#include <iperf-int.h>
typedef uintmax_t max_size_t;

View File

@ -1,3 +1,3 @@
Iperf is a tool for measuring maximum TCP and UDP bandwidth,
reminiscent of ttcp and nettest. It has been written to overcome the
shortcomings of those aging tools.
iperf is a tool for measuring maximum TCP and UDP bandwidth, reminiscent
of ttcp and nettest. It has been written to overcome the shortcomings of
those aging tools.

View File

@ -1,8 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2004/10/16 10:42:31 sturm Exp $
@comment $OpenBSD: PLIST,v 1.4 2005/05/08 21:16:15 jakob Exp $
bin/iperf
share/doc/iperf/
share/doc/iperf/dast.gif
share/doc/iperf/index.html
share/doc/iperf/jperf.gif
share/doc/iperf/lib.html
share/doc/iperf/ui_license.html