From f7f61ce6f1d774bc5b2a5b5529d2ef0317e70688 Mon Sep 17 00:00:00 2001 From: kevlo Date: Sat, 31 Oct 2009 12:50:02 +0000 Subject: [PATCH] Update to 1.4.9 ok ajacoutot@ --- inputmethods/scim/Makefile | 16 ++++++----- inputmethods/scim/distinfo | 10 +++---- .../scim/patches/patch-configs_Makefile_in | 12 ++++++++ inputmethods/scim/pkg/PLIST | 28 +++++++++++++++---- 4 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 inputmethods/scim/patches/patch-configs_Makefile_in diff --git a/inputmethods/scim/Makefile b/inputmethods/scim/Makefile index 97a8f4d7eca..d0712bc1a59 100644 --- a/inputmethods/scim/Makefile +++ b/inputmethods/scim/Makefile @@ -1,15 +1,14 @@ -# $OpenBSD: Makefile,v 1.3 2009/08/10 06:32:04 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2009/10/31 12:50:02 kevlo Exp $ SHARED_ONLY= Yes COMMENT= smart common input method platform -DISTNAME= scim-1.4.7 -PKGNAME= ${DISTNAME}p1 +DISTNAME= scim-1.4.9 -SHARED_LIBS += scim-1.0 0.0 # .10.3 -SHARED_LIBS += scim-x11utils-1.0 0.0 # .10.3 -SHARED_LIBS += scim-gtkutils-1.0 0.0 # .10.3 +SHARED_LIBS += scim-1.0 0.0 # .10.4 +SHARED_LIBS += scim-x11utils-1.0 0.0 # .10.4 +SHARED_LIBS += scim-gtkutils-1.0 0.0 # .10.4 CATEGORIES= inputmethods chinese japanese korean @@ -36,11 +35,14 @@ MODULES= devel/gettext \ RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 +FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/scim + USE_X11= Yes USE_GMAKE= Yes USE_LIBTOOL= Yes LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-gtk-im-module-dir="${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules" .include diff --git a/inputmethods/scim/distinfo b/inputmethods/scim/distinfo index bc4a047eee8..7041c23c08b 100644 --- a/inputmethods/scim/distinfo +++ b/inputmethods/scim/distinfo @@ -1,5 +1,5 @@ -MD5 (scim-1.4.7.tar.gz) = hA3P1CZKFENHjBiP90eYTg== -RMD160 (scim-1.4.7.tar.gz) = CyTiT1R845RpgRB2Qgv81B0ekGw= -SHA1 (scim-1.4.7.tar.gz) = VKsqsO8oqEwk+8MtN+mW7K5BbVA= -SHA256 (scim-1.4.7.tar.gz) = oIg7xZOEdrMyRxlP5hq1ziJOtPtovX+L78S6qKqoFgs= -SIZE (scim-1.4.7.tar.gz) = 3075769 +MD5 (scim-1.4.9.tar.gz) = l1ujSwEwTqgWasjqJ6qeiA== +RMD160 (scim-1.4.9.tar.gz) = +E1Rqtlv6MKzLvG5Iuv+lJn3DJA= +SHA1 (scim-1.4.9.tar.gz) = dxczlXX9v5CTCaeIguMMYMzp+Os= +SHA256 (scim-1.4.9.tar.gz) = 9y6XeeIgVl9gApI799aqmJG+K73c2RpOKi1eIK77qNA= +SIZE (scim-1.4.9.tar.gz) = 2928091 diff --git a/inputmethods/scim/patches/patch-configs_Makefile_in b/inputmethods/scim/patches/patch-configs_Makefile_in new file mode 100644 index 00000000000..254dd9a3e1b --- /dev/null +++ b/inputmethods/scim/patches/patch-configs_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-configs_Makefile_in,v 1.1 2009/10/31 12:50:02 kevlo Exp $ +--- configs/Makefile.in.orig Tue Oct 27 23:12:19 2009 ++++ configs/Makefile.in Tue Oct 27 23:12:28 2009 +@@ -290,7 +290,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + MAINTAINERCLEANFILES = Makefile.in + CLEANFILES = *.bak +-@SCIM_BUILD_CONFIG_SIMPLE_TRUE@configdir = $(sysconfdir)/scim ++@SCIM_BUILD_CONFIG_SIMPLE_TRUE@configdir = $(sysconfdir) + @SCIM_BUILD_CONFIG_SIMPLE_TRUE@config_DATA = config global + #config_source_data = $(foreach file, $(config_DATA), $(srcdir)/$(file)) + EXTRA_DIST = $(config_DATA) diff --git a/inputmethods/scim/pkg/PLIST b/inputmethods/scim/pkg/PLIST index ca51c183120..d1f5e373a3c 100644 --- a/inputmethods/scim/pkg/PLIST +++ b/inputmethods/scim/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/29 02:21:46 kevlo Exp $ +@comment $OpenBSD: PLIST,v 1.2 2009/10/31 12:50:02 kevlo Exp $ @bin bin/scim @bin bin/scim-config-agent bin/scim-setup @@ -49,9 +49,8 @@ include/scim-1.0/scim_types.h include/scim-1.0/scim_utility.h include/scim-1.0/x11/ include/scim-1.0/x11/scim_x11_utils.h -lib/gtk-2.0/immodules/ -lib/gtk-2.0/immodules/im-scim.la -lib/gtk-2.0/immodules/im-scim.so +lib/gtk-2.0/2.10.0/immodules/im-scim.la +lib/gtk-2.0/2.10.0/immodules/im-scim.so lib/libscim-1.0.la @lib lib/libscim-1.0.so.${LIBscim-1.0_VERSION} lib/libscim-gtkutils-1.0.la @@ -95,21 +94,40 @@ lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.so @bin lib/scim-1.0/scim-helper-manager @bin lib/scim-1.0/scim-launcher @bin lib/scim-1.0/scim-panel-gtk -share/applications/ share/applications/scim-setup.desktop share/control-center-2.0/ share/control-center-2.0/capplets/ share/control-center-2.0/capplets/scim-setup.desktop +share/examples/scim/ +share/examples/scim/config +@sample ${SYSCONFDIR}/config +share/examples/scim/global +@sample ${SYSCONFDIR}/global +share/locale/as/LC_MESSAGES/scim.mo +share/locale/bn_IN/LC_MESSAGES/scim.mo +share/locale/ca/LC_MESSAGES/scim.mo share/locale/cs/LC_MESSAGES/scim.mo share/locale/de/LC_MESSAGES/scim.mo +share/locale/es/LC_MESSAGES/scim.mo share/locale/fi/LC_MESSAGES/scim.mo share/locale/fr/LC_MESSAGES/scim.mo +share/locale/gu/LC_MESSAGES/scim.mo +share/locale/hi/LC_MESSAGES/scim.mo share/locale/it/LC_MESSAGES/scim.mo share/locale/ja/LC_MESSAGES/scim.mo +share/locale/kn/LC_MESSAGES/scim.mo share/locale/ko/LC_MESSAGES/scim.mo +share/locale/ml/LC_MESSAGES/scim.mo +share/locale/mr/LC_MESSAGES/scim.mo share/locale/nl/LC_MESSAGES/scim.mo share/locale/pa/LC_MESSAGES/scim.mo +share/locale/pt_BR/LC_MESSAGES/scim.mo +share/locale/ru/LC_MESSAGES/scim.mo +share/locale/sk/LC_MESSAGES/scim.mo share/locale/sv/LC_MESSAGES/scim.mo +share/locale/ta/LC_MESSAGES/scim.mo +share/locale/te/LC_MESSAGES/scim.mo +share/locale/vi/LC_MESSAGES/scim.mo share/locale/zh_CN/LC_MESSAGES/scim.mo share/locale/zh_TW/LC_MESSAGES/scim.mo share/pixmaps/