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.

4 files changed, 22 insertions, 103 deletions

diff --git a/inputmethod/uim/DEINSTALL.m17nlib b/inputmethod/uim/DEINSTALL.m17nlib
new file mode 100644
index 00000000000..d68118a18f2
--- /dev/null
+++ b/inputmethod/uim/DEINSTALL.m17nlib
@@ -0,0 +1,8 @@
+# $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
diff --git a/inputmethod/uim/INSTALL.m17nlib b/inputmethod/uim/INSTALL.m17nlib
new file mode 100644
index 00000000000..90033cbf8c9
--- /dev/null
+++ b/inputmethod/uim/INSTALL.m17nlib
@@ -0,0 +1,8 @@
+# $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
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index 46f204ecefc..f036d4eed2c 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 20:19:52 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/10/01 12:30:32 obache Exp $
 ${PLIST.qt}bin/uim-chardict-qt
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
 ${PLIST.fep}bin/uim-fep
@@ -180,107 +180,6 @@ share/uim/pixmaps/latin.png
 share/uim/pixmaps/latin.svg
 share/uim/pixmaps/look.png
 share/uim/pixmaps/look.svg
-${PLIST.m17nlib}share/uim/pixmaps/m17n-am-sera.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ar-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-as-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-as-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-as-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-probhat.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bn-unijoy.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bo-wylie.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-bopo-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-cmc-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-dv-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-el-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-en-ispell.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-fundamente.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-h-sistemo.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-plena.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-q-sistemo.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-eo-x-sistemo.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-fa-isiri.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-gu-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-he-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-remington.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hi-typewriter.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hr-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-hy-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ja-anthy.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ja-tcode.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ka-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-arabic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kk-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-km-yannis.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-kn-kgp.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-han2.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ko-romaja.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-post.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-latn-pre.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-lo-lrt.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ml-mozhi.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-mr-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-my-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-rom.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ne-trad.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-or-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-or-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-jhelum.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-pa-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-rfc1345.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ru-yawerty.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sd-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-si-samanala.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-si-wijesekera.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sk-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sr-kbd.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-sv-post.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-syrc-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-tamil99.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ta-typewriter.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-te-inscript.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-te-itrans.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-te-pothana.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee-2.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-kesmanee.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote-2.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-pattachote.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820-2.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-th-tis820.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-unicode.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-ur-phonetic.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom-vni.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-nom.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-tcvn.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-telex.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-viqr.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-vi-vni.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-cangjie.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-pinyin.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py-b5.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py-gb.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-py.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-quick.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy-b5.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy-gb.png
-${PLIST.m17nlib}share/uim/pixmaps/m17n-zh-tonepy.png
 share/uim/pixmaps/mana.png
 share/uim/pixmaps/mana.svg
 share/uim/pixmaps/null.png
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index aeb9aefe71f..32ec64252ab 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2009/05/17 05:06:02 obache Exp $
+# $NetBSD: options.mk,v 1.17 2009/10/01 12:30:32 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 #PKG_SUPPORTED_OPTIONS=	anthy canna eb gnome gtk kde m17nlib qt prime sj3 uim-fep wnn xim
@@ -82,7 +82,11 @@ PLIST.kde=		yes
 
 .if !empty(PKG_OPTIONS:Mm17nlib)
 .  include "../../devel/m17n-lib/buildlink3.mk"
+DEPENDS+=		m17n-contrib-[0-9]*:../../misc/m17n-contrib
 PLIST.m17nlib=		yes
+INSTALL_TEMPLATES+=	INSTALL.m17nlib
+DEINSTALL_TEMPLATES+=	DEINSTALL.m17nlib
+CHECK_FILES_SKIP+=	${PREFIX}/share/uim/pixmaps/m17n-.*\.png
 .else
 CONFIGURE_ARGS+=	--without-m17nlib
 .endif