[pkgsrc/trunk]: pkgsrc/graphics/gnuplot Add "gd" and "pdf" options, default o...

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a86eb02793a
branches:  trunk
changeset: 572017:3a86eb02793a
user:      asau <asau%pkgsrc.org@localhost>
date:      Fri Feb 19 14:09:58 2010 +0000

description:
Add "gd" and "pdf" options, default on. PR pkg/34757

diffstat:

 graphics/gnuplot/Makefile        |   3 ++-
 graphics/gnuplot/Makefile.common |   6 +-----
 graphics/gnuplot/options.mk      |  16 ++++++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 4d45e6ef830a -r 3a86eb02793a graphics/gnuplot/Makefile
--- a/graphics/gnuplot/Makefile Fri Feb 19 14:06:46 2010 +0000
+++ b/graphics/gnuplot/Makefile Fri Feb 19 14:09:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/02/19 14:09:58 asau Exp $
 
 CATEGORIES+=           x11
 PKGREVISION=           1
@@ -6,6 +6,7 @@
 CONFLICTS+=            gnuplot-nox11-[0-9]*
 
 .include "../../graphics/gnuplot/Makefile.common"
+.include "../../graphics/gnuplot/options.mk"
 
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff -r 4d45e6ef830a -r 3a86eb02793a graphics/gnuplot/Makefile.common
--- a/graphics/gnuplot/Makefile.common  Fri Feb 19 14:06:46 2010 +0000
+++ b/graphics/gnuplot/Makefile.common  Fri Feb 19 14:09:58 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2009/10/27 20:48:07 asau Exp $
+# $NetBSD: Makefile.common,v 1.18 2010/02/19 14:09:58 asau Exp $
 
 # used by ../../graphics/gnuplot-nox11
 
@@ -21,7 +21,6 @@
 USE_TOOLS+=            makeinfo
 INFO_FILES=            # PLIST
 
-CONFIGURE_ARGS+=       --with-pdf
 CONFIGURE_ARGS+=       --enable-history-file
 CONFIGURE_ARGS+=       --with-plot=${PREFIX:Q}
 CONFIGURE_ARGS+=       --without-lisp-files
@@ -37,6 +36,3 @@
 CONFIGURE_ARGS+=       --with-readline=${BUILDLINK_PREFIX.readline}
 .include "../../devel/readline/buildlink3.mk"
 .endif
-
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../print/pdflib/buildlink3.mk"
diff -r 4d45e6ef830a -r 3a86eb02793a graphics/gnuplot/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gnuplot/options.mk       Fri Feb 19 14:09:58 2010 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2010/02/19 14:09:58 asau Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnuplot
+PKG_SUPPORTED_OPTIONS= gd pdf
+PKG_SUGGESTED_OPTIONS= gd pdf
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpdf)
+CONFIGURE_ARGS+=        --with-pdf
+.include "../../print/pdflib/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mgd)
+.include "../../graphics/gd/buildlink3.mk"
+.endif