--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Nov 08, 2005 at 11:52:38AM +0100, Geert Hendrickx wrote:
> Besides graphics/imlib, I also found graphics/gocr and print/magicfilter to
> build fine without the netpbm dependency.  

Here are patches to option'ize netpbm for those two.  

Not sure whether we want netpbm by default though...  

	Geert

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gocr.diff"

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/graphics/gocr/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	25 Oct 2005 02:06:57 -0000	1.3
+++ Makefile	8 Nov 2005 11:03:24 -0000
@@ -16,5 +16,4 @@
 
 .include "options.mk"
 
-.include "../../graphics/netpbm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: options.mk
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/graphics/gocr/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- options.mk	25 Oct 2005 02:06:57 -0000	1.1
+++ options.mk	8 Nov 2005 11:03:24 -0000
@@ -1,12 +1,13 @@
 # $NetBSD: options.mk,v 1.1 2005/10/25 02:06:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gocr
-PKG_SUPPORTED_OPTIONS=	tk
+PKG_SUPPORTED_OPTIONS=	tk netpbm
+PKG_SUGGESTED_OPTIONS=	netpbm
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mtk)
-DEPENDS+=		tk>=8.4:../../x11/tk
+.  include "../../x11/tk/buildlink3.mk"
 PLIST_SUBST+=		TK=""
 
 post-install:
@@ -14,3 +15,7 @@
 .else
 PLIST_SUBST+=		TK="@comment "
 .endif
+
+.if !empty(PKG_OPTIONS:Mnetpbm)
+.  include "../../graphics/netpbm/buildlink3.mk"
+.endif

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="magicfilter.diff"

--- /dev/null	2005-11-08 12:08:23.000000000 +0100
+++ options.mk	2005-11-08 12:07:15.000000000 +0100
@@ -0,0 +1,11 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.magicfilter
+PKG_SUPPORTED_OPTIONS=	netpbm
+PKG_SUGGESTED_OPTIONS=	netpbm
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mnetpbm)
+.  include "../../graphics/netpbm/buildlink3.mk"
+.endif

--envbJBWh7q8WU6mo--