3 files changed, 39 insertions, 46 deletions

diff --git a/benchmarks/nqueens/Makefile b/benchmarks/nqueens/Makefile
index eacc6a1f4bfd..e68214fdd6c0 100644
--- a/benchmarks/nqueens/Makefile
+++ b/benchmarks/nqueens/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	N-Queens
-# Date Created:				2 March 2005
-# Whom:					NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
-#
+# Created by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	nqueens
 PORTVERSION=	1.0
@@ -17,22 +13,22 @@ COMMENT=	N-queens benchmark
 
 WRKSRC=		${WRKDIR}/version${PORTVERSION}
 
-OPTIONS=	MPI "Build distributed MPI version" off \
-		STATIC "Link resulting binaries statically" off \
-		OPTIMIZED_CFLAGS "Enable extra optimization options" off
+OPTIONS_DEFINE=	MPI STATIC OPTIMIZED_CFLAGS
+MPI_DESC=	Build distributed MPI version
+STATIC_DESC=	Link resulting binaries statically
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O9 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
 .endif
-.if defined(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 CFLAGS+=	-static
 .endif
 
 PROGS=		qn24b_base
 
-.if defined(WITH_MPI)
+.if ${PORT_OPTIONS:MMPI}
 MPICC?=		${LOCALBASE}/mpich/bin/mpicc
 BUILD_DEPENDS=	${MPICC}:${PORTSDIR}/net/mpich
 PROGS+=		qn24b_mpi
@@ -44,7 +40,7 @@ post-extract:
 do-build:
 	cd ${WRKSRC} && \
 	${CC} ${CFLAGS} -o qn24b_base base/queens.c
-.if defined(WITH_MPI)
+.if ${PORT_OPTIONS:MMPI}
 	cd ${WRKSRC} && \
 	${MPICC} ${CFLAGS} -o qn24b_mpi mpi/main.c
 .endif
@@ -56,4 +52,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${p} ${PREFIX}/bin/
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
index e50dbe89ec26..0af91abde04a 100644
--- a/benchmarks/polygraph31/Makefile
+++ b/benchmarks/polygraph31/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	polygraph
-# Date created:         3 March 1999
-# Whom:                 Dima Sivachenko <dima@chg.ru>
-#
+# Created by: Dima Sivachenko <dima@chg.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	polygraph31
 PORTVERSION=	3.1.5
@@ -23,10 +19,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME:S/31//}-${PORTVERSION}
 
 CONFLICTS=	ltrace-0* polygraph-[0-9]*
 
-OPTIONS=	GNUPLOT "gnuplot if you want full report functionality" ON \
-		PERL	"install Perl for polygraph tools"		OFF
+OPTIONS_DEFINE=	GNUPLOT PERL
+OPTIONS_DEFAULT=	GNUPLOT
+GNUPLOT_DESC=	gnuplot if you want full report functionality
+PERL_DESC=	install Perl for polygraph tools
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 900009 || (${OSVERSION} < 900000 && ${OSVERSION} >= 800503)
 BROKEN=		does not build
@@ -34,12 +32,12 @@ BROKEN=		does not build
 
 DATADIR:=	${DATADIR:S/31//}
 
-.if !defined(WITHOUT_GNUPLOT)
+.if ${PORT_OPTIONS:MGNUPLOT}
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 .endif
 
-.if !defined(WITHOUT_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5_RUN=	yes
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/benchmarks/sipp/Makefile b/benchmarks/sipp/Makefile
index bd65692d5474..45007a0a46c6 100644
--- a/benchmarks/sipp/Makefile
+++ b/benchmarks/sipp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    sipp
-# Date created:         15 Jun 2004
-# Whom:                 jesper@jdn.dk
-#
+# Created by: jesper@jdn.dk
 # $FreeBSD$
-#
 
 PORTNAME=	sipp
 PORTVERSION=	3.3
@@ -26,13 +22,15 @@ MAKE_ENV+=	CCLINK="${CXX}"
 CPPFLAGS+=	${CXXFLAGS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS=	OPENSSL		"OpenSSL support (for digest auth and SIP over TLS)" on \
-		GSL		"GSL support (for statistical distributed pauses)" off \
-		PCAPPLAY	"RTP play support" off
+OPTIONS_DEFINE=	OPENSSL GSL PCAPPLAY
+OPTIONS_DEFAULT=	OPENSSL
+OPENSSL_DESC=	OpenSSL support (for digest auth and SIP over TLS)
+GSL_DESC=	GSL support (for statistical distributed pauses)
+PCAPPLAY_DESC=	RTP play support
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GSL)
+.if ${PORT_OPTIONS:MGSL}
 LIB_DEPENDS+=	gsl.16:${PORTSDIR}/math/gsl
 
 MAKE_ENV+=	EXTRACPPFLAGS=-DHAVE_GSL \
@@ -40,7 +38,7 @@ MAKE_ENV+=	EXTRACPPFLAGS=-DHAVE_GSL \
 		EXTRALIBS='-lgsl -lgslcblas'
 .endif #defined(WITH_GSL)
 
-.if defined(WITH_PCAPPLAY)
+.if ${PORT_OPTIONS:MPCAPPLAY}
 PCAP_FILES=	dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
 		dtmf_2833_3.pcap dtmf_2833_4.pcap dtmf_2833_5.pcap \
 		dtmf_2833_6.pcap dtmf_2833_7.pcap dtmf_2833_8.pcap \
@@ -55,20 +53,21 @@ PLIST_FILES+=	%%DATADIR%%/pcap/${f}
 .endfor
 .endif #defined(WITH_PCAPPLAY)
 
-.if defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL}
 
-.if defined(WITH_PCAPPLAY)
-ALL_TARGET=	pcapplay
-.endif #defined(WITH_PCAPPLAY)
-
-.else #!defined(WITHOUT_OPENSSL)
-
-.if defined(WITH_PCAPPLAY)
+.if ${PORT_OPTIONS:MPCAPPLAY}
 ALL_TARGET=	pcapplay_ossl
 .else
 ALL_TARGET=	ossl
 .endif #defined(WITH_PCAPPLAY)
 
+.else # ! ${PORT_OPTIONS:MOPENSSL}
+
+.if ${PORT_OPTIONS:MPCAPPLAY}
+ALL_TARGET=	pcapplay
+.endif #defined(WITH_PCAPPLAY)
+
+
 .endif #defined(WITHOUT_OPENSSL)
 
 post-patch:
@@ -76,7 +75,7 @@ post-patch:
 	@${REINPLACE_CMD} 's/^\(MFLAGS_ia64=\)\+DD64$$/\1/' ${WRKSRC}/Makefile
 .endif
 
-.if defined(WITH_PCAPPLAY)
+.if ${PORT_OPTIONS:MPCAPPLAY}
 	@${REINPLACE_CMD} \
 		's|\(\\"\)\(pcap/[^"]*\.pcap\\"\)|\1${DATADIR}/\2|' \
 		${WRKSRC}/scenario.cpp
@@ -86,7 +85,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_MAN} ${FILESDIR}/sipp.1 ${PREFIX}/man/man1
 
-.if defined(WITH_PCAPPLAY)
+.if ${PORT_OPTIONS:MPCAPPLAY}
 	${MKDIR} ${DATADIR}/pcap
 
 .for f in ${PCAP_FILES}
@@ -95,4 +94,4 @@ do-install:
 
 .endif #defined(WITH_PCAPPLAY)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>