Sun May 17 05:06:02 2009 UTC ()
Add workaround to fix build failure with gnome option
(gnome-panel>=2.25.3, libpanel-applet doesn't depend on libgnomeui anymore),

Fixes PR 41071.


(obache)
diff -r1.15 -r1.16 pkgsrc/inputmethod/uim/options.mk
cvs diff -r1.15 -r1.16 pkgsrc/inputmethod/uim/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/options.mk 2009/01/23 13:40:32 1.15
+++ pkgsrc/inputmethod/uim/options.mk 2009/05/17 05:06:02 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.15 2009/01/23 13:40:32 obache Exp $ 1# $NetBSD: options.mk,v 1.16 2009/05/17 05:06:02 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.uim 3PKG_OPTIONS_VAR= PKG_OPTIONS.uim
4#PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime sj3 uim-fep wnn xim 4#PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime sj3 uim-fep wnn xim
5PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime uim-fep xim 5PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime uim-fep xim
6PKG_SUGGESTED_OPTIONS= anthy canna gtk uim-fep xim 6PKG_SUGGESTED_OPTIONS= anthy canna gtk uim-fep xim
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= helperdata uim-dict-gtk fep 10PLIST_VARS+= helperdata uim-dict-gtk fep
11PLIST_VARS+= anthy canna gnome gtk kde m17nlib prime qt sj3 wnn xim 11PLIST_VARS+= anthy canna gnome gtk kde m17nlib prime qt sj3 wnn xim
12 12
13.if !empty(PKG_OPTIONS:Mxim) 13.if !empty(PKG_OPTIONS:Mxim)
14.include "../../x11/libX11/buildlink3.mk" 14.include "../../x11/libX11/buildlink3.mk"
@@ -47,26 +47,29 @@ CONFIGURE_ARGS+= --without-anthy @@ -47,26 +47,29 @@ CONFIGURE_ARGS+= --without-anthy
47.if !empty(PKG_OPTIONS:Mcanna) 47.if !empty(PKG_OPTIONS:Mcanna)
48. include "../../inputmethod/canna-lib/buildlink3.mk" 48. include "../../inputmethod/canna-lib/buildlink3.mk"
49CONFIGURE_ARGS+= --with-canna 49CONFIGURE_ARGS+= --with-canna
50PLIST.canna= yes 50PLIST.canna= yes
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Meb) 53.if !empty(PKG_OPTIONS:Meb)
54.include "../../textproc/eb/buildlink3.mk" 54.include "../../textproc/eb/buildlink3.mk"
55CONFIGURE_ARGS+= --with-eb 55CONFIGURE_ARGS+= --with-eb
56.endif 56.endif
57 57
58.if !empty(PKG_OPTIONS:Mgnome) 58.if !empty(PKG_OPTIONS:Mgnome)
59. include "../../x11/gnome-panel/buildlink3.mk" 59. include "../../x11/gnome-panel/buildlink3.mk"
 60. include "../../devel/libgnomeui/buildlink3.mk"
 61CFLAGS+= -I$(BUILDLINK_PREFIX.libgnomeui)/include/libgnomeui-2.0
 62BUILDLINK_TRANSFORM+= l:panel-applet-2:panel-applet-2:gnomeui-2
60PLIST.gnome= yes 63PLIST.gnome= yes
61.else 64.else
62CONFIGURE_ARGS+= --disable-gnome-applet 65CONFIGURE_ARGS+= --disable-gnome-applet
63.endif 66.endif
64 67
65.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) 68.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
66GTK2_IMMODULES= YES 69GTK2_IMMODULES= YES
67.include "../../x11/gtk2/modules.mk" 70.include "../../x11/gtk2/modules.mk"
68PLIST.gtk= yes 71PLIST.gtk= yes
69.else 72.else
70CONFIGURE_ARGS+= --without-gtk2 73CONFIGURE_ARGS+= --without-gtk2
71.endif 74.endif
72 75