Thu Oct 1 12:30:32 2009 UTC ()
Add workaround for PR 41447.

* Add dependency m17n-contrib for m17nlib option.
  It is required for icons.
* Remove m17-*.png icon files from PLIST and generate/delete symbolic links at
  install/deinstall.

XXX: symbolic links may be broken/missing when update m17n-contrib.
XXX: There is no chance to invoke relink at the time.


(obache)
diff -r0 -r1.1 pkgsrc/inputmethod/uim/DEINSTALL.m17nlib
diff -r0 -r1.1 pkgsrc/inputmethod/uim/INSTALL.m17nlib
diff -r1.11 -r1.12 pkgsrc/inputmethod/uim/PLIST
diff -r1.16 -r1.17 pkgsrc/inputmethod/uim/options.mk
File Added: pkgsrc/inputmethod/uim/Attic/DEINSTALL.m17nlib
# $NetBSD: DEINSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $
case ${STAGE} in
DEINSTALL)
	for icon in ${PREFIX}/share/uim/pixmaps/m17n-*.png ; do
		${TEST} ! -h ${icon} || ${RM} -f ${icon}
	done
	;;
esac
File Added: pkgsrc/inputmethod/uim/Attic/INSTALL.m17nlib
# $NetBSD: INSTALL.m17nlib,v 1.1 2009/10/01 12:30:32 obache Exp $

case ${STAGE} in
POST-INSTALL)
	${TEST} ! -x ${PREFIX}/bin/uim-m17nlib-relink-icons ||
		${PREFIX}/bin/uim-m17nlib-relink-icons
	;;
