Mon Oct 1 09:47:06 2018 UTC ()
iperf: Remove bool redefine which breaks C++ headers.


(jperkin)
diff -r1.21 -r1.22 pkgsrc/net/iperf/Makefile
diff -r1.10 -r1.11 pkgsrc/net/iperf/distinfo
diff -r0 -r1.1 pkgsrc/net/iperf/patches/patch-configure
cvs diff -r1.21 -r1.22 pkgsrc/net/iperf/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/iperf/Attic/Makefile 2014/11/28 10:30:52 1.21
+++ pkgsrc/net/iperf/Attic/Makefile 2018/10/01 09:47:06 1.22
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.21 2014/11/28 10:30:52 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.22 2018/10/01 09:47:06 jperkin Exp $
2 2
3DISTNAME= iperf-2.0.5 3DISTNAME= iperf-2.0.5
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= net benchmarks 5CATEGORIES= net benchmarks
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=iperf/}
7 7
 8PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/
 9PATCHFILES= nomaxcpu.patch
 10PATCH_DIST_STRIP=-p1
 11
8MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://iperf.sourceforge.net/ 13HOMEPAGE= http://iperf.sourceforge.net/
10COMMENT= TCP and UDP bandwidth performance measurement tool 14COMMENT= TCP and UDP bandwidth performance measurement tool
11LICENSE= modified-bsd 15LICENSE= modified-bsd
12 16
13PATCHFILES= nomaxcpu.patch 
14PATCH_SITES= http://sourceforge.net/p/iperf/patches/28/attachment/ 
15PATCH_DIST_STRIP=-p1 
16 
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) 19.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
20GCC_REQD+= 3.0 20GCC_REQD+= 3.0
21.endif 21.endif
22 22
23USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
24GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
25 25
26LIBS.SunOS+= -lrt 26LIBS.SunOS+= -lrt
27 27
28INSTALLATION_DIRS+= share/doc/${PKGBASE} 28INSTALLATION_DIRS+= share/doc/${PKGBASE}
29 29
cvs diff -r1.10 -r1.11 pkgsrc/net/iperf/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/iperf/Attic/distinfo 2015/11/04 00:35:05 1.10
+++ pkgsrc/net/iperf/Attic/distinfo 2018/10/01 09:47:06 1.11
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.10 2015/11/04 00:35:05 agc Exp $ 1$NetBSD: distinfo,v 1.11 2018/10/01 09:47:06 jperkin Exp $
2 2
3SHA1 (iperf-2.0.5.tar.gz) = 7302792dcb1bd7aeba032fef6d3dcc310e4d113f 3SHA1 (iperf-2.0.5.tar.gz) = 7302792dcb1bd7aeba032fef6d3dcc310e4d113f
4RMD160 (iperf-2.0.5.tar.gz) = 975d971974437136ae72bb17c0f776ea92eaf878 4RMD160 (iperf-2.0.5.tar.gz) = 975d971974437136ae72bb17c0f776ea92eaf878
5SHA512 (iperf-2.0.5.tar.gz) = da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f 5SHA512 (iperf-2.0.5.tar.gz) = da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f
6Size (iperf-2.0.5.tar.gz) = 248583 bytes 6Size (iperf-2.0.5.tar.gz) = 248583 bytes
7SHA1 (nomaxcpu.patch) = 46bf3129826e6221593be9ba9accfb040a9e475a 7SHA1 (nomaxcpu.patch) = 46bf3129826e6221593be9ba9accfb040a9e475a
8RMD160 (nomaxcpu.patch) = a459869fc4e6c7981badc8b11b35ad504ae9808a 8RMD160 (nomaxcpu.patch) = a459869fc4e6c7981badc8b11b35ad504ae9808a
9SHA512 (nomaxcpu.patch) = 91accee7fe57e93ed99e91ec18a09f449f5310952748ed8fb2d4f03882f15bf02078301b75ad465651b81e4e48ec82b70f24544631f1d63cb5eee6e190ef71bc 9SHA512 (nomaxcpu.patch) = 91accee7fe57e93ed99e91ec18a09f449f5310952748ed8fb2d4f03882f15bf02078301b75ad465651b81e4e48ec82b70f24544631f1d63cb5eee6e190ef71bc
10Size (nomaxcpu.patch) = 3354 bytes 10Size (nomaxcpu.patch) = 3354 bytes
11SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc 11SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc
12SHA1 (patch-ac) = 83479534caf61cf034453e1953e9ed5618f3f74c 12SHA1 (patch-ac) = 83479534caf61cf034453e1953e9ed5618f3f74c
 13SHA1 (patch-configure) = 1295b2022beb24ac809b62f9f919c70368545f01
File Added: pkgsrc/net/iperf/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1 2018/10/01 09:47:06 jperkin Exp $

Remove bool redefine which breaks C++ headers.

--- configure.orig	2010-04-10 19:23:05.000000000 +0000
+++ configure
@@ -6961,15 +6961,8 @@ $as_echo "$ac_cv_sizeof_bool" >&6; }
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_BOOL $ac_cv_sizeof_bool
-_ACEOF
 
 
-if test "$ac_cv_sizeof_bool" = 0 ; then
-  $as_echo "#define bool int" >>confdefs.h
-
-fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if true is defined" >&5
 $as_echo_n "checking if true is defined... " >&6; }