>Number:         34757
>Category:       pkg
>Synopsis:       add pkg-options to gnuplot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Sun Oct 08 13:45:00 +0000 2006
>Originator:     pancake
>Release:        Linux 2.6.15bare
>Organization:
	
>Environment:
	
	
System: Linux bare 2.6.15bare #7 PREEMPT Tue Mar 14 14:34:34 CET 2006 i686 GNU/Linux
Architecture: unknown
Machine: i686
>Description:
This patch adds build options support for graphics/gnuplot.
It makes pdf and gd optionals. With default 'gd'.
	
>How-To-Repeat:
	
>Fix:
	

options.mk:

# $NetBSD$
PKG_OPTIONS_VAR=PKG_OPTIONS.gnuplot
PKG_SUGGESTED_OPTIONS=gd
PKG_SUPPORTED_OPTIONS=pdf gd

.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


--
The patch:



Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gnuplot/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile	17 Apr 2006 13:46:32 -0000	1.35
+++ Makefile	8 Oct 2006 11:38:30 -0000
@@ -9,6 +9,7 @@
 
 
 .include "../../graphics/gnuplot/Makefile.common"
+.include "../../graphics/gnuplot/options.mk"
 
 .include "../../graphics/plotutils/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gnuplot/Makefile.common,v
retrieving revision 1.8
diff -u -r1.8 Makefile.common
--- Makefile.common	4 Apr 2006 14:45:44 -0000	1.8
+++ Makefile.common	8 Oct 2006 11:38:30 -0000
@@ -20,12 +20,9 @@
 USE_TOOLS+=		makeinfo
 INFO_FILES=		# PLIST
 
-CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--enable-history-file
 CONFIGURE_ARGS+=	--with-plot=${PREFIX:Q}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CONFIGURE_ARGS+=	--without-lisp-files
 
 .include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../print/pdflib/buildlink3.mk"

>Unformatted: