From owner-svn-ports-head@FreeBSD.ORG  Mon Nov 25 11:33:43 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 18F15924;
 Mon, 25 Nov 2013 11:33:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6A9542262;
 Mon, 25 Nov 2013 11:33:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAPBXgra013974;
 Mon, 25 Nov 2013 11:33:42 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAPBXgn0013973;
 Mon, 25 Nov 2013 11:33:42 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311251133.rAPBXgn0013973@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 25 Nov 2013 11:33:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334835 - head/benchmarks/iperf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Nov 2013 11:33:43 -0000

Author: sunpoet
Date: Mon Nov 25 11:33:41 2013
New Revision: 334835
URL: http://svnweb.freebsd.org/changeset/ports/334835

Log:
  - Convert to new options helper
  - Remove deprecated PTHREAD_*
  - Support STAGEDIR

Modified:
  head/benchmarks/iperf/Makefile

Modified: head/benchmarks/iperf/Makefile
==============================================================================
--- head/benchmarks/iperf/Makefile	Mon Nov 25 11:33:38 2013	(r334834)
+++ head/benchmarks/iperf/Makefile	Mon Nov 25 11:33:41 2013	(r334835)
@@ -16,31 +16,21 @@ OPTIONS_DEFAULT=THREADS
 
 GNU_CONFIGURE=	yes
 
-MAN1=		iperf.1
-PLIST_FILES=	bin/iperf
+PLIST_FILES=	bin/iperf \
+		man/man1/iperf.1.gz
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MIPV6}
-CATEGORIES+=	ipv6
-CONFIGURE_ARGS+=--enable-ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
+IPV6_CATEGORIES=	ipv6
+IPV6_CONFIGURE_ENABLE=	ipv6
+THREADS_CONFIGURE_ENABLE=	threads
+THREADS_LDFLAGS=	-pthread
 
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-LDFLAGS+=	${PTHREAD_LIBS}
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
+.include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} README doc/*.gif doc/*.html ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>