Fri Feb 19 14:09:58 2010 UTC ()
Add "gd" and "pdf" options, default on. PR pkg/34757


(asau)
diff -r1.48 -r1.49 pkgsrc/graphics/gnuplot/Makefile
diff -r1.17 -r1.18 pkgsrc/graphics/gnuplot/Makefile.common
diff -r0 -r1.1 pkgsrc/graphics/gnuplot/options.mk
cvs diff -r1.48 -r1.49 pkgsrc/graphics/gnuplot/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/Makefile 2010/01/18 09:59:01 1.48
+++ pkgsrc/graphics/gnuplot/Makefile 2010/02/19 14:09:58 1.49
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: Makefile,v 1.48 2010/01/18 09:59:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.49 2010/02/19 14:09:58 asau Exp $
2 2
3CATEGORIES+= x11 3CATEGORIES+= x11
4PKGREVISION= 1 4PKGREVISION= 1
5 5
6CONFLICTS+= gnuplot-nox11-[0-9]* 6CONFLICTS+= gnuplot-nox11-[0-9]*
7 7
8.include "../../graphics/gnuplot/Makefile.common" 8.include "../../graphics/gnuplot/Makefile.common"
 9.include "../../graphics/gnuplot/options.mk"
9 10
10.include "../../graphics/plotutils/buildlink3.mk" 11.include "../../graphics/plotutils/buildlink3.mk"
11.include "../../x11/libXaw/buildlink3.mk" 12.include "../../x11/libXaw/buildlink3.mk"
12.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/graphics/gnuplot/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/Attic/Makefile.common 2009/10/27 20:48:07 1.17
+++ pkgsrc/graphics/gnuplot/Attic/Makefile.common 2010/02/19 14:09:58 1.18
@@ -1,42 +1,38 @@ @@ -1,42 +1,38 @@
1# $NetBSD: Makefile.common,v 1.17 2009/10/27 20:48:07 asau Exp $ 1# $NetBSD: Makefile.common,v 1.18 2010/02/19 14:09:58 asau Exp $
2 2
3# used by ../../graphics/gnuplot-nox11 3# used by ../../graphics/gnuplot-nox11
4 4
5DISTNAME= gnuplot-4.2.6 5DISTNAME= gnuplot-4.2.6
6CATEGORIES+= graphics 6CATEGORIES+= graphics
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gnuplot.sourceforge.net/ 10HOMEPAGE= http://gnuplot.sourceforge.net/
11COMMENT= Portable interactive, function plotting utility 11COMMENT= Portable interactive, function plotting utility
12 12
13PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches 13PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches
14DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../graphics/gnuplot/distinfo
15 15
16PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
20 20
21USE_TOOLS+= makeinfo 21USE_TOOLS+= makeinfo
22INFO_FILES= # PLIST 22INFO_FILES= # PLIST
23 23
24CONFIGURE_ARGS+= --with-pdf 
25CONFIGURE_ARGS+= --enable-history-file 24CONFIGURE_ARGS+= --enable-history-file
26CONFIGURE_ARGS+= --with-plot=${PREFIX:Q} 25CONFIGURE_ARGS+= --with-plot=${PREFIX:Q}
27CONFIGURE_ARGS+= --without-lisp-files 26CONFIGURE_ARGS+= --without-lisp-files
28CONFIGURE_ARGS+= --without-tutorial 27CONFIGURE_ARGS+= --without-tutorial
29 28
30# Use BSD editline wherever possible: 29# Use BSD editline wherever possible:
31.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
32 31
33.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" 32.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
34CONFIGURE_ARGS+= --with-readline=bsd 33CONFIGURE_ARGS+= --with-readline=bsd
35.include "../../mk/curses.buildlink3.mk" 34.include "../../mk/curses.buildlink3.mk"
36.else 35.else
37CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 36CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
38.include "../../devel/readline/buildlink3.mk" 37.include "../../devel/readline/buildlink3.mk"
39.endif 38.endif
40 
41.include "../../graphics/gd/buildlink3.mk" 
42.include "../../print/pdflib/buildlink3.mk" 
File Added: pkgsrc/graphics/gnuplot/options.mk
# $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