Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Nov 2013 11:33:42 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334835 - head/benchmarks/iperf
Message-ID:  <201311251133.rAPBXgn0013973@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311251133.rAPBXgn0013973>