Wed Apr 3 06:02:29 2019 UTC ()
gimp: svg support is not optional any longer.

Bump PKGREVISION.

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


(wiz)
diff -r1.304 -r1.305 pkgsrc/graphics/gimp/Makefile
diff -r1.64 -r1.65 pkgsrc/graphics/gimp/PLIST
diff -r1.65 -r1.66 pkgsrc/graphics/gimp/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/graphics/gimp/options.mk
cvs diff -r1.304 -r1.305 pkgsrc/graphics/gimp/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/Makefile 2019/03/27 11:23:16 1.304
+++ pkgsrc/graphics/gimp/Makefile 2019/04/03 06:02:29 1.305
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.304 2019/03/27 11:23:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.305 2019/04/03 06:02:29 wiz Exp $
2 2
3DISTNAME= gimp-2.10.8 3DISTNAME= gimp-2.10.8
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ 6MASTER_SITES= http://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= https://www.gimp.org/ 10HOMEPAGE= https://www.gimp.org/
11COMMENT= The GNU image manipulation program 11COMMENT= The GNU image manipulation program
12LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3 12LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3
13 13
14BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 14BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
15BUILD_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools 15BUILD_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools
16DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking 16DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking
17CONFLICTS+= gimp<=1.2.3 17CONFLICTS+= gimp<=1.2.3
@@ -65,26 +65,27 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontc @@ -65,26 +65,27 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontc
65BUILDLINK_API_DEPENDS.babl+= babl>=0.1.50 65BUILDLINK_API_DEPENDS.babl+= babl>=0.1.50
66.include "../../graphics/babl/buildlink3.mk" 66.include "../../graphics/babl/buildlink3.mk"
67BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.2 67BUILDLINK_API_DEPENDS.gegl+= gegl>=0.4.2
68.include "../../graphics/gegl/buildlink3.mk" 68.include "../../graphics/gegl/buildlink3.mk"
69.include "../../mk/jpeg.buildlink3.mk" 69.include "../../mk/jpeg.buildlink3.mk"
70.include "../../graphics/gexiv2/buildlink3.mk" 70.include "../../graphics/gexiv2/buildlink3.mk"
71.include "../../graphics/jasper/buildlink3.mk" 71.include "../../graphics/jasper/buildlink3.mk"
72.include "../../graphics/lcms2/buildlink3.mk" 72.include "../../graphics/lcms2/buildlink3.mk"
73.include "../../graphics/libart/buildlink3.mk" 73.include "../../graphics/libart/buildlink3.mk"
74.include "../../graphics/libexif/buildlink3.mk" 74.include "../../graphics/libexif/buildlink3.mk"
75.include "../../graphics/libmypaint/buildlink3.mk" 75.include "../../graphics/libmypaint/buildlink3.mk"
76.include "../../graphics/mypaint-brushes/buildlink3.mk" 76.include "../../graphics/mypaint-brushes/buildlink3.mk"
77.include "../../graphics/png/buildlink3.mk" 77.include "../../graphics/png/buildlink3.mk"
 78.include "../../graphics/librsvg/buildlink3.mk"
