Bump PKGREVISION

Implement proper module handling. This idea is provided by obache@.

* Remove all modules when uim is deinstalled, and register installed
  modules when uim is installed. This actions are needed when
  the modules that are provided by uim are changed.

5 files changed, 62 insertions, 4 deletions

diff --git a/inputmethod/uim/DEINSTALL b/inputmethod/uim/DEINSTALL
new file mode 100644
index 00000000000..5a5e97abac6
--- /dev/null
+++ b/inputmethod/uim/DEINSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: DEINSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${PREFIX}/bin/uim-module-manager --unregister-all
+	;;
+esac
diff --git a/inputmethod/uim/INSTALL b/inputmethod/uim/INSTALL
new file mode 100644
index 00000000000..b1b5dd67ddb
--- /dev/null
+++ b/inputmethod/uim/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2014/01/20 13:26:54 ryoon Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	cd ${PREFIX}/share/uim/pkgsrc
+	for m in *
+		do ${PREFIX}/bin/uim-module-manager --register ${m}
+	done
+	;;
+esac
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 4d3c461c564..ff4ae936cf0 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.89 2014/01/20 10:45:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.90 2014/01/20 13:26:54 ryoon Exp $
 #
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=		6
+PKGREVISION=		7
 COMMENT=		Multilingual input method library
 #LICENSE=		See ${WRKSRC}/COPYING
 
@@ -35,6 +35,11 @@ CONF_FILES+=		${EGDIR}/installed-modules.scm.example \
 			${PREFIX}/share/uim/installed-modules.scm
 
 post-install:
+# Register uim module infomation
+	${MKDIR} ${DESTDIR}${PREFIX}/share/uim/pkgsrc
+.for m in ${UIM_MODULES}
+	${TOUCH} ${DESTDIR}${PREFIX}/share/uim/pkgsrc/${m}
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY ${DESTDIR}${PREFIX}/share/doc/uim
 	${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim
diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST
index a252b4f7826..74e6d48df82 100644
--- a/inputmethod/uim/PLIST
+++ b/inputmethod/uim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2014/01/20 10:45:03 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.22 2014/01/20 13:26:54 ryoon Exp $
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
@@ -363,6 +363,27 @@ share/uim/pixmaps/zm.svg
 share/uim/pixmaps/zm_dark_background.png
 share/uim/pixmaps/zm_dark_background.svg
 share/uim/plugin.scm
+share/uim/pkgsrc/ajax-ime
+${PLIST.anthy}share/uim/pkgsrc/anthy
+share/uim/pkgsrc/baidu-olime-jp
+share/uim/pkgsrc/byeoru
+${PLIST.canna}share/uim/pkgsrc/canna
+share/uim/pkgsrc/elatin
+share/uim/pkgsrc/google-cgiapi-jp
+share/uim/pkgsrc/look
+share/uim/pkgsrc/ipa-x-sampa
+share/uim/pkgsrc/latin
+${PLIST.m17nlib}share/uim/pkgsrc/m17nlib
+${PLIST.prime}share/uim/pkgsrc/prime
+share/uim/pkgsrc/pyload
+${PLIST.sj3}share/uim/pkgsrc/sj3
+share/uim/pkgsrc/skk
+share/uim/pkgsrc/social-ime
+share/uim/pkgsrc/tutcode
+share/uim/pkgsrc/viqr
+${PLIST.wnn}share/uim/pkgsrc/wnn
+share/uim/pkgsrc/xmload
+${PLIST.expat}share/uim/pkgsrc/yahoo-jp
 share/uim/predict-custom.scm
 share/uim/predict-google-suggest.scm
 share/uim/predict-look-skk.scm
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index eddcd4cecc5..099568b4642 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.28 2013/08/11 07:50:51 obache Exp $
+# $NetBSD: options.mk,v 1.29 2014/01/20 13:26:54 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 PKG_SUPPORTED_OPTIONS=	anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn4 xim
@@ -8,6 +8,11 @@ PKG_OPTIONS_GROUP.kde=	kde kde3
 PKG_OPTIONS_GROUP.qt=	qt qt3
 PKG_SUGGESTED_OPTIONS=	anthy expat gtk prime uim-fep xim
 
+# Store installed modules
+UIM_MODULES=		skk tutcode byeoru latin elatin xmload pyload \
+			viqr ipa-x-sampa look ajax-ime social-ime \
+			google-cgiapi-jp baidu-olime-jp
+
 CHECK_BUILTIN.editline:=	yes
 .include "../../devel/editline/builtin.mk"
 CHECK_BUILTIN.editline:=	no
@@ -30,6 +35,7 @@ PKG_FAIL_REASON+=	"'qt3' conflict with 'qt' or 'kde' option"
 
 PLIST_VARS+=		helperdata uim-dict-gtk uim-dict-gtk3 uim-dict-helperdata fep
 PLIST_VARS+=		anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
+PLIST_VARS+=		canna prime sj3
 PLIST_VARS+=		editline
 
 .if !empty(PKG_OPTIONS:Meditline)
@@ -75,12 +81,14 @@ CONFIGURE_ARGS+=	--disable-fep
 .  include "../../inputmethod/anthy/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-anthy-utf8
 PLIST.anthy=		yes
+UIM_MODULES+=		anthy
 .else
 CONFIGURE_ARGS+=	--without-anthy
 .endif
 
 .if !empty(PKG_OPTIONS:Mcanna)
 CONFIGURE_ARGS+=	--with-canna
+UIM_MODULES+=		canna
 .endif
 
 .if !empty(PKG_OPTIONS:Mcurl)
@@ -101,6 +109,7 @@ PLIST.eb=		yes
 .  include "../../textproc/expat/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-expat=${BUILDLINK_PREFIX.expat}
 PLIST.expat=		yes
+UIM_MODULES+=		yahoo-jp
 .endif
 
 .if !empty(PKG_OPTIONS:Mffi)
@@ -178,6 +187,7 @@ PLIST.m17nlib=		yes
 INSTALL_TEMPLATES+=	INSTALL.m17nlib
 DEINSTALL_TEMPLATES+=	DEINSTALL.m17nlib
 CHECK_FILES_SKIP+=	${PREFIX}/share/uim/pixmaps/m17n-.*\.png
+UIM_MODULES+=		m17nlib
 .else
 CONFIGURE_ARGS+=	--without-m17nlib
 .endif
@@ -208,10 +218,14 @@ PLIST.openssl=		yes
 
 .if !empty(PKG_OPTIONS:Mprime)
 CONFIGURE_ARGS+=	--with-prime
+PLIST.prime=		yes
+UIM_MODULES+=		prime
 .endif
 
 .if !empty(PKG_OPTIONS:Msj3)
 CONFIGURE_ARGS+=	--with-sj3
+PLIST.sj3=		yes
+UIM_MODULES+=		sj3
 .endif
 
 # For input prediction
@@ -228,6 +242,7 @@ CONFIGURE_ARGS+=	--with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/
 CONFIGURE_ARGS+=	--with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
 CPPFLAGS+=		-DWNNENVDIR=\"${BUILDLINK_PREFIX.ja-FreeWnn-lib}/share/wnn\"
 PLIST.wnn=		yes
+UIM_MODULES+=		wnn
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)