From owner-svn-ports-all@FreeBSD.ORG  Tue Nov 13 23:17:49 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0A699105;
 Tue, 13 Nov 2012 23:17:49 +0000 (UTC)
 (envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id CA2E18FC0C;
 Tue, 13 Nov 2012 23:17:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qADNHmeQ042056;
 Tue, 13 Nov 2012 23:17:48 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qADNHmRR042055;
 Tue, 13 Nov 2012 23:17:48 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201211132317.qADNHmRR042055@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Tue, 13 Nov 2012 23:17:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307402 - head/benchmarks/iozone
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Nov 2012 23:17:49 -0000

Author: jhale
Date: Tue Nov 13 23:17:48 2012
New Revision: 307402
URL: http://svnweb.freebsd.org/changeset/ports/307402

Log:
  - Convert to new options framework
  - Trim Makefile header
  
  While here:
  - Whitespace alignment
  - Respect MANPREFIX
  - Remove STRIP_CMD as this is done by INSTALL_PROGRAM
  - Merge duplicate post-patch targets into one
  
  PR:		ports/173548
  Submitted by:	Edward <is.a.relay@gmail.com>
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/benchmarks/iozone/Makefile   (contents, props changed)

Modified: head/benchmarks/iozone/Makefile
==============================================================================
--- head/benchmarks/iozone/Makefile	Tue Nov 13 22:26:47 2012	(r307401)
+++ head/benchmarks/iozone/Makefile	Tue Nov 13 23:17:48 2012	(r307402)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    iozone
-# Date created:         26 September 1994
-# Whom:                 jmz
-#
+# Created by: jmz
 # $FreeBSD$
-#
 
 PORTNAME=	iozone
 PORTVERSION=	3.397
@@ -27,29 +23,29 @@ MAKE_JOBS_UNSAFE=	yes
 MAN1=		iozone.1
 PLIST_FILES=	bin/iozone
 
-OPTIONS=	THREADS "Enable threading (uses pthreads)"	on \
-		SSH "Use ssh in distributed measurement"	on
+OPTIONS_DEFINE=	SSH THREADS
+OPTIONS_DEFAULT=SSH THREADS
 
-.include <bsd.port.pre.mk>
+SSH_DESC=	Use ssh in distributed measurement
+THREADS_DESC=	Enable threading (uses pthreads)
 
-.if defined (WITH_THREADS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTHREADS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
 .else
-CFLAGS+=-DNO_THREADS
+CFLAGS+=	-DNO_THREADS
 .endif
 
-.if defined (WITH_SSH)
-post-patch::
+post-patch:
+.if ${PORT_OPTIONS:MSSH}
 	@${REINPLACE_CMD} -e 's|shell\,\"rsh\"|shell\,\"ssh\"|' ${WRKSRC}/iozone.c
 .endif
-
-post-patch::
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/makefile
 
 do-install:
-	${STRIP_CMD} ${WRKSRC}/iozone
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${MANPREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>