78.include "../../graphics/tiff/buildlink3.mk" 79.include "../../graphics/tiff/buildlink3.mk"
79.include "../../graphics/libwmf/buildlink3.mk" 80.include "../../graphics/libwmf/buildlink3.mk"
80.include "../../print/poppler-data/buildlink3.mk" 81.include "../../print/poppler-data/buildlink3.mk"
81.include "../../print/poppler-glib/buildlink3.mk" 82.include "../../print/poppler-glib/buildlink3.mk"
82.include "../../x11/gtk2/buildlink3.mk" 83.include "../../x11/gtk2/buildlink3.mk"
83.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) 84.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
84PLIST.remote= yes 85PLIST.remote= yes
85.include "../../x11/libICE/buildlink3.mk" 86.include "../../x11/libICE/buildlink3.mk"
86.include "../../x11/libSM/buildlink3.mk" 87.include "../../x11/libSM/buildlink3.mk"
87.include "../../x11/libXmu/buildlink3.mk" 88.include "../../x11/libXmu/buildlink3.mk"
88.include "../../x11/libXpm/buildlink3.mk" 89.include "../../x11/libXpm/buildlink3.mk"
89.else 90.else
90CONFIGURE_ARGS+= --without-xmc 91CONFIGURE_ARGS+= --without-xmc
cvs diff -r1.64 -r1.65 pkgsrc/graphics/gimp/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/PLIST 2018/11/22 13:02:21 1.64
+++ pkgsrc/graphics/gimp/PLIST 2019/04/03 06:02:29 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.64 2018/11/22 13:02:21 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.65 2019/04/03 06:02:29 wiz Exp $
2bin/gimp 2bin/gimp
3bin/gimp-2.10 3bin/gimp-2.10
4bin/gimp-console 4bin/gimp-console
5bin/gimp-console-2.10 5bin/gimp-console-2.10
6bin/gimp-test-clipboard-2.0 6bin/gimp-test-clipboard-2.0
7bin/gimptool-2.0 7bin/gimptool-2.0
8include/gimp-2.0/libgimp/gimp.h 8include/gimp-2.0/libgimp/gimp.h
9include/gimp-2.0/libgimp/gimp_pdb.h 9include/gimp-2.0/libgimp/gimp_pdb.h
10include/gimp-2.0/libgimp/gimp_pdb_headers.h 10include/gimp-2.0/libgimp/gimp_pdb_headers.h
11include/gimp-2.0/libgimp/gimpaspectpreview.h 11include/gimp-2.0/libgimp/gimpaspectpreview.h
12include/gimp-2.0/libgimp/gimpbrush_pdb.h 12include/gimp-2.0/libgimp/gimpbrush_pdb.h
13include/gimp-2.0/libgimp/gimpbrushes.h 13include/gimp-2.0/libgimp/gimpbrushes.h
14include/gimp-2.0/libgimp/gimpbrushes_pdb.h 14include/gimp-2.0/libgimp/gimpbrushes_pdb.h
@@ -301,27 +301,27 @@ lib/gimp/2.0/plug-ins/file-pat/file-pat @@ -301,27 +301,27 @@ lib/gimp/2.0/plug-ins/file-pat/file-pat
301lib/gimp/2.0/plug-ins/file-pcx/file-pcx 301lib/gimp/2.0/plug-ins/file-pcx/file-pcx
302lib/gimp/2.0/plug-ins/file-pdf-load/file-pdf-load 302lib/gimp/2.0/plug-ins/file-pdf-load/file-pdf-load
303lib/gimp/2.0/plug-ins/file-pdf-save/file-pdf-save 303lib/gimp/2.0/plug-ins/file-pdf-save/file-pdf-save
304lib/gimp/2.0/plug-ins/file-pix/file-pix 304lib/gimp/2.0/plug-ins/file-pix/file-pix
305lib/gimp/2.0/plug-ins/file-png/file-png 305lib/gimp/2.0/plug-ins/file-png/file-png
306lib/gimp/2.0/plug-ins/file-pnm/file-pnm 306lib/gimp/2.0/plug-ins/file-pnm/file-pnm
307lib/gimp/2.0/plug-ins/file-psd/file-psd 307lib/gimp/2.0/plug-ins/file-psd/file-psd
308lib/gimp/2.0/plug-ins/file-psp/file-psp 308lib/gimp/2.0/plug-ins/file-psp/file-psp
309lib/gimp/2.0/plug-ins/file-raw-data/file-raw-data 309lib/gimp/2.0/plug-ins/file-raw-data/file-raw-data
310lib/gimp/2.0/plug-ins/file-raw-placeholder/file-raw-placeholder 310lib/gimp/2.0/plug-ins/file-raw-placeholder/file-raw-placeholder
311lib/gimp/2.0/plug-ins/file-rawtherapee/file-rawtherapee 311lib/gimp/2.0/plug-ins/file-rawtherapee/file-rawtherapee
312lib/gimp/2.0/plug-ins/file-sgi/file-sgi 312lib/gimp/2.0/plug-ins/file-sgi/file-sgi
313lib/gimp/2.0/plug-ins/file-sunras/file-sunras 313lib/gimp/2.0/plug-ins/file-sunras/file-sunras
314${PLIST.svg}lib/gimp/2.0/plug-ins/file-svg/file-svg 314lib/gimp/2.0/plug-ins/file-svg/file-svg
315lib/gimp/2.0/plug-ins/file-tga/file-tga 315lib/gimp/2.0/plug-ins/file-tga/file-tga
316lib/gimp/2.0/plug-ins/file-tiff/file-tiff 316lib/gimp/2.0/plug-ins/file-tiff/file-tiff
317lib/gimp/2.0/plug-ins/file-wmf/file-wmf 317lib/gimp/2.0/plug-ins/file-wmf/file-wmf
318lib/gimp/2.0/plug-ins/file-xbm/file-xbm 318lib/gimp/2.0/plug-ins/file-xbm/file-xbm
319${PLIST.remote}lib/gimp/2.0/plug-ins/file-xmc/file-xmc 319${PLIST.remote}lib/gimp/2.0/plug-ins/file-xmc/file-xmc
320${PLIST.remote}lib/gimp/2.0/plug-ins/file-xpm/file-xpm 320${PLIST.remote}lib/gimp/2.0/plug-ins/file-xpm/file-xpm
321lib/gimp/2.0/plug-ins/file-xwd/file-xwd 321lib/gimp/2.0/plug-ins/file-xwd/file-xwd
322lib/gimp/2.0/plug-ins/film/film 322lib/gimp/2.0/plug-ins/film/film
323lib/gimp/2.0/plug-ins/filter-pack/filter-pack 323lib/gimp/2.0/plug-ins/filter-pack/filter-pack
324lib/gimp/2.0/plug-ins/flame/flame 324lib/gimp/2.0/plug-ins/flame/flame
325lib/gimp/2.0/plug-ins/fractal-explorer/fractal-explorer 325lib/gimp/2.0/plug-ins/fractal-explorer/fractal-explorer
326lib/gimp/2.0/plug-ins/fractal-trace/fractal-trace 326lib/gimp/2.0/plug-ins/fractal-trace/fractal-trace
327lib/gimp/2.0/plug-ins/gfig/gfig 327lib/gimp/2.0/plug-ins/gfig/gfig
cvs diff -r1.65 -r1.66 pkgsrc/graphics/gimp/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/buildlink3.mk 2018/11/14 22:21:38 1.65
+++ pkgsrc/graphics/gimp/buildlink3.mk 2019/04/03 06:02:29 1.66
@@ -1,38 +1,35 @@ @@ -1,38 +1,35 @@
1# $NetBSD: buildlink3.mk,v 1.65 2018/11/14 22:21:38 kleink Exp $ 1# $NetBSD: buildlink3.mk,v 1.66 2019/04/03 06:02:29 wiz Exp $
2 2
3BUILDLINK_TREE+= gimp 3BUILDLINK_TREE+= gimp
4 4
5.if !defined(GIMP_BUILDLINK3_MK) 5.if !defined(GIMP_BUILDLINK3_MK)
6GIMP_BUILDLINK3_MK:= 6GIMP_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0 8BUILDLINK_API_DEPENDS.gimp+= gimp>=2.4.0
9BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.10.6nb4 9BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.10.6nb4
10BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp 10BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp
11 11
12pkgbase := gimp 12pkgbase := gimp
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.gimp:Maalib) 15.if !empty(PKG_BUILD_OPTIONS.gimp:Maalib)
16.include "../../graphics/aalib/buildlink3.mk" 16.include "../../graphics/aalib/buildlink3.mk"
17.endif 17.endif
18 18
19.if !empty(PKG_BUILD_OPTIONS.gimp:Mmng) 19.if !empty(PKG_BUILD_OPTIONS.gimp:Mmng)
20.include "../../graphics/mng/buildlink3.mk" 20.include "../../graphics/mng/buildlink3.mk"
21.endif 21.endif
22 22
23.if !empty(PKG_BUILD_OPTIONS.gimp:Msvg) 
24.include "../../graphics/librsvg/buildlink3.mk" 
25.endif 
26 
27.include "../../devel/gettext-lib/buildlink3.mk" 23.include "../../devel/gettext-lib/buildlink3.mk"
28.include "../../fonts/fontconfig/buildlink3.mk" 24.include "../../fonts/fontconfig/buildlink3.mk"
29.include "../../graphics/gegl/buildlink3.mk" 25.include "../../graphics/gegl/buildlink3.mk"
30.include "../../graphics/gexiv2/buildlink3.mk" 26.include "../../graphics/gexiv2/buildlink3.mk"
31.include "../../graphics/lcms2/buildlink3.mk" 27.include "../../graphics/lcms2/buildlink3.mk"
32.include "../../graphics/libart/buildlink3.mk" 28.include "../../graphics/libart/buildlink3.mk"
 29.include "../../graphics/librsvg/buildlink3.mk"
