gimp: svg support is not optional any longer.

Bump PKGREVISION.

Investigated by Mayuresh <mayuresh@acm.org> on pkgsrc-users.

4 files changed, 11 insertions, 18 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index a2218e5f70a..27419777f01 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.304 2019/03/27 11:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.305 2019/04/03 06:02:29 wiz Exp $
 
 DISTNAME=	gimp-2.10.8
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
@@ -75,6 +75,7 @@ BUILDLINK_API_DEPENDS.gegl+=		gegl>=0.4.2
 .include "../../graphics/libmypaint/buildlink3.mk"
 .include "../../graphics/mypaint-brushes/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index e688198c2be..968160103e8 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.64 2018/11/22 13:02:21 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.65 2019/04/03 06:02:29 wiz Exp $
 bin/gimp
 bin/gimp-2.10
 bin/gimp-console
@@ -311,7 +311,7 @@ lib/gimp/2.0/plug-ins/file-raw-placeholder/file-raw-placeholder
 lib/gimp/2.0/plug-ins/file-rawtherapee/file-rawtherapee
 lib/gimp/2.0/plug-ins/file-sgi/file-sgi
 lib/gimp/2.0/plug-ins/file-sunras/file-sunras
-${PLIST.svg}lib/gimp/2.0/plug-ins/file-svg/file-svg
+lib/gimp/2.0/plug-ins/file-svg/file-svg
 lib/gimp/2.0/plug-ins/file-tga/file-tga
 lib/gimp/2.0/plug-ins/file-tiff/file-tiff
 lib/gimp/2.0/plug-ins/file-wmf/file-wmf
diff --git a/graphics/gimp/buildlink3.mk b/graphics/gimp/buildlink3.mk
index 1b747e74866..a4dbb8bf618 100644
--- a/graphics/gimp/buildlink3.mk
+++ b/graphics/gimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.65 2018/11/14 22:21:38 kleink Exp $
+# $NetBSD: buildlink3.mk,v 1.66 2019/04/03 06:02:29 wiz Exp $
 
 BUILDLINK_TREE+=	gimp
 
@@ -20,16 +20,13 @@ pkgbase := gimp
 .include "../../graphics/mng/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gimp:Msvg)
-.include "../../graphics/librsvg/buildlink3.mk"
-.endif
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/gexiv2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimp/options.mk b/graphics/gimp/options.mk
index bc22c81b75a..9575afbd01f 100644
--- a/graphics/gimp/options.mk
+++ b/graphics/gimp/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.8 2018/09/04 08:26:58 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2019/04/03 06:02:29 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp
-PKG_SUPPORTED_OPTIONS=	aalib mng svg
-PKG_SUGGESTED_OPTIONS=	mng svg
+PKG_SUPPORTED_OPTIONS=	aalib mng
+PKG_SUGGESTED_OPTIONS=	mng
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		aalib mng svg
+PLIST_VARS+=		aalib mng
 
 .if !empty(PKG_OPTIONS:Maalib)
 .include "../../graphics/aalib/buildlink3.mk"
@@ -17,8 +17,3 @@ PLIST.aalib=		yes
 .include "../../graphics/mng/buildlink3.mk"
 PLIST.mng=		yes
 .endif
-
-.if !empty(PKG_OPTIONS:Msvg)
-.include "../../graphics/librsvg/buildlink3.mk"
-PLIST.svg=		yes
-.endif