Fix build and PLIST for building with option "qt".

Add missing gettext-lib, qt3-tools (for qt) dependencies.
Add USE_DIRS+=xdg-1.1 for the desktop file.

Addresses PR 33042 by Ryu HAYASAKA.

5 files changed, 13 insertions, 8 deletions

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 8080d49d605..e1eafa2c5fb 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/03/09 18:04:32 wiz Exp $
 #
 
 DISTNAME=		uim-1.0.1
@@ -10,9 +10,10 @@ MAINTAINER=		VEG03617@nifty.com
 HOMEPAGE=		http://uim.freedesktop.org/wiki/
 COMMENT=		Multilingual input method library
 
-USE_PKGLOCALEDIR=	YES
+USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		YES
 USE_NCURSES=		# clear_screen, clr_eos
+USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uim.pc.in
 GNU_CONFIGURE=		YES
@@ -36,6 +37,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${PREFIX}/share/doc/uim/uim-fep
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST.common
index 64f6616270c..5b3b0e7b367 100644
--- a/inputmethod/uim/PLIST.common
+++ b/inputmethod/uim/PLIST.common
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST.common,v 1.4 2005/12/31 00:04:28 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2006/03/09 18:04:32 wiz Exp $
 bin/uim-fep
 bin/uim-fep-tick
-bin/uim-input-pad-ja
 bin/uim-module-manager
 bin/uim-sh
 bin/uim-xim
@@ -109,6 +108,7 @@ share/uim/viqr.scm
 share/uim/zaurus.scm
 @dirrm share/uim/pixmaps
 @dirrm share/uim
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm share/doc/uim/uim-fep
 @dirrm share/doc/uim
 @dirrm lib/uim/plugin
diff --git a/inputmethod/uim/PLIST.gtk b/inputmethod/uim/PLIST.gtk
index 3f48b522337..d9f84d492d0 100644
--- a/inputmethod/uim/PLIST.gtk
+++ b/inputmethod/uim/PLIST.gtk
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.gtk,v 1.2 2005/12/31 00:04:28 wiz Exp $
+@comment $NetBSD: PLIST.gtk,v 1.3 2006/03/09 18:04:32 wiz Exp $
 bin/uim-helper-toolbar-gtk
 bin/uim-helper-toolbar-gtk-systray
 bin/uim-im-switcher-gtk
+bin/uim-input-pad-ja
 bin/uim-pref-gtk
 bin/uim-toolbar-gtk
 bin/uim-toolbar-gtk-systray
diff --git a/inputmethod/uim/PLIST.qt b/inputmethod/uim/PLIST.qt
index 9900fde0bc9..07a1f78bd93 100644
--- a/inputmethod/uim/PLIST.qt
+++ b/inputmethod/uim/PLIST.qt
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST.qt,v 1.1 2005/03/29 18:47:52 wiz Exp $
-bin/uim-candwin-qt
+@comment $NetBSD: PLIST.qt,v 1.2 2006/03/09 18:04:32 wiz Exp $
 bin/uim-chardict-qt
 bin/uim-im-switcher-qt
 bin/uim-pref-qt
 bin/uim-toolbar-qt
+libexec/uim-candwin-qt
 share/uim/helperdata/bushu.t
+@dirrm share/uim/helperdata
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index a1c591e17d9..fdbc6da2c33 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2005/10/05 13:29:51 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2006/03/09 18:04:32 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk qt
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=	--without-gtk2
 
 .if !empty(PKG_OPTIONS:Mqt)
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-qt
 # Not worked this option.  need immodule patch for Qt3
 CONFIGURE_ARGS+=	--with-qt-immodule