[pkgsrc/trunk]: pkgsrc/graphics/gimp options-ify svg and mng; the former pull...

[dogcow <dogcow%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a18e389dc02
branches:  trunk
changeset: 534650:4a18e389dc02
user:      dogcow <dogcow%pkgsrc.org@localhost>
date:      Sun Oct 28 16:43:00 2007 +0000

description:
options-ify svg and mng; the former pulls in a whole lot of gnome
infrastructure, the latter ain't very commonly used.
Both default to being active.

diffstat:

 graphics/gimp/Makefile   |   4 +---
 graphics/gimp/PLIST      |   6 +++---
 graphics/gimp/options.mk |  20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diffs (78 lines):

diff -r 5d7cb9cbcf71 -r 4a18e389dc02 graphics/gimp/Makefile
--- a/graphics/gimp/Makefile    Sun Oct 28 16:42:48 2007 +0000
+++ b/graphics/gimp/Makefile    Sun Oct 28 16:43:00 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2007/10/25 21:06:15 adam Exp $
+# $NetBSD: Makefile,v 1.163 2007/10/28 16:43:00 dogcow Exp $
 
 DISTNAME=      gimp-2.4.0
 CATEGORIES=    graphics
@@ -64,8 +64,6 @@
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
diff -r 5d7cb9cbcf71 -r 4a18e389dc02 graphics/gimp/PLIST
--- a/graphics/gimp/PLIST       Sun Oct 28 16:42:48 2007 +0000
+++ b/graphics/gimp/PLIST       Sun Oct 28 16:43:00 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2007/10/25 21:06:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2007/10/28 16:43:00 dogcow Exp $
 bin/gimp
 bin/gimp-2.4
 bin/gimp-console
@@ -313,7 +313,7 @@
 lib/gimp/2.0/plug-ins/maze
 lib/gimp/2.0/plug-ins/mblur
 lib/gimp/2.0/plug-ins/metadata
-lib/gimp/2.0/plug-ins/mng
+${MNG}lib/gimp/2.0/plug-ins/mng
 lib/gimp/2.0/plug-ins/mosaic
 lib/gimp/2.0/plug-ins/neon
 lib/gimp/2.0/plug-ins/newsprint
@@ -367,7 +367,7 @@
 lib/gimp/2.0/plug-ins/spread
 lib/gimp/2.0/plug-ins/struc
 lib/gimp/2.0/plug-ins/sunras
-lib/gimp/2.0/plug-ins/svg
+${SVG}lib/gimp/2.0/plug-ins/svg
 lib/gimp/2.0/plug-ins/tga
 lib/gimp/2.0/plug-ins/threshold_alpha
 lib/gimp/2.0/plug-ins/tiff-load
diff -r 5d7cb9cbcf71 -r 4a18e389dc02 graphics/gimp/options.mk
--- a/graphics/gimp/options.mk  Sun Oct 28 16:42:48 2007 +0000
+++ b/graphics/gimp/options.mk  Sun Oct 28 16:43:00 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2007/10/25 21:06:17 adam Exp $
+# $NetBSD: options.mk,v 1.2 2007/10/28 16:43:00 dogcow Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gimp
-PKG_SUPPORTED_OPTIONS= aalib gnome
-PKG_SUGGESTED_OPTIONS= aalib gnome
+PKG_SUPPORTED_OPTIONS= aalib gnome mng svg
+PKG_SUGGESTED_OPTIONS= aalib gnome mng svg
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,3 +19,17 @@
 .else
 PLIST_SUBST+=  GNOME="@comment "
 .endif
+
+.if !empty(PKG_OPTIONS:Mmng)
+.include "../../graphics/mng/buildlink3.mk"
+PLIST_SUBST+=  MNG=
+.else
+PLIST_SUBST+=  MNG="@comment "
+.endif
+
+.if !empty(PKG_OPTIONS:Msvg)
+.include "../../graphics/librsvg/buildlink3.mk"
+PLIST_SUBST+=  SVG=
+.else
+PLIST_SUBST+=  SVG="@comment "
+.endif