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 (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,115 +1,118 @@ @@ -1,115 +1,118 @@
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"
15.include "../../x11/libXext/buildlink3.mk" 15.include "../../x11/libXext/buildlink3.mk"
16.include "../../x11/xextproto/buildlink3.mk" 16.include "../../x11/xextproto/buildlink3.mk"
17CONFIGURE_ARGS+= --with-x 17CONFIGURE_ARGS+= --with-x
18PLIST.xim= yes 18PLIST.xim= yes
19.else 19.else
20SUBST_CLASSES+= xim 20SUBST_CLASSES+= xim
21SUBST_STAGE.xim= pre-configure 21SUBST_STAGE.xim= pre-configure
22SUBST_FILES.xim= configure 22SUBST_FILES.xim= configure
23SUBST_SED.xim= -e 's;use_xim="yes";use_xim="no";g' 23SUBST_SED.xim= -e 's;use_xim="yes";use_xim="no";g'
24.endif 24.endif
25 25
26.if !empty(PKG_OPTIONS:Muim-fep) 26.if !empty(PKG_OPTIONS:Muim-fep)
27USE_NCURSES= YES # setupterm, clear_screen, clr_eos 27USE_NCURSES= YES # setupterm, clear_screen, clr_eos
28.include "../../devel/ncurses/buildlink3.mk" 28.include "../../devel/ncurses/buildlink3.mk"
29CONFIGURE_ARGS+= --enable-fep 29CONFIGURE_ARGS+= --enable-fep
30PLIST.fep= yes 30PLIST.fep= yes
31.else 31.else
32CONFIGURE_ARGS+= --disable-fep 32CONFIGURE_ARGS+= --disable-fep
33.endif 33.endif
34 34
35.if !empty(PKG_OPTIONS:Manthy) 35.if !empty(PKG_OPTIONS:Manthy)
36. include "../../inputmethod/anthy/buildlink3.mk" 36. include "../../inputmethod/anthy/buildlink3.mk"
37CONFIGURE_ARGS+= --enable-dict 37CONFIGURE_ARGS+= --enable-dict
38PLIST.anthy= yes 38PLIST.anthy= yes
39. if !empty(PKG_OPTIONS:Mgtk) 39. if !empty(PKG_OPTIONS:Mgtk)
40PLIST.helperdata= yes 40PLIST.helperdata= yes
41PLIST.uim-dict-gtk= yes 41PLIST.uim-dict-gtk= yes
42. endif 42. endif
43.else 43.else
44CONFIGURE_ARGS+= --without-anthy 44CONFIGURE_ARGS+= --without-anthy
45.endif 45.endif
46 46
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
73.if !empty(PKG_OPTIONS:Mkde) 76.if !empty(PKG_OPTIONS:Mkde)
74. include "../../x11/kdelibs3/buildlink3.mk" 77. include "../../x11/kdelibs3/buildlink3.mk"
75. include "../../x11/qt3-libs/buildlink3.mk" 78. include "../../x11/qt3-libs/buildlink3.mk"
76CONFIGURE_ARGS+= --enable-kde-applet 79CONFIGURE_ARGS+= --enable-kde-applet
77PLIST.kde= yes 80PLIST.kde= yes
78.endif 81.endif
79 82
80.if !empty(PKG_OPTIONS:Mm17nlib) 83.if !empty(PKG_OPTIONS:Mm17nlib)
81. include "../../devel/m17n-lib/buildlink3.mk" 84. include "../../devel/m17n-lib/buildlink3.mk"
82PLIST.m17nlib= yes 85PLIST.m17nlib= yes
83.else 86.else
84CONFIGURE_ARGS+= --without-m17nlib 87CONFIGURE_ARGS+= --without-m17nlib
85.endif 88.endif
86 89
87.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) 90.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
88. include "../../x11/qt3-libs/buildlink3.mk" 91. include "../../x11/qt3-libs/buildlink3.mk"
89. include "../../x11/qt3-tools/buildlink3.mk" 92. include "../../x11/qt3-tools/buildlink3.mk"
90CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc 93CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc
91PLIST.helperdata= yes 94PLIST.helperdata= yes
92PLIST.qt= yes 95PLIST.qt= yes
93.endif 96.endif
94 97
95.if !empty(PKG_OPTIONS:Mprime) 98.if !empty(PKG_OPTIONS:Mprime)
96. include "../../inputmethod/prime/buildlink3.mk" 99. include "../../inputmethod/prime/buildlink3.mk"
97CONFIGURE_ARGS+= --with-prime 100CONFIGURE_ARGS+= --with-prime
98PLIST.prime= yes 101PLIST.prime= yes
99.endif 102.endif
100 103
101#.if !empty(PKG_OPTIONS:Msj3) 104#.if !empty(PKG_OPTIONS:Msj3)
102#. include "../../inputmethod/sj3-lib/buildlink3.mk" 105#. include "../../inputmethod/sj3-lib/buildlink3.mk"
103#CONFIGURE_ARGS+= --with-sj3 106#CONFIGURE_ARGS+= --with-sj3
104#CONFIGURE_ARGS+= SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes 107#CONFIGURE_ARGS+= SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes
105#CONFIGURE_ARGS+= SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib" 108#CONFIGURE_ARGS+= SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib"
106#PLIST.sj3= yes 109#PLIST.sj3= yes
107#.endif 110#.endif
108 111
109#.if !empty(PKG_OPTIONS:Mwnn) 112#.if !empty(PKG_OPTIONS:Mwnn)
110#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" 113#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
111#CONFIGURE_ARGS+= --with-wnn 114#CONFIGURE_ARGS+= --with-wnn
112#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn 115#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
113#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib 116#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
114#PLIST.wnn= yes 117#PLIST.wnn= yes
115#.endif 118#.endif