esac
cvs diff -r1.11 -r1.12 pkgsrc/inputmethod/uim/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/PLIST 2009/06/14 20:19:52 1.11
+++ pkgsrc/inputmethod/uim/PLIST 2009/10/01 12:30:32 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:19:52 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/10/01 12:30:32 obache Exp $
2${PLIST.qt}bin/uim-chardict-qt 2${PLIST.qt}bin/uim-chardict-qt
3${PLIST.uim-dict-gtk}bin/uim-dict-gtk 3${PLIST.uim-dict-gtk}bin/uim-dict-gtk
4${PLIST.fep}bin/uim-fep 4${PLIST.fep}bin/uim-fep
5${PLIST.fep}bin/uim-fep-tick 5${PLIST.fep}bin/uim-fep-tick
6${PLIST.gtk}bin/uim-im-switcher-gtk 6${PLIST.gtk}bin/uim-im-switcher-gtk
7${PLIST.qt}bin/uim-im-switcher-qt 7${PLIST.qt}bin/uim-im-switcher-qt
8${PLIST.gtk}bin/uim-input-pad-ja 8${PLIST.gtk}bin/uim-input-pad-ja
9${PLIST.m17nlib}bin/uim-m17nlib-relink-icons 9${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
10bin/uim-module-manager 10bin/uim-module-manager
11${PLIST.gtk}bin/uim-pref-gtk 11${PLIST.gtk}bin/uim-pref-gtk
12${PLIST.qt}bin/uim-pref-qt 12${PLIST.qt}bin/uim-pref-qt
13bin/uim-sh 13bin/uim-sh
14${PLIST.gtk}bin/uim-toolbar-gtk 14${PLIST.gtk}bin/uim-toolbar-gtk
@@ -170,127 +170,26 @@ share/uim/pixmaps/ja_pocketbell.png @@ -170,127 +170,26 @@ share/uim/pixmaps/ja_pocketbell.png
170share/uim/pixmaps/ja_pocketbell.svg 170share/uim/pixmaps/ja_pocketbell.svg
171share/uim/pixmaps/ja_romaji.png 171share/uim/pixmaps/ja_romaji.png
172share/uim/pixmaps/ja_romaji.svg 172share/uim/pixmaps/ja_romaji.svg
173share/uim/pixmaps/ko_direct.png 173share/uim/pixmaps/ko_direct.png
174share/uim/pixmaps/ko_direct.svg 174share/uim/pixmaps/ko_direct.svg
175share/uim/pixmaps/ko_hangulchar.png 175share/uim/pixmaps/ko_hangulchar.png
176share/uim/pixmaps/ko_hangulchar.svg 176share/uim/pixmaps/ko_hangulchar.svg
177share/uim/pixmaps/ko_hangulword.png 177share/uim/pixmaps/ko_hangulword.png
178share/uim/pixmaps/ko_hangulword.svg 178share/uim/pixmaps/ko_hangulword.svg
179share/uim/pixmaps/latin.png 179share/uim/pixmaps/latin.png
180share/uim/pixmaps/latin.svg 180share/uim/pixmaps/latin.svg
181share/uim/pixmaps/look.png 181share/uim/pixmaps/look.png
182share/uim/pixmaps/look.svg 182share/uim/pixmaps/look.svg
183${PLIST.m17nlib}share/uim/pixmaps/m17n-am-sera.png 
184${PLIST.m17nlib}share/uim/pixmaps/m17n-ar-kbd.png 
185${PLIST.m17nlib}share/uim/pixmaps/m17n-as-inscript.png 
186${PLIST.m17nlib}share/uim/pixmaps/m17n-as-itrans.png 
187${PLIST.m17nlib}share/uim/pixmaps/m17n-as-phonetic.png 
188${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-inscript.png 
189${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-itrans.png 
190${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-probhat.png 
191${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-unijoy.png 
192${PLIST.m17nlib}share/uim/pixmaps/m17n-bo-wylie.png 
193${PLIST.m17nlib}share/uim/pixmaps/m17n-bopo-kbd.png 
194${PLIST.m17nlib}share/uim/pixmaps/m17n-cmc-kbd.png 
195${PLIST.m17nlib}share/uim/pixmaps/m17n-dv-phonetic.png 
196${PLIST.m17nlib}share/uim/pixmaps/m17n-el-kbd.png 
197${PLIST.m17nlib}share/uim/pixmaps/m17n-en-ispell.png 
198${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-fundamente.png 
199${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-sistemo.png 
200${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-plena.png 
201${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-q-sistemo.png 
202${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-x-sistemo.png 
203${PLIST.m17nlib}share/uim/pixmaps/m17n-fa-isiri.png 
204${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-inscript.png 
205${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-itrans.png 
206${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-phonetic.png 
207${PLIST.m17nlib}share/uim/pixmaps/m17n-he-kbd.png 
208${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-inscript.png 
209${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-itrans.png 
210${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-phonetic.png 
211${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-remington.png 
212${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-typewriter.png 
213${PLIST.m17nlib}share/uim/pixmaps/m17n-hr-kbd.png 
214${PLIST.m17nlib}share/uim/pixmaps/m17n-hy-kbd.png 
215${PLIST.m17nlib}share/uim/pixmaps/m17n-ja-anthy.png 
216${PLIST.m17nlib}share/uim/pixmaps/m17n-ja-tcode.png 
217${PLIST.m17nlib}share/uim/pixmaps/m17n-ka-kbd.png 
218${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-arabic.png 
219${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-kbd.png 
220${PLIST.m17nlib}share/uim/pixmaps/m17n-km-yannis.png 
221${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-inscript.png 
222${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-itrans.png 
223${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-kgp.png 
224${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-han2.png 
225${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-romaja.png 
226${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-post.png 
227${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-pre.png 
228${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-kbd.png 
229${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-lrt.png 
230${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-inscript.png 
231${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-itrans.png 
232${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-mozhi.png 
233${PLIST.m17nlib}share/uim/pixmaps/m17n-mr-inscript.png 
234${PLIST.m17nlib}share/uim/pixmaps/m17n-my-kbd.png 
235${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-rom.png 
236${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-trad.png 
237${PLIST.m17nlib}share/uim/pixmaps/m17n-or-inscript.png 
238${PLIST.m17nlib}share/uim/pixmaps/m17n-or-itrans.png 
239${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-inscript.png 
240${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-itrans.png 
241${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-jhelum.png 
242${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-phonetic.png 
243${PLIST.m17nlib}share/uim/pixmaps/m17n-rfc1345.png 
244${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-kbd.png 
245${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-yawerty.png 
246${PLIST.m17nlib}share/uim/pixmaps/m17n-sd-inscript.png 
247${PLIST.m17nlib}share/uim/pixmaps/m17n-si-samanala.png 
248${PLIST.m17nlib}share/uim/pixmaps/m17n-si-wijesekera.png 
249${PLIST.m17nlib}share/uim/pixmaps/m17n-sk-kbd.png 
250${PLIST.m17nlib}share/uim/pixmaps/m17n-sr-kbd.png 
251${PLIST.m17nlib}share/uim/pixmaps/m17n-sv-post.png 
252${PLIST.m17nlib}share/uim/pixmaps/m17n-syrc-phonetic.png 
253${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-inscript.png 
254${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-itrans.png 
255${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-phonetic.png 
256${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-tamil99.png 
257${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-typewriter.png 
258${PLIST.m17nlib}share/uim/pixmaps/m17n-te-inscript.png 
259${PLIST.m17nlib}share/uim/pixmaps/m17n-te-itrans.png 
260${PLIST.m17nlib}share/uim/pixmaps/m17n-te-pothana.png 
261${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee-2.png 
262${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee.png 
263${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote-2.png 
264${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote.png 
265${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820-2.png 
266${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820.png 
267${PLIST.m17nlib}share/uim/pixmaps/m17n-unicode.png 
268${PLIST.m17nlib}share/uim/pixmaps/m17n-ur-phonetic.png 
269${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom-vni.png 
270${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom.png 
271${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-tcvn.png 
272${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-telex.png 
273${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-viqr.png 
274${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-vni.png 
275${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-cangjie.png 
276${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-pinyin.png 
277${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py-b5.png 
278${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py-gb.png 
279${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py.png 
280${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-quick.png 
281${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy-b5.png 
282${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy-gb.png 
283${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy.png 
284share/uim/pixmaps/mana.png 183share/uim/pixmaps/mana.png
285share/uim/pixmaps/mana.svg 184share/uim/pixmaps/mana.svg
286share/uim/pixmaps/null.png 185share/uim/pixmaps/null.png
287share/uim/pixmaps/off.png 186share/uim/pixmaps/off.png
288share/uim/pixmaps/off.svg 187share/uim/pixmaps/off.svg
289share/uim/pixmaps/on.png 188share/uim/pixmaps/on.png
290share/uim/pixmaps/on.svg 189share/uim/pixmaps/on.svg
291share/uim/pixmaps/pinyin-big5.png 190share/uim/pixmaps/pinyin-big5.png
292share/uim/pixmaps/pinyin-big5.svg 191share/uim/pixmaps/pinyin-big5.svg
293share/uim/pixmaps/prime.png 192share/uim/pixmaps/prime.png
294share/uim/pixmaps/prime_mode_application.png 193share/uim/pixmaps/prime_mode_application.png
295share/uim/pixmaps/prime_mode_application.svg 194share/uim/pixmaps/prime_mode_application.svg
296share/uim/pixmaps/py.png 195share/uim/pixmaps/py.png
cvs diff -r1.16 -r1.17 pkgsrc/inputmethod/uim/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/options.mk 2009/05/17 05:06:02 1.16
+++ pkgsrc/inputmethod/uim/options.mk 2009/10/01 12:30:32 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.16 2009/05/17 05:06:02 obache Exp $ 1# $NetBSD: options.mk,v 1.17 2009/10/01 12:30:32 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"
@@ -72,27 +72,31 @@ PLIST.gtk= yes @@ -72,27 +72,31 @@ PLIST.gtk= yes
72.else 72.else
73CONFIGURE_ARGS+= --without-gtk2 73CONFIGURE_ARGS+= --without-gtk2
74.endif 74.endif
75 75
76.if !empty(PKG_OPTIONS:Mkde) 76.if !empty(PKG_OPTIONS:Mkde)
77. include "../../x11/kdelibs3/buildlink3.mk" 77. include "../../x11/kdelibs3/buildlink3.mk"
78. include "../../x11/qt3-libs/buildlink3.mk" 78. include "../../x11/qt3-libs/buildlink3.mk"
79CONFIGURE_ARGS+= --enable-kde-applet 79CONFIGURE_ARGS+= --enable-kde-applet
80PLIST.kde= yes 80PLIST.kde= yes
81.endif 81.endif
82 82
83.if !empty(PKG_OPTIONS:Mm17nlib) 83.if !empty(PKG_OPTIONS:Mm17nlib)
84. include "../../devel/m17n-lib/buildlink3.mk" 84. include "../../devel/m17n-lib/buildlink3.mk"
 85DEPENDS+= m17n-contrib-[0-9]*:../../misc/m17n-contrib
85PLIST.m17nlib= yes 86PLIST.m17nlib= yes
 87INSTALL_TEMPLATES+= INSTALL.m17nlib
 88DEINSTALL_TEMPLATES+= DEINSTALL.m17nlib
 89CHECK_FILES_SKIP+= ${PREFIX}/share/uim/pixmaps/m17n-.*\.png
86.else 90.else
87CONFIGURE_ARGS+= --without-m17nlib 91CONFIGURE_ARGS+= --without-m17nlib
88.endif 92.endif
89 93
90.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) 94.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
91. include "../../x11/qt3-libs/buildlink3.mk" 95. include "../../x11/qt3-libs/buildlink3.mk"
92. include "../../x11/qt3-tools/buildlink3.mk" 96. include "../../x11/qt3-tools/buildlink3.mk"
93CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc 97CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc
94PLIST.helperdata= yes 98PLIST.helperdata= yes
95PLIST.qt= yes 99PLIST.qt= yes
96.endif 100.endif
97 101
98.if !empty(PKG_OPTIONS:Mprime) 102.if !empty(PKG_OPTIONS:Mprime)