[pkgsrc/trunk]: pkgsrc/inputmethod/uim Fix build and PLIST for building with ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/18ffcfd58d46
branches:  trunk
changeset: 509400:18ffcfd58d46
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Mar 09 18:04:32 2006 +0000

description:
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.

diffstat:

 inputmethod/uim/Makefile     |  6 ++++--
 inputmethod/uim/PLIST.common |  4 ++--
 inputmethod/uim/PLIST.gtk    |  3 ++-
 inputmethod/uim/PLIST.qt     |  5 +++--
 inputmethod/uim/options.mk   |  3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diffs (93 lines):

diff -r 42c84398e4e9 -r 18ffcfd58d46 inputmethod/uim/Makefile
--- a/inputmethod/uim/Makefile  Thu Mar 09 17:42:28 2006 +0000
+++ b/inputmethod/uim/Makefile  Thu Mar 09 18:04:32 2006 +0000
@@ -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 @@
 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 @@
        ${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 -r 42c84398e4e9 -r 18ffcfd58d46 inputmethod/uim/PLIST.common
--- a/inputmethod/uim/PLIST.common      Thu Mar 09 17:42:28 2006 +0000
+++ b/inputmethod/uim/PLIST.common      Thu Mar 09 18:04:32 2006 +0000
@@ -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/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 -r 42c84398e4e9 -r 18ffcfd58d46 inputmethod/uim/PLIST.gtk
--- a/inputmethod/uim/PLIST.gtk Thu Mar 09 17:42:28 2006 +0000
+++ b/inputmethod/uim/PLIST.gtk Thu Mar 09 18:04:32 2006 +0000
@@ -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 -r 42c84398e4e9 -r 18ffcfd58d46 inputmethod/uim/PLIST.qt
--- a/inputmethod/uim/PLIST.qt  Thu Mar 09 17:42:28 2006 +0000
+++ b/inputmethod/uim/PLIST.qt  Thu Mar 09 18:04:32 2006 +0000
@@ -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 -r 42c84398e4e9 -r 18ffcfd58d46 inputmethod/uim/options.mk
--- a/inputmethod/uim/options.mk        Thu Mar 09 17:42:28 2006 +0000
+++ b/inputmethod/uim/options.mk        Thu Mar 09 18:04:32 2006 +0000
@@ -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 @@
 
 .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