Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Mar 2013 14:35:22 -0700 (PDT)
From:      William Grzybowski <william88@gmail.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/176895: [PATCH] databases/rrdtool: options ng and trim makefile header
Message-ID:  <513f9f9a.e24cec0a.6c59.1898@mx.google.com>
Resent-Message-ID: <201303122150.r2CLo0pN087469@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         176895
>Category:       ports
>Synopsis:       [PATCH] databases/rrdtool: options ng and trim makefile header
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 12 21:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     William Grzybowski
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
>Description:

	Convert to Options NG
	Trim makefile header
	Redports: https://www.redports.org/buildarchive/20130312140600-36547/


>How-To-Repeat:
>Fix:

	See attached patch


--- rrdtool.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 313972)
+++ Makefile	(working copy)
@@ -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,16 @@
 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 PYTHON RUBY
+OPTIONS_DEFAULT=	MMAP PERL
+
+DEJAVU_DESC=	Use DejaVu fonts (requires X11)
+MMAP_DESC=	Use mmap in rrd_update
+
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYTHON_MODULE)
+.if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
 INSTALLS_EGGINFO=yes
 PYDISTUTILS_EGGINFO=py_rrdtool-0.2.1-${PYTHON_VERSION:S/thon//}.egg-info
@@ -59,7 +55,7 @@
 PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
-.if defined(WITH_RUBY_MODULE)
+.if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
 .include "${PORTSDIR}/Mk/bsd.ruby.mk"
 PLIST_SUB+=	WITH_RUBY=""
@@ -69,7 +65,7 @@
 PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
-.if !defined(WITHOUT_PERL_MODULE)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
@@ -78,15 +74,15 @@
 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
 
--- rrdtool.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?513f9f9a.e24cec0a.6c59.1898>