PLIST fix; svg now is an option

4 files changed, 30 insertions, 21 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 1a6805ad108..2417446dbc3 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/02 23:12:52 abs Exp $
+# $NetBSD: Makefile,v 1.5 2009/02/03 06:21:40 adam Exp $
 
 DISTNAME=	gegl-0.0.22
 PKGREVISION=	2
@@ -16,16 +16,19 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_path_ASCIIDOC=no
+CONFIGURE_ENV+=		ac_cv_path_ENSCRIPT=no
 CONFIGURE_ENV+=		ac_cv_path_SDL_CONFIG=no
+CONFIGURE_ENV+=		ac_cv_prog_RUBY=no
 
 PKGCONFIG_OVERRIDE+=	gegl.pc.in
 
+.include "options.mk"
+
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-#.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/graphics/gegl/PLIST b/graphics/gegl/PLIST
index 4e99a2656c9..45f8b682b0e 100644
--- a/graphics/gegl/PLIST
+++ b/graphics/gegl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/02/02 23:12:53 abs Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/02/03 06:21:40 adam Exp $
 bin/gegl
 include/gegl-0.0/gegl-buffer.h
 include/gegl-0.0/gegl-chant.h
@@ -99,7 +99,7 @@ lib/gegl-0.0/stress.la
 lib/gegl-0.0/stretch-contrast.la
 lib/gegl-0.0/subtract.la
 lib/gegl-0.0/svg-huerotate.la
-lib/gegl-0.0/svg-load.la
+${PLIST.svg}lib/gegl-0.0/svg-load.la
 lib/gegl-0.0/svg-luminancetoalpha.la
 lib/gegl-0.0/svg-matrix.la
 lib/gegl-0.0/svg-multiply.la
@@ -114,22 +114,8 @@ lib/gegl-0.0/write-buffer.la
 lib/gegl-0.0/xor.la
 lib/libgegl-0.0.la
 lib/pkgconfig/gegl.pc
-share/gtk-doc/html/gegl/brightness-contrast.c.html
-share/gtk-doc/html/gegl/gegl-operation-area-filter.h.html
-share/gtk-doc/html/gegl/gegl-operation-composer.h.html
-share/gtk-doc/html/gegl/gegl-operation-filter.h.html
-share/gtk-doc/html/gegl/gegl-operation-meta.h.html
-share/gtk-doc/html/gegl/gegl-operation-point-composer.h.html
-share/gtk-doc/html/gegl/gegl-operation-point-filter.h.html
-share/gtk-doc/html/gegl/gegl-operation-point-render.h.html
-share/gtk-doc/html/gegl/gegl-operation-sink.h.html
-share/gtk-doc/html/gegl/gegl-operation-source.h.html
-share/gtk-doc/html/gegl/gegl-operation-temporal.h.html
-share/gtk-doc/html/gegl/gegl-operation.h.html
-share/gtk-doc/html/gegl/gegl-plugin.h.html
 share/gtk-doc/html/gegl/gegl.css
 share/gtk-doc/html/gegl/gegl.devhelp
-share/gtk-doc/html/gegl/gegl.h.html
 share/gtk-doc/html/gegl/operations.html
 @dirrm share/gtk-doc/html/gegl
 @dirrm lib/gegl-0.0
diff --git a/graphics/gegl/buildlink3.mk b/graphics/gegl/buildlink3.mk
index 3327d849327..03bb5b73334 100644
--- a/graphics/gegl/buildlink3.mk
+++ b/graphics/gegl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/10/16 21:53:57 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/02/03 06:21:40 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEGL_BUILDLINK3_MK:=	${GEGL_BUILDLINK3_MK}+
@@ -16,9 +16,15 @@ BUILDLINK_API_DEPENDS.gegl+=	gegl>=0.0.20
 BUILDLINK_PKGSRCDIR.gegl?=	../../graphics/gegl
 .endif	# GEGL_BUILDLINK3_MK
 
+pkgbase := gegl
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.gegl:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+.endif
+
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gegl/options.mk b/graphics/gegl/options.mk
new file mode 100644
index 00000000000..0dedff08c28
--- /dev/null
+++ b/graphics/gegl/options.mk
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2009/02/03 06:21:40 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gegl
+PKG_SUPPORTED_OPTIONS=	svg
+PKG_SUGGESTED_OPTIONS=	svg
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	svg
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+PLIST.svg=	yes
+.endif