Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1538387226257550"
MIME-Version: 1.0
Date: Mon, 1 Oct 2018 09:47:06 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/net/iperf
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20181001094706.883E4FBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1538387226257550
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Mon Oct  1 09:47:06 UTC 2018

Modified Files:
	pkgsrc/net/iperf: Makefile distinfo
Added Files:
	pkgsrc/net/iperf/patches: patch-configure

Log Message:
iperf: Remove bool redefine which breaks C++ headers.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/iperf/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/iperf/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/iperf/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1538387226257550
Content-Disposition: inline
Content-Length: 2588
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/iperf/Makefile
diff -u pkgsrc/net/iperf/Makefile:1.21 pkgsrc/net/iperf/Makefile:1.22
--- pkgsrc/net/iperf/Makefile:1.21	Fri Nov 28 10:30:52 2014
+++ pkgsrc/net/iperf/Makefile	Mon Oct  1 09:47:06 2018
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.21 2014/11/28 10:30:52 bsiegert Exp $
+# $NetBSD: Makefile,v 1.22 2018/10/01 09:47:06 jperkin Exp $
 
 DISTNAME=	iperf-2.0.5
 PKGREVISION=	1
 CATEGORIES=	net benchmarks
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=iperf/}
 
+PATCH_SITES=	http://sourceforge.net/p/iperf/patches/28/attachment/
+PATCHFILES=	nomaxcpu.patch
+PATCH_DIST_STRIP=-p1
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://iperf.sourceforge.net/
 COMMENT=	TCP and UDP bandwidth performance measurement tool
 LICENSE=	modified-bsd
 
-PATCHFILES=	nomaxcpu.patch
-PATCH_SITES=	http://sourceforge.net/p/iperf/patches/28/attachment/
-PATCH_DIST_STRIP=-p1
-
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)

Index: pkgsrc/net/iperf/distinfo
diff -u pkgsrc/net/iperf/distinfo:1.10 pkgsrc/net/iperf/distinfo:1.11
--- pkgsrc/net/iperf/distinfo:1.10	Wed Nov  4 00:35:05 2015
+++ pkgsrc/net/iperf/distinfo	Mon Oct  1 09:47:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 00:35:05 agc Exp $
+$NetBSD: distinfo,v 1.11 2018/10/01 09:47:06 jperkin Exp $
 
 SHA1 (iperf-2.0.5.tar.gz) = 7302792dcb1bd7aeba032fef6d3dcc310e4d113f
 RMD160 (iperf-2.0.5.tar.gz) = 975d971974437136ae72bb17c0f776ea92eaf878
@@ -10,3 +10,4 @@ SHA512 (nomaxcpu.patch) = 91accee7fe57e9
 Size (nomaxcpu.patch) = 3354 bytes
 SHA1 (patch-ab) = e10e9119c5e830c186630aca72536ed1431fdbdc
 SHA1 (patch-ac) = 83479534caf61cf034453e1953e9ed5618f3f74c
+SHA1 (patch-configure) = 1295b2022beb24ac809b62f9f919c70368545f01

Added files:

Index: pkgsrc/net/iperf/patches/patch-configure
diff -u /dev/null pkgsrc/net/iperf/patches/patch-configure:1.1
--- /dev/null	Mon Oct  1 09:47:06 2018
+++ pkgsrc/net/iperf/patches/patch-configure	Mon Oct  1 09:47:06 2018
@@ -0,0 +1,22 @@
+$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; }


--_----------=_1538387226257550--