33.include "../../graphics/png/buildlink3.mk" 30.include "../../graphics/png/buildlink3.mk"
34.include "../../graphics/libwmf/buildlink3.mk" 31.include "../../graphics/libwmf/buildlink3.mk"
35.include "../../x11/gtk2/buildlink3.mk" 32.include "../../x11/gtk2/buildlink3.mk"
36.endif # GIMP_BUILDLINK3_MK 33.endif # GIMP_BUILDLINK3_MK
37 34
38BUILDLINK_TREE+= -gimp 35BUILDLINK_TREE+= -gimp
cvs diff -r1.8 -r1.9 pkgsrc/graphics/gimp/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/options.mk 2018/09/04 08:26:58 1.8
+++ pkgsrc/graphics/gimp/options.mk 2019/04/03 06:02:29 1.9
@@ -1,24 +1,19 @@ @@ -1,24 +1,19 @@
1# $NetBSD: options.mk,v 1.8 2018/09/04 08:26:58 wiz Exp $ 1# $NetBSD: options.mk,v 1.9 2019/04/03 06:02:29 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gimp 3PKG_OPTIONS_VAR= PKG_OPTIONS.gimp
4PKG_SUPPORTED_OPTIONS= aalib mng svg 4PKG_SUPPORTED_OPTIONS= aalib mng
5PKG_SUGGESTED_OPTIONS= mng svg 5PKG_SUGGESTED_OPTIONS= mng
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= aalib mng svg 9PLIST_VARS+= aalib mng
10 10
11.if !empty(PKG_OPTIONS:Maalib) 11.if !empty(PKG_OPTIONS:Maalib)
12.include "../../graphics/aalib/buildlink3.mk" 12.include "../../graphics/aalib/buildlink3.mk"
13PLIST.aalib= yes 13PLIST.aalib= yes
14.endif 14.endif
15 15
16.if !empty(PKG_OPTIONS:Mmng) 16.if !empty(PKG_OPTIONS:Mmng)
17.include "../../graphics/mng/buildlink3.mk" 17.include "../../graphics/mng/buildlink3.mk"
18PLIST.mng= yes 18PLIST.mng= yes
19.endif 19.endif
20 
21.if !empty(PKG_OPTIONS:Msvg) 
22.include "../../graphics/librsvg/buildlink3.mk" 
23PLIST.svg= yes 
24.endif