1 files changed, 19 insertions, 21 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 2c9bde1a92b4..d5bb7b3895b5 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rrdtool
-# Date created:				20 July 1999
-# Whom:					Dmitry Sivachenko <dima@Chg.RU>
-#
+# Created by: Dmitry Sivachenko <dima@Chg.RU>
 # $FreeBSD$
-#
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.4.7
@@ -38,16 +34,18 @@ PORTDOCS=	*
 PORTEXAMPLES=	4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl
 
-OPTIONS=	DEJAVU		"Use DejaVu fonts (requires X11)" off \
-		JSON		"Support of json export" off \
-		MMAP		"Use mmap in rrd_update" on \
-		PERL_MODULE	"Build PERL module" on \
-		PYTHON_MODULE	"Build PYTHON bindings" off \
-		RUBY_MODULE	"Build RUBY bindings" off
+OPTIONS_DEFINE=	DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
+OPTIONS_DEFAULT=	MMAP PERL_MODULE
+DEJAVU_DESC=		Use DejaVu fonts (requires X11)
+JSON_DESC=		Support of json export
+MMAP_DESC=		Use mmap in rrd_update
+PERL_MODULE_DESC=	Build PERL module
+PYTHON_MODULE_DESC=	Build PYTHON bindings
+RUBY_MODULE_DESC=	Build RUBY bindings
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON_MODULE)
+.if ${PORT_OPTIONS:MPYTHON_MODULE}
 USE_PYTHON=	yes
 INSTALLS_EGGINFO=yes
 PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info
@@ -59,7 +57,7 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_RUBY_MODULE)
+.if ${PORT_OPTIONS:MRUBY_MODULE}
 USE_RUBY=	yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 PLIST_SUB+=	WITH_RUBY=""
@@ -69,7 +67,7 @@ CONFIGURE_ARGS+=	--disable-ruby
 PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
-.if !defined(WITHOUT_PERL_MODULE)
+.if ${PORT_OPTIONS:MPERL_MODULE}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
@@ -78,15 +76,15 @@ CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if defined(WITHOUT_MMAP)
+.if ! ${PORT_OPTIONS:MMMAP}
 CONFIGURE_ARGS+=	--disable-mmap
 .endif
 
-.if defined(WITH_JSON)
+.if ${PORT_OPTIONS:MJSON}
 EXTRA_PATCHES+=		${FILESDIR}/thirdparty-json.diff
 .endif
 
-.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || defined(WITH_DEJAVU)
+.if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 .endif
 
@@ -102,26 +100,26 @@ MAN1=		bin_dec_hex.1 cdeftutorial.1 rpntutorial.1 rrd-beginners.1 \
 		rrdresize.1 rrdrestore.1 rrdthreads.1 rrdtool.1 rrdtune.1 \
 		rrdtutorial.1 rrdupdate.1 rrdxport.1
 
-.if !defined(WITHOUT_PERL_MODULE)
+.if ${PORT_OPTIONS:MPERL_MODULE}
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 .endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \
 		-e 's/[[:space:]]install-ihtmlDATA//g' \
 		-e 's/^[[:space:]].*cd .* rrdtool.html index.html/	#/' \
 		${WRKSRC}/doc/Makefile.in
 .endif
-.if defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
 		${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-.if !defined(BATCH) && !defined(NOPORTEXAMPLES)
+.if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "############################################################################"
 	@${ECHO_MSG} "# See ${EXAMPLESDIR} for some demonstration code        #"