summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorasau <asau@pkgsrc.org>2010-02-19 14:09:58 +0000
committerasau <asau@pkgsrc.org>2010-02-19 14:09:58 +0000
commit907ba7eb28f13058ba176f7cfd1fa6b1611c749b (patch)
treee125d0617f44de931603daa17d70fd436c74603e /graphics
parentb21b797404b571bd39bd970e469864f0658bff07 (diff)
downloadpkgsrc-907ba7eb28f13058ba176f7cfd1fa6b1611c749b.tar.gz
Add "gd" and "pdf" options, default on. PR pkg/34757
Diffstat (limited to 'graphics')
-rw-r--r--graphics/gnuplot/Makefile3
-rw-r--r--graphics/gnuplot/Makefile.common6
-rw-r--r--graphics/gnuplot/options.mk16
3 files changed, 19 insertions, 6 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 2623b152674..04755852da1 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -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 @@ PKGREVISION= 1
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 --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common
index ad443a12857..e68bdc66fba 100644
--- a/graphics/gnuplot/Makefile.common
+++ b/graphics/gnuplot/Makefile.common
@@ -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 @@ GNU_CONFIGURE= YES
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=bsd
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
.include "../../devel/readline/buildlink3.mk"
.endif
-
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../print/pdflib/buildlink3.mk"
diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk
new file mode 100644
index 00000000000..80acb429a9d
--- /dev/null
+++ b/graphics/gnuplot/options.mk
@@ -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