Wed Sep 15 20:59:50 2010 UTC ()
kill the "gnome" option which is of no effect now


(drochner)
diff -r1.32 -r1.33 pkgsrc/graphics/gimp/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/graphics/gimp/options.mk
cvs diff -r1.32 -r1.33 pkgsrc/graphics/gimp/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/buildlink3.mk 2010/09/14 11:01:04 1.32
+++ pkgsrc/graphics/gimp/buildlink3.mk 2010/09/15 20:59:50 1.33
@@ -1,35 +1,31 @@ @@ -1,35 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.32 2010/09/14 11:01:04 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.33 2010/09/15 20:59:50 drochner 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.6.10nb1 9BUILDLINK_ABI_DEPENDS.gimp+= gimp>=2.6.10nb1
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:Mgnome) 
20.include "../../www/libgtkhtml/buildlink3.mk" 
21.endif 
22 
23.if !empty(PKG_BUILD_OPTIONS.gimp:Mmng) 19.if !empty(PKG_BUILD_OPTIONS.gimp:Mmng)
24.include "../../graphics/mng/buildlink3.mk" 20.include "../../graphics/mng/buildlink3.mk"
25.endif 21.endif
26 22
27.if !empty(PKG_BUILD_OPTIONS.gimp:Msvg) 23.if !empty(PKG_BUILD_OPTIONS.gimp:Msvg)
28.include "../../graphics/librsvg/buildlink3.mk" 24.include "../../graphics/librsvg/buildlink3.mk"
29.endif 25.endif
30 26
31.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
32.include "../../fonts/fontconfig/buildlink3.mk" 28.include "../../fonts/fontconfig/buildlink3.mk"
33.include "../../graphics/lcms/buildlink3.mk" 29.include "../../graphics/lcms/buildlink3.mk"
34.include "../../graphics/libart/buildlink3.mk" 30.include "../../graphics/libart/buildlink3.mk"
35.include "../../graphics/png/buildlink3.mk" 31.include "../../graphics/png/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/gimp/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/options.mk 2008/04/12 22:43:01 1.3
+++ pkgsrc/graphics/gimp/options.mk 2010/09/15 20:59:50 1.4
@@ -1,29 +1,24 @@ @@ -1,29 +1,24 @@
1# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $ 1# $NetBSD: options.mk,v 1.4 2010/09/15 20:59:50 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gimp 3PKG_OPTIONS_VAR= PKG_OPTIONS.gimp
4PKG_SUPPORTED_OPTIONS= aalib gnome mng svg 4PKG_SUPPORTED_OPTIONS= aalib mng svg
5PKG_SUGGESTED_OPTIONS= aalib gnome mng svg 5PKG_SUGGESTED_OPTIONS= aalib mng svg
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= aalib gnome mng svg 9PLIST_VARS+= aalib mng svg
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:Mgnome) 
17.include "../../www/libgtkhtml/buildlink3.mk" 
18PLIST.gnome= yes 
19.endif 
20 
21.if !empty(PKG_OPTIONS:Mmng) 16.if !empty(PKG_OPTIONS:Mmng)
22.include "../../graphics/mng/buildlink3.mk" 17.include "../../graphics/mng/buildlink3.mk"
23PLIST.mng= yes 18PLIST.mng= yes
24.endif 19.endif
25 20
26.if !empty(PKG_OPTIONS:Msvg) 21.if !empty(PKG_OPTIONS:Msvg)
27.include "../../graphics/librsvg/buildlink3.mk" 22.include "../../graphics/librsvg/buildlink3.mk"
28PLIST.svg= yes 23PLIST.svg= yes
29.endif 24.endif