--- a/components/iperf/Makefile Mon Oct 24 10:23:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-BUILD_BITS= 64
-include ../../make-rules/shared-macros.mk
-
-COMPONENT_NAME= iperf
-COMPONENT_VERSION= 2.0.5
-COMPONENT_PROJECT_URL= http://sourceforge.net/projects/iperf/
-COMPONENT_ARCHIVE_HASH= \
- sha256:636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b
-COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/iperf/$(COMPONENT_ARCHIVE)
-
-TPNO= 5730
-
-TEST_TARGET= $(NO_TESTS)
-include $(WS_MAKE_RULES)/common.mk
-
-COMPONENT_PRE_CONFIGURE_ACTION = \
- ($(CLONEY) $(SOURCE_DIR) $(@D))
-
-CONFIGURE_OPTIONS += PTHREAD_CFLAGS=-pthreads
-
-# these default to unnecessary gcc options, which
-# are all that prevents us from using studio. so null them.
-COMPONENT_BUILD_ARGS += AM_CXXFLAGS=""
-COMPONENT_BUILD_ARGS += AM_CFLAGS=""
-
-REQUIRED_PACKAGES += system/library/c++-runtime
-REQUIRED_PACKAGES += system/library/math
--- a/components/iperf/iperf.license Mon Oct 24 10:23:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-Copyright (c) 1999-2007, The Board of Trustees of the University of Illinois
-All Rights Reserved.
-
-Iperf performance test
-Mark Gates
-Ajay Tirumala
-Jim Ferguson
-Jon Dugan
-Feng Qin
-Kevin Gibbs
-John Estabrook
-National Laboratory for Applied Network Research
-National Center for Supercomputing Applications
-University of Illinois at Urbana-Champaign
-http://www.ncsa.uiuc.edu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software (Iperf) and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimers.
-
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimers in the documentation and/or
-other materials provided with the distribution.
-
-Neither the names of the University of Illinois, NCSA, nor the names of its
-contributors may be used to endorse or promote products derived from this
-Software without specific prior written permission. THE SOFTWARE IS PROVIDED
-"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
-AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTIBUTORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/components/iperf/iperf.p5m Mon Oct 24 10:23:42 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri \
- value=pkg:/benchmark/iperf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="iperf - tool for measuring maximum TCP and UDP bandwidth performance"
-set name=com.oracle.info.description value="the iperf utility"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2009/109
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/iperf
-file path=usr/share/man/man1/iperf.1
-license iperf.license license=BSD-like
--- a/components/meta-packages/history/history Mon Oct 24 10:23:42 2016 -0700
+++ b/components/meta-packages/history/history Mon Oct 24 10:25:03 2016 -0700
@@ -420,7 +420,7 @@
[email protected],5.11-0.133 diagnostic/[email protected]
[email protected],5.11-0.133 library/[email protected]
[email protected],5.11-0.133 image/[email protected]
[email protected],5.11-0.133 benchmark/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected]
[email protected],5.11-0.175.0.0.0.0.0 network/chat/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 data/[email protected]
@@ -750,6 +750,7 @@
[email protected],5.11-0.133 web/[email protected]
backup/[email protected],5.12-5.12.0.0.0.85.0
benchmark/[email protected]
+benchmark/[email protected],5.12-5.12.0.0.0.112.0
codec/install/[email protected],5.11-0.175.0.0.0.0.0
communication/conferencing/[email protected],5.12-5.12.0.0.0.94.0
communication/pda/[email protected],5.12-5.12.0.0.0.90.0