From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 21 17:20:06 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E400E170069 for ; Wed, 21 Feb 2007 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id BA8B513C4A8 for ; Wed, 21 Feb 2007 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1LHK6N0068732 for ; Wed, 21 Feb 2007 17:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1LHK6QJ068731; Wed, 21 Feb 2007 17:20:06 GMT (envelope-from gnats) Resent-Date: Wed, 21 Feb 2007 17:20:06 GMT Resent-Message-Id: <200702211720.l1LHK6QJ068731@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yamashiro Jun Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A29B917002C for ; Wed, 21 Feb 2007 17:16:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [69.147.83.33]) by mx1.freebsd.org (Postfix) with ESMTP id 90FFD13C4A3 for ; Wed, 21 Feb 2007 17:16:42 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l1LHGgVJ085729 for ; Wed, 21 Feb 2007 17:16:42 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id l1LHGgeE085728; Wed, 21 Feb 2007 17:16:42 GMT (envelope-from nobody) Message-Id: <200702211716.l1LHGgeE085728@www.freebsd.org> Date: Wed, 21 Feb 2007 17:16:42 GMT From: Yamashiro Jun To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/109399: Update port: textproc/uim* japanese/uim* update to uim-1.3.1 and add textproc/uim-kde X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2007 17:20:07 -0000 >Number: 109399 >Category: ports >Synopsis: Update port: textproc/uim* japanese/uim* update to uim-1.3.1 and add textproc/uim-kde >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 21 17:20:06 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Yamashiro Jun >Release: FreeBSD/i386 6.1-RELEASE-p11 >Organization: Okinawa FreeBSD Users Group >Environment: FreeBSD base 6.1-RELEASE-p11 FreeBSD 6.1-RELEASE-p11 #3: Wed Dec 20 18:51:13 PST 2006 root@PCBSD.localhost:/usr/obj/usr/src/sys/PCBSDv1.3 i386 >Description: update patch for textproc/uim* and japanese/uim* Changelog: * update uim-1.2.1 to uim-1.3.1 * Add textproc/uim-kde package(KDE kicker applet). * Include uim-dict-gtk support in japanese/uim-anthy * Sync current data path of devel/libbonobo for textproc/uim-gnome >How-To-Repeat: >Fix: Please apply this patch. # cd /usr/ports # patch -p0 < /path/to/this_mail diff -Nru japanese/uim-anthy.orig/Makefile japanese/uim-anthy/Makefile --- japanese/uim-anthy.orig/Makefile Wed Feb 21 23:44:54 2007 +++ japanese/uim-anthy/Makefile Thu Feb 22 01:23:38 2007 @@ -19,7 +19,7 @@ .endif LIB_DEPENDS= anthy.1:${PORTSDIR}/japanese/anthy \ - uim.3:${PORTSDIR}/textproc/uim + uim.4:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} @@ -44,7 +44,7 @@ (cd ${WRKSRC}/uim && \ ${GMAKE} uim_plugin_LTLIBRARIES=libuim-anthy.la install-uim_pluginLTLIBRARIES) .if !defined(WITHOUT_X11) - (cd ${WRKSRC}/helper && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS) + (cd ${WRKSRC}/helper && ${GMAKE} bin_PROGRAMS=uim-dict-gtk install-binPROGRAMS install-uim_dict_uiDATA) .endif post-install: diff -Nru japanese/uim-anthy.orig/pkg-plist japanese/uim-anthy/pkg-plist --- japanese/uim-anthy.orig/pkg-plist Wed Feb 21 23:44:54 2007 +++ japanese/uim-anthy/pkg-plist Mon Jan 8 17:46:04 2007 @@ -2,5 +2,6 @@ lib/uim/plugin/libuim-anthy.a lib/uim/plugin/libuim-anthy.la lib/uim/plugin/libuim-anthy.so +%%X11%%share/uim/helperdata/uim-dict-ui.xml @exec uim-module-manager --register anthy @unexec uim-module-manager --unregister anthy diff -Nru japanese/uim-canna.orig/Makefile japanese/uim-canna/Makefile --- japanese/uim-canna.orig/Makefile Tue Feb 6 02:11:59 2007 +++ japanese/uim-canna/Makefile Sat Feb 17 18:24:50 2007 @@ -15,7 +15,7 @@ COMMENT= Uim plugin using Canna input method LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna \ - uim.3:${PORTSDIR}/textproc/uim + uim.4:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff -Nru japanese/uim-prime.orig/Makefile japanese/uim-prime/Makefile --- japanese/uim-prime.orig/Makefile Tue Feb 6 02:11:59 2007 +++ japanese/uim-prime/Makefile Tue Feb 6 02:09:46 2007 @@ -15,7 +15,7 @@ COMMENT= Uim plugin using PRIME input method BUILD_DEPENDS= prime:${PORTSDIR}/japanese/prime -LIB_DEPENDS= uim.3:${PORTSDIR}/textproc/uim +LIB_DEPENDS= uim.4:${PORTSDIR}/textproc/uim RUN_DEPENDS+= ${BUILD_DEPENDS} MASTERDIR= ${.CURDIR}/../../textproc/uim diff -Nru textproc/uim.orig/Makefile textproc/uim/Makefile --- textproc/uim.orig/Makefile Mon Jan 8 17:47:47 2007 +++ textproc/uim/Makefile Wed Feb 21 02:03:38 2007 @@ -6,8 +6,7 @@ # PORTNAME= uim -PORTVERSION= 1.2.1 -PORTREVISION?= 1 +PORTVERSION= 1.3.1 CATEGORIES?= textproc MASTER_SITES= http://uim.freedesktop.org/releases/ .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) @@ -25,6 +24,7 @@ USE_GETTEXT= yes USE_ICONV= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --mandir=${PREFIX}/man .if !defined(WITHOUT_X11) LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft @@ -109,6 +109,7 @@ .if !defined(UIM_SLAVE) && !defined(NOPORTDOCS) post-install: + ${MKDIR} ${DATADIR}/helperdata ${MKDIR} ${DOCSDIR} ${MKDIR} ${DOCSDIR_JA} ${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY diff -Nru textproc/uim.orig/distinfo textproc/uim/distinfo --- textproc/uim.orig/distinfo Mon Jan 8 17:47:47 2007 +++ textproc/uim/distinfo Wed Feb 21 02:03:38 2007 @@ -1,3 +1,3 @@ -MD5 (uim-1.2.1.tar.gz) = c27e96ea57e5fcd38ddc72876a1d6d1c -SHA256 (uim-1.2.1.tar.gz) = e2f257df389a516885ccfb18a068f7c153425cfb31de8487106e9e33bb1dcfbc -SIZE (uim-1.2.1.tar.gz) = 2149696 +MD5 (uim-1.3.1.tar.gz) = 6b90d3247cb9244701db59941a4e1f09 +SHA256 (uim-1.3.1.tar.gz) = 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513 +SIZE (uim-1.3.1.tar.gz) = 2186681 diff -Nru textproc/uim.orig/files/extra-patch-helper_Makefile.in textproc/uim/files/extra-patch-helper_Makefile.in --- textproc/uim.orig/files/extra-patch-helper_Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/extra-patch-helper_Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,15 +1,15 @@ ---- helper/Makefile.in.orig Mon Aug 21 00:57:13 2006 -+++ helper/Makefile.in Mon Aug 21 00:57:24 2006 +--- helper/Makefile.in.orig Wed Jan 3 21:22:49 2007 ++++ helper/Makefile.in Wed Jan 3 21:26:49 2007 @@ -87,8 +87,6 @@ @GTK2_TRUE@ uim_candwin_gtk-candwin-gtk.$(OBJEXT) \ @GTK2_TRUE@ uim_candwin_gtk-caret-state-indicator.$(OBJEXT) uim_candwin_gtk_OBJECTS = $(am_uim_candwin_gtk_OBJECTS) -@GTK2_TRUE@uim_candwin_gtk_DEPENDENCIES = \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_dict_gtk_SOURCES_DIST = dict-main-gtk.c dict-canna-cclass.c \ - dict-canna-cclass.h dict-word-win-gtk.c dict-word-win-gtk.h \ - dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c \ -@@ -111,22 +109,14 @@ + uim_candwin_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_candwin_gtk_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -114,10 +112,6 @@ @DICT_TRUE@@GTK2_TRUE@ $(am__objects_1) $(am__objects_2) uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS) am__DEPENDENCIES_1 = @@ -17,65 +17,74 @@ -@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \ -@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) \ -@DICT_TRUE@@GTK2_TRUE@ $(am__DEPENDENCIES_1) - am__uim_im_switcher_gtk_SOURCES_DIST = im-switcher-gtk.c + uim_dict_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_dict_gtk_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -125,8 +119,6 @@ @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS = \ @GTK2_TRUE@ uim_im_switcher_gtk-im-switcher-gtk.$(OBJEXT) uim_im_switcher_gtk_OBJECTS = $(am_uim_im_switcher_gtk_OBJECTS) -@GTK2_TRUE@uim_im_switcher_gtk_DEPENDENCIES = \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_input_pad_ja_SOURCES_DIST = input-pad-ja.c + uim_im_switcher_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(uim_im_switcher_gtk_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +@@ -135,8 +127,6 @@ @GTK2_TRUE@am_uim_input_pad_ja_OBJECTS = \ @GTK2_TRUE@ uim_input_pad_ja-input-pad-ja.$(OBJEXT) uim_input_pad_ja_OBJECTS = $(am_uim_input_pad_ja_OBJECTS) -@GTK2_TRUE@uim_input_pad_ja_DEPENDENCIES = \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_pref_gtk_SOURCES_DIST = pref-gtk.c pref-gtk-custom-widgets.c \ - pref-gtk-custom-widgets.h ../gtk/key-util-gtk.c \ - ../gtk/key-util-gtk.h -@@ -134,23 +124,17 @@ + uim_input_pad_ja_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_input_pad_ja_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -147,8 +137,6 @@ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-pref-gtk-custom-widgets.$(OBJEXT) \ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ uim_pref_gtk-key-util-gtk.$(OBJEXT) uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS) -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim-custom.la \ -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_toolbar_applet_SOURCES_DIST = toolbar-applet-gnome.c \ - toolbar-common-gtk.c - @APPLET_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \ - @APPLET_TRUE@ uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT) + uim_pref_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_pref_gtk_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -157,8 +145,6 @@ + @APPLET_GNOME_TRUE@am_uim_toolbar_applet_OBJECTS = uim_toolbar_applet-toolbar-applet-gnome.$(OBJEXT) \ + @APPLET_GNOME_TRUE@ uim_toolbar_applet-toolbar-common-gtk.$(OBJEXT) uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS) --@APPLET_TRUE@uim_toolbar_applet_DEPENDENCIES = \ --@APPLET_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_toolbar_gtk_SOURCES_DIST = toolbar-standalone-gtk.c \ - toolbar-common-gtk.c - @GTK2_TRUE@am_uim_toolbar_gtk_OBJECTS = \ +-@APPLET_GNOME_TRUE@uim_toolbar_applet_DEPENDENCIES = \ +-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la + uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +@@ -169,8 +155,6 @@ @GTK2_TRUE@ uim_toolbar_gtk-toolbar-standalone-gtk.$(OBJEXT) \ @GTK2_TRUE@ uim_toolbar_gtk-toolbar-common-gtk.$(OBJEXT) uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS) -@GTK2_TRUE@uim_toolbar_gtk_DEPENDENCIES = \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_toolbar_gtk_systray_SOURCES_DIST = toolbar-systray-gtk.c \ - toolbar-common-gtk.c eggtrayicon.c eggtrayicon.h - @GTK2_TRUE@am_uim_toolbar_gtk_systray_OBJECTS = uim_toolbar_gtk_systray-toolbar-systray-gtk.$(OBJEXT) \ -@@ -158,8 +142,6 @@ + uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -181,8 +165,6 @@ @GTK2_TRUE@ uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT) uim_toolbar_gtk_systray_OBJECTS = \ $(am_uim_toolbar_gtk_systray_OBJECTS) -@GTK2_TRUE@uim_toolbar_gtk_systray_DEPENDENCIES = \ -@GTK2_TRUE@ $(top_builddir)/uim/libuim.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -447,8 +429,7 @@ + uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +@@ -434,8 +416,7 @@ uim_pixmapsdir = @uim_pixmapsdir@ EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml.in helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" --@APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_LIBS@ \ --@APPLET_TRUE@ $(top_builddir)/uim/libuim.la -+@APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_LIBS@ +-@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \ +-@APPLET_GNOME_TRUE@ $(top_builddir)/uim/libuim.la ++@APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ - @APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) - @APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@ -@@ -464,34 +445,32 @@ + @APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + @APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@ +@@ -453,25 +434,25 @@ @GTK2_TRUE@ ../gtk/caret-state-indicator.c \ @GTK2_TRUE@ ../gtk/caret-state-indicator.h @@ -106,21 +115,21 @@ @GTK2_TRUE@uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) @GTK2_TRUE@uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_SOURCES = pref-gtk.c \ - @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ pref-gtk-custom-widgets.c pref-gtk-custom-widgets.h \ +@@ -479,8 +460,7 @@ + @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ pref-gtk-keytab.h \ @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ ../gtk/key-util-gtk.c ../gtk/key-util-gtk.h -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \ -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@ $(top_builddir)/uim/libuim.la -- +@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ + @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall - @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_SOURCES = dict-main-gtk.c \ -@@ -506,7 +485,6 @@ - @DICT_TRUE@@GTK2_TRUE@ dict-cclass-dialog.h $(am__append_4) \ - @DICT_TRUE@@GTK2_TRUE@ $(am__append_7) +@@ -496,7 +476,6 @@ + @DICT_TRUE@@GTK2_TRUE@ dict-cclass-dialog.h $(am__append_5) \ + @DICT_TRUE@@GTK2_TRUE@ $(am__append_8) @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \ -@DICT_TRUE@@GTK2_TRUE@ $(top_builddir)/uim/libuim.la \ - @DICT_TRUE@@GTK2_TRUE@ $(am__append_5) $(am__append_8) + @DICT_TRUE@@GTK2_TRUE@ $(am__append_6) $(am__append_9) @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \ @DICT_TRUE@@GTK2_TRUE@ -I$(top_srcdir) -I$(top_builddir) \ diff -Nru textproc/uim.orig/files/extra-patch-qt_Makefile.in textproc/uim/files/extra-patch-qt_Makefile.in --- textproc/uim.orig/files/extra-patch-qt_Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/extra-patch-qt_Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,16 +1,16 @@ ---- qt/Makefile.in.orig Mon Aug 14 13:28:21 2006 -+++ qt/Makefile.in Mon Aug 21 01:27:53 2006 -@@ -95,8 +95,6 @@ - "$(DESTDIR)$(libexecdir)" +--- qt/Makefile.in.orig Wed Jan 3 22:36:52 2007 ++++ qt/Makefile.in Wed Jan 3 22:43:02 2007 +@@ -103,8 +103,6 @@ extraLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(extra_LTLIBRARIES) $(noinst_LTLIBRARIES) + LTLIBRARIES = $(applet_LTLIBRARIES) $(extra_LTLIBRARIES) \ + $(noinst_LTLIBRARIES) -@QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_DEPENDENCIES = \ -@QT_IMMODULE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la am__libquiminputcontextplugin_la_SOURCES_DIST = \ immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \ - immodule-plugin.cpp immodule-candidatewindow.h \ -@@ -118,8 +116,6 @@ - $(am_libquiminputcontextplugin_la_OBJECTS) + immodule-plugin.cpp immodule-plugin.h \ +@@ -135,8 +133,6 @@ + $(libquiminputcontextplugin_la_LDFLAGS) $(LDFLAGS) -o $@ @QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath = \ @QT_IMMODULE_TRUE@@QT_TRUE@ -rpath $(extradir) -@QT_TRUE@libtoolbarcommon_la_DEPENDENCIES = \ @@ -18,42 +18,55 @@ am__libtoolbarcommon_la_SOURCES_DIST = \ toolbar-common-quimhelpertoolbar.cpp \ toolbar-common-uimstateindicator.cpp qtgettext.h \ -@@ -138,14 +134,11 @@ +@@ -150,9 +146,7 @@ + $(libtoolbarcommon_la_CXXFLAGS) $(CXXFLAGS) \ + $(libtoolbarcommon_la_LDFLAGS) $(LDFLAGS) -o $@ + @QT_TRUE@am_libtoolbarcommon_la_rpath = +-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = \ +-@APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \ +-@APPLET_KDE_TRUE@@QT_TRUE@ libtoolbarcommon.la ++@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_DEPENDENCIES = libtoolbarcommon.la + am__uim_panelapplet_la_SOURCES_DIST = toolbar-applet-kde.cpp \ + toolbar-applet-kde.h qtgettext.h \ + toolbar-common-quimhelpertoolbar.h \ +@@ -174,7 +168,6 @@ @QT_TRUE@am_uim_candwin_qt_OBJECTS = \ @QT_TRUE@ uim_candwin_qt-candwin-qt.$(OBJEXT) uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS) -@QT_TRUE@uim_candwin_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la - am__uim_im_switcher_qt_SOURCES_DIST = switcher-qt.cpp switcher-qt.h \ - qtgettext.h + uim_candwin_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(uim_candwin_qt_CXXFLAGS) $(CXXFLAGS) \ +@@ -184,8 +177,6 @@ @QT_TRUE@am_uim_im_switcher_qt_OBJECTS = \ @QT_TRUE@ uim_im_switcher_qt-switcher-qt.$(OBJEXT) uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS) -@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES = \ -@QT_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_pref_qt_SOURCES_DIST = pref-qt.cpp pref-customwidgets.cpp \ - pref-kseparator.cpp qtgettext.h pref-qt.h pref-customwidgets.h \ - pref-kseparator.h -@@ -157,9 +150,6 @@ + uim_im_switcher_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(uim_im_switcher_qt_CXXFLAGS) $(CXXFLAGS) \ +@@ -201,9 +192,6 @@ @PREF_TRUE@@QT_TRUE@ uim_pref_qt-pref-keyeditformbase.$(OBJEXT) uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \ $(nodist_uim_pref_qt_OBJECTS) -@PREF_TRUE@@QT_TRUE@uim_pref_qt_DEPENDENCIES = \ -@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim-custom.la \ -@PREF_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la - am__uim_toolbar_qt_SOURCES_DIST = toolbar-standalone-qt.cpp \ - toolbar-standalone-qt.h qtgettext.h \ - toolbar-common-quimhelpertoolbar.h \ -@@ -167,8 +157,7 @@ + uim_pref_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(uim_pref_qt_CXXFLAGS) \ + $(CXXFLAGS) $(uim_pref_qt_LDFLAGS) $(LDFLAGS) -o $@ +@@ -214,8 +202,7 @@ @QT_TRUE@am_uim_toolbar_qt_OBJECTS = \ @QT_TRUE@ uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT) uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS) -@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la \ -@QT_TRUE@ ./libtoolbarcommon.la +@QT_TRUE@uim_toolbar_qt_DEPENDENCIES = ./libtoolbarcommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -502,7 +491,6 @@ + uim_toolbar_qt_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(uim_toolbar_qt_CXXFLAGS) $(CXXFLAGS) \ +@@ -533,7 +520,6 @@ @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS) @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version @@ -61,7 +74,7 @@ # Toolbar Common @QT_TRUE@noinst_LTLIBRARIES = libtoolbarcommon.la -@@ -511,7 +499,6 @@ +@@ -542,7 +528,6 @@ @QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version @@ -69,13 +82,22 @@ # Toolbar Standalone @QT_TRUE@uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp toolbar-standalone-qt.h qtgettext.h \ -@@ -519,19 +506,17 @@ +@@ -550,7 +535,7 @@ @QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS) @QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS) -@QT_TRUE@uim_toolbar_qt_LDADD = $(top_builddir)/uim/libuim.la ./libtoolbarcommon.la +@QT_TRUE@uim_toolbar_qt_LDADD = ./libtoolbarcommon.la + # Toolbar applet + @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_SOURCES = toolbar-applet-kde.cpp toolbar-applet-kde.h qtgettext.h \ +@@ -558,19 +543,17 @@ + + @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_CXXFLAGS = -I@KDE_INCLUDE_DIR@ $(QT_CXXFLAGS) + @APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LDFLAGS = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined -L@KDE_LIB_DIR@ $(QT_LDFLAGS) +-@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = $(top_builddir)/uim/libuim.la libtoolbarcommon.la -lkdeui -lkdecore ++@APPLET_KDE_TRUE@@QT_TRUE@uim_panelapplet_la_LIBADD = libtoolbarcommon.la -lkdeui -lkdecore + # Candidate Window @QT_TRUE@uim_candwin_qt_SOURCES = candwin-qt.cpp candwin-qt.h qtgettext.h @QT_TRUE@uim_candwin_qt_CXXFLAGS = $(QT_CXXFLAGS) @@ -90,7 +112,7 @@ # Pref @PREF_TRUE@@QT_TRUE@nodist_uim_pref_qt_SOURCES = \ -@@ -547,7 +532,6 @@ +@@ -586,7 +569,6 @@ @PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS) @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS) diff -Nru textproc/uim.orig/files/extra-patch-uim_Makefile.in textproc/uim/files/extra-patch-uim_Makefile.in --- textproc/uim.orig/files/extra-patch-uim_Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/extra-patch-uim_Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,6 +1,6 @@ ---- uim/Makefile.in.orig Fri Jul 7 11:16:53 2006 -+++ uim/Makefile.in Fri Jul 28 00:01:50 2006 -@@ -89,14 +89,11 @@ +--- uim/Makefile.in.orig Wed Jan 3 21:08:38 2007 ++++ uim/Makefile.in Wed Jan 3 21:16:23 2007 +@@ -85,8 +85,6 @@ libLTLIBRARIES_INSTALL = $(INSTALL) uim_pluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) $(uim_plugin_LTLIBRARIES) @@ -9,37 +9,47 @@ am__libuim_anthy_la_SOURCES_DIST = anthy.c @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_OBJECTS = libuim_anthy_la-anthy.lo libuim_anthy_la_OBJECTS = $(am_libuim_anthy_la_OBJECTS) +@@ -95,7 +93,6 @@ + $(libuim_anthy_la_LDFLAGS) $(LDFLAGS) -o $@ @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_rpath = \ @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@ -rpath $(uim_plugindir) -@CANNA_TRUE@libuim_canna_la_DEPENDENCIES = libuim.la am__libuim_canna_la_SOURCES_DIST = canna.c @CANNA_TRUE@am_libuim_canna_la_OBJECTS = libuim_canna_la-canna.lo libuim_canna_la_OBJECTS = $(am_libuim_canna_la_OBJECTS) -@@ -109,23 +106,19 @@ - libuim_custom_la_DEPENDENCIES = libuim.la - am_libuim_custom_la_OBJECTS = libuim_custom_la-uim-custom.lo - libuim_custom_la_OBJECTS = $(am_libuim_custom_la_OBJECTS) +@@ -117,7 +114,6 @@ + libuim_custom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libuim_custom_la_LDFLAGS) $(LDFLAGS) -o $@ -@M17NLIB_TRUE@libuim_m17nlib_la_DEPENDENCIES = libuim.la am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS = \ @M17NLIB_TRUE@ libuim_m17nlib_la-m17nlib.lo - libuim_m17nlib_la_OBJECTS = $(am_libuim_m17nlib_la_OBJECTS) +@@ -126,7 +122,6 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libuim_m17nlib_la_LDFLAGS) $(LDFLAGS) -o $@ @M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir) -@MANA_TRUE@libuim_mana_la_DEPENDENCIES = libuim.la am__libuim_mana_la_SOURCES_DIST = mana.c @MANA_TRUE@am_libuim_mana_la_OBJECTS = libuim_mana_la-mana.lo libuim_mana_la_OBJECTS = $(am_libuim_mana_la_OBJECTS) +@@ -134,7 +129,6 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libuim_mana_la_LDFLAGS) $(LDFLAGS) -o $@ @MANA_TRUE@am_libuim_mana_la_rpath = -rpath $(uim_plugindir) -@PRIME_TRUE@libuim_prime_la_DEPENDENCIES = libuim.la am__libuim_prime_la_SOURCES_DIST = prime.c @PRIME_TRUE@am_libuim_prime_la_OBJECTS = libuim_prime_la-prime.lo libuim_prime_la_OBJECTS = $(am_libuim_prime_la_OBJECTS) +@@ -142,7 +136,6 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libuim_prime_la_LDFLAGS) $(LDFLAGS) -o $@ @PRIME_TRUE@am_libuim_prime_la_rpath = -rpath $(uim_plugindir) -@SCIM_TRUE@libuim_scim_la_DEPENDENCIES = libuim.la am__libuim_scim_la_SOURCES_DIST = scim.cpp @SCIM_TRUE@am_libuim_scim_la_OBJECTS = libuim_scim_la-scim.lo libuim_scim_la_OBJECTS = $(am_libuim_scim_la_OBJECTS) -@@ -491,27 +484,27 @@ +@@ -494,27 +487,27 @@ $(am__append_5) libuim_custom_la_SOURCES = uim-custom.c @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c diff -Nru textproc/uim.orig/files/patch-emacs_Makefile.in textproc/uim/files/patch-emacs_Makefile.in --- textproc/uim.orig/files/patch-emacs_Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/patch-emacs_Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,12 +1,12 @@ ---- emacs/Makefile.in.orig Fri Dec 16 17:10:53 2005 -+++ emacs/Makefile.in Sat Dec 24 07:41:33 2005 -@@ -670,15 +670,6 @@ - distclean-libtool: - -rm -f libtool - uninstall-info-am: +--- emacs/Makefile.in.orig Wed Jan 3 21:31:12 2007 ++++ emacs/Makefile.in Wed Jan 3 21:32:26 2007 +@@ -735,15 +735,6 @@ + + clean-libtool: + -rm -rf .libs _libs -install-dist_uimel_lispDATA: $(dist_uimel_lisp_DATA) - @$(NORMAL_INSTALL) -- test -z "$(uimel_lispdir)" || $(mkdir_p) "$(DESTDIR)$(uimel_lispdir)" +- test -z "$(uimel_lispdir)" || $(MKDIR_P) "$(DESTDIR)$(uimel_lispdir)" - @list='$(dist_uimel_lisp_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ diff -Nru textproc/uim.orig/files/patch-gtk:Makefile.in textproc/uim/files/patch-gtk:Makefile.in --- textproc/uim.orig/files/patch-gtk:Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/patch-gtk:Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,11 +1,11 @@ ---- gtk/Makefile.in.orig Fri Dec 16 17:10:56 2005 -+++ gtk/Makefile.in Sat Dec 24 03:04:10 2005 -@@ -381,15 +381,15 @@ - $(ACLOCAL_M4): $(am__aclocal_m4_deps) +--- gtk/Makefile.in.orig Wed Jan 3 21:36:56 2007 ++++ gtk/Makefile.in Wed Jan 3 21:38:08 2007 +@@ -364,15 +364,15 @@ + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-moduleLTLIBRARIES: $(module_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" +- test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" - @list='$(module_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ @@ -14,7 +14,7 @@ - else :; fi; \ - done +@GTK2_TRUE@ @$(NORMAL_INSTALL) -+@GTK2_TRUE@ test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)" ++@GTK2_TRUE@ test -z "$(moduledir)" || $(MKDIR_P) "$(DESTDIR)$(moduledir)" +@GTK2_TRUE@ @list='$(module_LTLIBRARIES)'; for p in $$list; do \ +@GTK2_TRUE@ if test -f $$p; then \ +@GTK2_TRUE@ f=$(am__strip_dir) \ diff -Nru textproc/uim.orig/files/patch-helper:Makefile.in textproc/uim/files/patch-helper:Makefile.in --- textproc/uim.orig/files/patch-helper:Makefile.in Mon Jan 8 17:47:47 2007 +++ textproc/uim/files/patch-helper:Makefile.in Wed Feb 21 02:03:38 2007 @@ -1,11 +1,11 @@ ---- helper/Makefile.in.orig Fri Dec 16 17:10:59 2005 -+++ helper/Makefile.in Sat Dec 24 03:05:26 2005 -@@ -422,7 +422,7 @@ - @APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) - @APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@ @GNOME2_CFLAGS@ -Wall - @APPLET_TRUE@uim_toolbar_applet_SOURCES = toolbar-applet-gnome.c toolbar-common-gtk.c --@APPLET_TRUE@serverdir = $(libdir)/bonobo/servers -+@APPLET_TRUE@serverdir = $(prefix)/libdata/bonobo/servers - @APPLET_TRUE@server_DATA = GNOME_UimApplet.server - @APPLET_TRUE@server_in_files = $(server_DATA:=.in) - @APPLET_TRUE@server_in_in_files = $(server_in_files:=.in) +--- helper/Makefile.in.orig Wed Jan 3 21:40:57 2007 ++++ helper/Makefile.in Wed Jan 3 21:41:05 2007 +@@ -442,7 +442,7 @@ + # recent version of gcc has the option to suppress the warning + #uim_toolbar_applet_CFLAGS += -Wno-overlength-strings + @APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = toolbar-applet-gnome.c toolbar-common-gtk.c +-@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers ++@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers + @APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server + @APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in) + @APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in) diff -Nru textproc/uim.orig/pkg-plist textproc/uim/pkg-plist --- textproc/uim.orig/pkg-plist Mon Jan 8 17:47:47 2007 +++ textproc/uim/pkg-plist Wed Feb 21 02:03:38 2007 @@ -20,7 +20,7 @@ lib/libuim.a lib/libuim.la lib/libuim.so -lib/libuim.so.3 +lib/libuim.so.4 lib/uim/plugin/libuim-custom-enabler.a lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-custom-enabler.so @@ -93,6 +93,8 @@ %%DATADIR%%/pixmaps/hangul3.png %%DATADIR%%/pixmaps/hangul3.svg %%DATADIR%%/pixmaps/im_subst.svg +%%DATADIR%%/pixmaps/im_switcher.png +%%DATADIR%%/pixmaps/im_switcher.svg %%DATADIR%%/pixmaps/ipa-x-sampa.png %%DATADIR%%/pixmaps/ipa-x-sampa.svg %%DATADIR%%/pixmaps/ja_azik.png @@ -147,9 +149,10 @@ %%DATADIR%%/pixmaps/scim.svg %%DATADIR%%/pixmaps/skk.png %%DATADIR%%/pixmaps/skk.svg -%%DATADIR%%/pixmaps/switcher-icon.png %%DATADIR%%/pixmaps/tcode.png %%DATADIR%%/pixmaps/tcode.svg +%%DATADIR%%/pixmaps/trycode.png +%%DATADIR%%/pixmaps/trycode.svg %%DATADIR%%/pixmaps/tutcode.png %%DATADIR%%/pixmaps/tutcode.svg %%DATADIR%%/pixmaps/uim-dict.png @@ -180,6 +183,7 @@ %%DATADIR%%/spellcheck-custom.scm %%DATADIR%%/spellcheck.scm %%DATADIR%%/tcode.scm +%%DATADIR%%/trycode.scm %%DATADIR%%/tutcode-key-custom.scm %%DATADIR%%/tutcode.scm %%DATADIR%%/uim-db.scm @@ -195,7 +199,6 @@ @dirrmtry share/applications %%PORTDOCS%%@dirrm %%DOCSDIR_JA%% %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%DATADIR%%/helperdata @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% -@dirrmtry share/locale/ko/LC_MESSAGES -@dirrmtry share/locale/ko diff -Nru textproc/uim-el.orig/Makefile textproc/uim-el/Makefile --- textproc/uim-el.orig/Makefile Wed Feb 21 23:49:00 2007 +++ textproc/uim-el/Makefile Tue Feb 6 01:08:31 2007 @@ -6,7 +6,7 @@ # PORTNAME= uim-el -PORTVERSION= 1.2.1 +PORTVERSION= 1.3.1 CATEGORIES= textproc MASTER_SITES= http://uim.freedesktop.org/releases/ PKGNAMESUFFIX= -${EMACS_PORT_NAME} diff -Nru textproc/uim-el.orig/distinfo textproc/uim-el/distinfo --- textproc/uim-el.orig/distinfo Wed Feb 21 23:49:00 2007 +++ textproc/uim-el/distinfo Tue Feb 6 01:08:31 2007 @@ -1,3 +1,3 @@ -MD5 (uim-1.2.1.tar.gz) = c27e96ea57e5fcd38ddc72876a1d6d1c -SHA256 (uim-1.2.1.tar.gz) = e2f257df389a516885ccfb18a068f7c153425cfb31de8487106e9e33bb1dcfbc -SIZE (uim-1.2.1.tar.gz) = 2149696 +MD5 (uim-1.3.1.tar.gz) = 6b90d3247cb9244701db59941a4e1f09 +SHA256 (uim-1.3.1.tar.gz) = 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513 +SIZE (uim-1.3.1.tar.gz) = 2186681 diff -Nru textproc/uim-gnome.orig/Makefile textproc/uim-gnome/Makefile --- textproc/uim-gnome.orig/Makefile Wed Feb 21 23:50:26 2007 +++ textproc/uim-gnome/Makefile Mon Feb 19 02:23:11 2007 @@ -10,7 +10,8 @@ COMMENT= GNOME applets of uim input method USE_GNOME= gtk20 gnomepanel -LIB_DEPENDS= uim.3:${PORTSDIR}/textproc/uim +LIB_DEPENDS= uim.4:${PORTSDIR}/textproc/uim +RUN_DEPENDS= uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff -Nru textproc/uim-gtk.orig/Makefile textproc/uim-gtk/Makefile --- textproc/uim-gtk.orig/Makefile Mon Jan 8 17:47:47 2007 +++ textproc/uim-gtk/Makefile Mon Jan 8 17:47:57 2007 @@ -5,13 +5,12 @@ # $FreeBSD: ports/textproc/uim-gtk/Makefile,v 1.7 2006/10/14 08:54:47 marcus Exp $ # -PORTREVISION= 1 PKGNAMESUFFIX= -gtk COMMENT= GTK+ modules of uim input method USE_GNOME= gtk20 -LIB_DEPENDS= uim.3:${PORTSDIR}/textproc/uim +LIB_DEPENDS= uim.4:${PORTSDIR}/textproc/uim MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff -Nru textproc/uim-kde.orig/Makefile textproc/uim-kde/Makefile --- textproc/uim-kde.orig/Makefile Thu Jan 1 09:00:00 1970 +++ textproc/uim-kde/Makefile Thu Feb 22 00:57:53 2007 @@ -0,0 +1,51 @@ +# New ports collection makefile for: uim-kde +# Date created: 31 August 2003 +# Whom: MANTANI Nobutaka +# +# $FreeBSD: ports/textproc/uim-qt/Makefile,v 1.7 2006/09/03 14:09:23 nobutaka Exp $ +# + +PKGNAMESUFFIX= -kde + +COMMENT= KDE panel applet of uim input method + +LIB_DEPENDS= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 \ + uim.4:${PORTSDIR}/textproc/uim +RUN_DEPENDS= uim-pref-qt:${PORTSDIR}/textproc/uim-qt + +USE_KDELIBS_VER=3 +USE_AUTOTOOLS= libtool:15 + +MASTERDIR= ${.CURDIR}/../../textproc/uim +PKGDIR= ${.CURDIR} +CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \ + --enable-kde-applet=yes +CONFIGURE_ENV= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \ + CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + CXX="${CXX} -lc" \ + CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ + LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" +UIM_SLAVE= yes + +# This is normally handled by defining USE_QT_VER ... + +.if defined(PACKAGE_BUILDING) +TMPDIR?= /tmp +MAKE_ENV+= TMPDIR="${TMPDIR}" +CONFIGURE_ENV+= TMPDIR="${TMPDIR}" +.endif + +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in + +.if defined(WITHOUT_X11) +IGNORE= requires X11 +.endif + +do-build: + (cd ${WRKSRC}/qt && ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom" uim_panelapplet.la) + +do-install: + (cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install-appletLTLIBRARIES install-lnkDATA) + +.include "${MASTERDIR}/Makefile" diff -Nru textproc/uim-kde.orig/pkg-descr textproc/uim-kde/pkg-descr --- textproc/uim-kde.orig/pkg-descr Thu Jan 1 09:00:00 1970 +++ textproc/uim-kde/pkg-descr Wed Feb 21 02:03:44 2007 @@ -0,0 +1,3 @@ +KDE panel applet of uim input method. + +WWW: http://uim.freedesktop.org/wiki/ diff -Nru textproc/uim-kde.orig/pkg-plist textproc/uim-kde/pkg-plist --- textproc/uim-kde.orig/pkg-plist Thu Jan 1 09:00:00 1970 +++ textproc/uim-kde/pkg-plist Wed Feb 21 02:03:44 2007 @@ -0,0 +1,3 @@ +lib/kde3/uim_panelapplet.la +lib/kde3/uim_panelapplet.so +share/apps/kicker/applets/uimapplet.desktop diff -Nru textproc/uim-m17nlib.orig/Makefile textproc/uim-m17nlib/Makefile --- textproc/uim-m17nlib.orig/Makefile Tue Feb 6 02:12:30 2007 +++ textproc/uim-m17nlib/Makefile Sat Feb 17 18:31:47 2007 @@ -15,7 +15,7 @@ BUILD_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db LIB_DEPENDS= m17n.1:${PORTSDIR}/devel/m17n-lib \ - uim.3:${PORTSDIR}/textproc/uim + uim.4:${PORTSDIR}/textproc/uim RUN_DEPENDS= m17n-db:${PORTSDIR}/devel/m17n-db MASTERDIR= ${.CURDIR}/../../textproc/uim diff -Nru textproc/uim-qt.orig/Makefile textproc/uim-qt/Makefile --- textproc/uim-qt.orig/Makefile Mon Jan 8 17:47:47 2007 +++ textproc/uim-qt/Makefile Wed Feb 21 02:03:41 2007 @@ -10,11 +10,14 @@ COMMENT= QT modules of uim input method LIB_DEPENDS= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 \ - uim.3:${PORTSDIR}/textproc/uim + uim.4:${PORTSDIR}/textproc/uim + +USE_AUTOTOOLS= libtool:15 MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} -CONFIGURE_ARGS= --with-qt +CONFIGURE_ARGS= --with-qt --enable-pref --enable-default-toolkit=qt \ + --enable-kde-applet=no CONFIGURE_ENV= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \ CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ @@ -25,19 +28,19 @@ # This is normally handled by defining USE_QT_VER ... .if defined(PACKAGE_BUILDING) -TMPDIR?= /tmp -MAKE_ENV+= TMPDIR="${TMPDIR}" -CONFIGURE_ENV+= TMPDIR="${TMPDIR}" +TMPDIR?= /tmp +MAKE_ENV+= TMPDIR="${TMPDIR}" +CONFIGURE_ENV+= TMPDIR="${TMPDIR}" .endif -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-qt_Makefile.in .if defined(WITHOUT_X11) IGNORE= requires X11 .endif do-build: - (cd ${WRKSRC}/qt && ${GMAKE} LIBS="-luim -luim-custom") + (cd ${WRKSRC}/qt && ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom") do-install: (cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install) diff -Nru textproc/uim-qt.orig/pkg-plist textproc/uim-qt/pkg-plist --- textproc/uim-qt.orig/pkg-plist Mon Jan 8 17:47:47 2007 +++ textproc/uim-qt/pkg-plist Wed Feb 21 02:03:41 2007 @@ -1,7 +1,7 @@ bin/uim-chardict-qt bin/uim-im-switcher-qt +bin/uim-pref-qt bin/uim-toolbar-qt libexec/uim-candwin-qt %%DATADIR%%/helperdata/bushu.t share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo -@dirrm %%DATADIR%%/helperdata >Release-Note: >Audit-Trail: >Unformatted: