From 3feb9f90549d50a918d3d09e80a4ff212a5106ba Mon Sep 17 00:00:00 2001 From: msf Date: Mon, 14 May 2007 13:20:12 +0000 Subject: [PATCH] unbreak uim-gtk after gtk+2 update ok espie@ mcbride@ --- inputmethods/uim/Makefile | 6 +++--- inputmethods/uim/pkg/PLIST-gtk | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inputmethods/uim/Makefile b/inputmethods/uim/Makefile index 91e2cd17bfc..d5ec347ef2e 100644 --- a/inputmethods/uim/Makefile +++ b/inputmethods/uim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2007/04/08 14:58:04 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2007/05/14 13:20:12 msf Exp $ COMMENT-main= 'multilingual input method library' COMMENT-gtk= 'uim for gtk' COMMENT-qt= 'uim for qt' @@ -13,7 +13,7 @@ DISTNAME= uim-$V MASTER_SITES= http://uim.freedesktop.org/releases/uim/stable/ HOMEPAGE= http://uim.freedesktop.org/wiki/ PKGNAME-main= uim-$V -PKGNAME-gtk= uim-gtk-$V +PKGNAME-gtk= uim-gtk-$Vp0 PKGNAME-qt= uim-qt-$V PKGNAME-kde= uim-kde-$V PKGNAME-gnome= uim-gnome-$V @@ -78,7 +78,7 @@ WANTLIB-gnome= ${WANTLIB-gtk} ICE SM crypto gthread-2.0 jpeg pthread ssl \ -MAKE_FLAGS= moduledir='${LOCALBASE}/lib/gtk-2.0/2.4.0/immodules' \ +MAKE_FLAGS= moduledir='${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules' \ UIM_QT_LDFLAGS='-pthread -L${X11BASE}/lib -L${MODQT_LIBDIR} -lqt-mt -lXext -lX11' \ itlocaledir=${TRUEPREFIX}/share/locale diff --git a/inputmethods/uim/pkg/PLIST-gtk b/inputmethods/uim/pkg/PLIST-gtk index e146842ba8d..5abdf7839b3 100644 --- a/inputmethods/uim/pkg/PLIST-gtk +++ b/inputmethods/uim/pkg/PLIST-gtk @@ -1,19 +1,19 @@ -@comment $OpenBSD: PLIST-gtk,v 1.2 2007/04/08 14:58:04 espie Exp $ +@comment $OpenBSD: PLIST-gtk,v 1.3 2007/05/14 13:20:12 msf Exp $ bin/uim-dict-gtk bin/uim-im-switcher-gtk bin/uim-input-pad-ja bin/uim-pref-gtk bin/uim-toolbar-gtk bin/uim-toolbar-gtk-systray -@comment lib/gtk-2.0/2.4.0/immodules/im-uim.a -@comment lib/gtk-2.0/2.4.0/immodules/im-uim.la +@comment lib/gtk-2.0/2.10.0/immodules/im-uim.a +@comment lib/gtk-2.0/2.10.0/immodules/im-uim.la lib/bonobo/ lib/bonobo/servers/ lib/bonobo/servers/GNOME_UimApplet.server lib/gtk-2.0/ -lib/gtk-2.0/2.4.0/ -lib/gtk-2.0/2.4.0/immodules/ -lib/gtk-2.0/2.4.0/immodules/im-uim.so +lib/gtk-2.0/2.10.0/ +lib/gtk-2.0/2.10.0/immodules/ +lib/gtk-2.0/2.10.0/immodules/im-uim.so libexec/uim-candwin-gtk @exec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules @unexec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules