diff options
author | rafan <rafan@FreeBSD.org> | 2009-12-27 07:19:03 +0000 |
---|---|---|
committer | rafan <rafan@FreeBSD.org> | 2009-12-27 07:19:03 +0000 |
commit | af1b7689a5c060869603c0a276319b20137e8fc7 (patch) | |
tree | cdcf12190b70befd90d831572b5f86d02f63e708 | |
parent | 348ea2ae2c7c99f57db692b6233b4238d939b402 (diff) | |
download | FreeBSD-ports-af1b7689a5c060869603c0a276319b20137e8fc7.zip FreeBSD-ports-af1b7689a5c060869603c0a276319b20137e8fc7.tar.gz |
- Update to 1.2.2 which is compatible with libchewing >= 0.3.2
- oxim-setup is now removed
-rw-r--r-- | chinese/oxim/Makefile | 29 | ||||
-rw-r--r-- | chinese/oxim/distinfo | 6 | ||||
-rw-r--r-- | chinese/oxim/files/patch-Makefile.in | 12 | ||||
-rw-r--r-- | chinese/oxim/files/patch-configure | 20 | ||||
-rw-r--r-- | chinese/oxim/files/patch-gtk-immodule-gtkintl.h | 9 | ||||
-rw-r--r-- | chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in | 13 | ||||
-rw-r--r-- | chinese/oxim/pkg-plist | 8 |
7 files changed, 33 insertions, 64 deletions
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile index 4005b47..fc6bda0 100644 --- a/chinese/oxim/Makefile +++ b/chinese/oxim/Makefile @@ -6,8 +6,7 @@ # PORTNAME= oxim -PORTVERSION= 1.1.6 -PORTREVISION= 3 +PORTVERSION= 1.2.2 CATEGORIES= chinese textproc MASTER_SITES= ftp://ftp.opendesktop.org.tw/odp/OXIM/Source/ \ ftp://apt.nc.hcc.edu.tw/pub/mirror/opendesktop.org.tw/OXIM/Source/ \ @@ -23,8 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/TrueType/fireflysung.ttf:${PORTSDIR}/chine OPTIONS= GTK2 "Enable GTK2 input method module" On \ CHEWING "Enable Chewing input module" On \ - UNICODE "Enable Unicode input module" On \ - SETUP "Enable GUI Setup Tool" On + UNICODE "Enable Unicode input module" On USE_ICONV= yes USE_XORG= x11 xft xpm xtst @@ -42,6 +40,8 @@ CONFIGURE_ARGS+=--disable-bimsphone-module \ # oxim requires qinputcontextplugin.h which only exists in Debian package CONFIGURE_ARGS+=--disable-qt-immodule +MAN1= oxim.1 + .include <bsd.port.pre.mk> .if defined(WITHOUT_GTK2) @@ -55,8 +55,8 @@ PLIST_SUB+= GTK2="" .if !defined(WITHOUT_CHEWING) # make sure we have the required libchewing -BUILD_DEPENDS+= zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing -RUN_DEPENDS+= zh-libchewing>=0.3.0_1:${PORTSDIR}/chinese/libchewing +BUILD_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing +RUN_DEPENDS+= zh-libchewing>=0.3.2:${PORTSDIR}/chinese/libchewing CONFIGURE_ARGS+= --enable-chewing-module CONFIGURE_ENV+= CHEWING_CFLAGS=-I${LOCALBASE}/include @@ -74,23 +74,6 @@ CONFIGURE_ARGS+= --disable-unicode-module PLIST_SUB+= UNICODE="@comment " .endif -.if !defined(WITHOUT_SETUP) -BUILD_DEPENDS+= qmake:${PORTSDIR}/devel/qmake - -CONFIGURE_ARGS+= --enable-setup-tool -PLIST_SUB+= SETUP="" - -USE_QT_VER= 3 -.include "${PORTSDIR}/Mk/bsd.kde.mk" - -QMAKESPEC?= freebsd-g++ -CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" -MAKE_ARGS+= LOCALBASE="${LOCALBASE}" MAKE="${MAKE}" QMAKESPEC="${QMAKESPEC}" -.else -CONFIGURE_ARGS+= --disable-setup-tool -PLIST_SUB+= SETUP="@comment " -.endif - # TODO WITHOUT_NLS knob #.if !defined(WITHOUT_NLS) USE_GETTEXT= yes diff --git a/chinese/oxim/distinfo b/chinese/oxim/distinfo index ad9215a3..8b19ecb 100644 --- a/chinese/oxim/distinfo +++ b/chinese/oxim/distinfo @@ -1,3 +1,3 @@ -MD5 (oxim-1.1.6.tar.gz) = dd317909d4cebfecdf6bfd60b44ba0a2 -SHA256 (oxim-1.1.6.tar.gz) = 450f4a3e80488e1b62ccfb894764f853847999914ffd1c74512509e1dff98d04 -SIZE (oxim-1.1.6.tar.gz) = 1900040 +MD5 (oxim-1.2.2.tar.gz) = c9629535e2462b246856243e1cb30b0c +SHA256 (oxim-1.2.2.tar.gz) = 69ef10285856f59e43893008f0f48f54534a800de37cb14f63484fd502b85f87 +SIZE (oxim-1.2.2.tar.gz) = 2214509 diff --git a/chinese/oxim/files/patch-Makefile.in b/chinese/oxim/files/patch-Makefile.in index cf909cf..f24f222 100644 --- a/chinese/oxim/files/patch-Makefile.in +++ b/chinese/oxim/files/patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig 2008-02-22 10:48:20.000000000 +0800 -+++ Makefile.in 2008-02-22 10:48:24.000000000 +0800 -@@ -677,8 +677,6 @@ +--- Makefile.in.orig 2009-03-25 08:36:20.000000000 +0800 ++++ Makefile.in 2009-12-27 14:41:45.000000000 +0800 +@@ -707,8 +707,6 @@ install-exec-local: - $(mkinstalldirs) $(DESTDIR)/$(input_d_dir) - sed 's|@OXIM_IM_MODULE_DIR@|$(IM_MODULES_DIR)|' oxim-start.sh.in > $(DESTDIR)/$(input_d_dir)/oxim - @ENABLE_SETUP_TOOL_TRUE@ $(mkinstalldirs) $(DESTDIR)/$(datadir)/applications - @ENABLE_SETUP_TOOL_TRUE@ $(INSTALL_DATA) oxim-setup.desktop $(DESTDIR)/$(datadir)/applications - @ENABLE_SETUP_TOOL_TRUE@ $(mkinstalldirs) $(DESTDIR)/$(datadir)/pixmaps + $(mkinstalldirs) $(DESTDIR)/$(mandir)/man1/ + $(INSTALL_DATA) oxim.1 $(DESTDIR)/$(mandir)/man1/oxim.1 + @ENABLE_EEEPC_TRUE@ $(mkinstalldirs) $(DESTDIR)/$(xsession_d_dir) diff --git a/chinese/oxim/files/patch-configure b/chinese/oxim/files/patch-configure index 96ee881..52bccf2 100644 --- a/chinese/oxim/files/patch-configure +++ b/chinese/oxim/files/patch-configure @@ -1,15 +1,15 @@ ---- ./configure.orig Fri Sep 22 17:19:58 2006 -+++ ./configure Mon Oct 9 09:38:36 2006 -@@ -29055,9 +29055,9 @@ +--- configure.orig 2009-03-25 08:36:16.000000000 +0800 ++++ configure 2009-12-27 14:42:27.000000000 +0800 +@@ -30785,9 +30785,9 @@ - echo "$as_me:$LINENO: checking for qmake" >&5 - echo $ECHO_N "checking for qmake... $ECHO_C" >&6 + { $as_echo "$as_me:$LINENO: checking for qmake" >&5 + $as_echo_n "checking for qmake... " >&6; } - if test -f ${qt_dir}/bin/qmake ; then -- echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5 --echo "${ECHO_T}${qt_dir}/bin/qmake" >&6 +- { $as_echo "$as_me:$LINENO: result: ${qt_dir}/bin/qmake" >&5 +-$as_echo "${qt_dir}/bin/qmake" >&6; } + if test -f ${LOCALBASE}/bin/qmake ; then -+ echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5 -+echo "${ECHO_T}${LOCALBASE}/bin/qmake" >&6 ++ { $as_echo "$as_me:$LINENO: result: ${LOCALBASE}/bin/qmake" >&5 ++$as_echo "${LOCALBASE}/bin/qmake" >&6; } have_qmake="yes" else - echo "$as_me:$LINENO: result: not found!" >&5 + { $as_echo "$as_me:$LINENO: result: not found!" >&5 diff --git a/chinese/oxim/files/patch-gtk-immodule-gtkintl.h b/chinese/oxim/files/patch-gtk-immodule-gtkintl.h index da511fe..96cc4bb 100644 --- a/chinese/oxim/files/patch-gtk-immodule-gtkintl.h +++ b/chinese/oxim/files/patch-gtk-immodule-gtkintl.h @@ -1,11 +1,10 @@ ---- src/gtk-immodule/gtkintl.h.orig Thu Mar 23 08:43:55 2006 -+++ src/gtk-immodule/gtkintl.h Thu Mar 23 08:46:33 2006 -@@ -1,7 +1,7 @@ +--- src/gtk-immodule/gtkintl.h.orig 2009-01-07 11:32:19.000000000 +0800 ++++ src/gtk-immodule/gtkintl.h 2009-12-27 14:43:18.000000000 +0800 +@@ -1,6 +1,6 @@ #ifndef __GTKINTL_H__ #define __GTKINTL_H__ - #define ENABLE_NLS 1 -#define GTK_LOCALEDIR "/usr/share/locale" +#define GTK_LOCALEDIR "%%PREFIX%%/share/locale" #define GETTEXT_PACKAGE "gtk20" - #ifdef ENABLE_NLS + #include <langinfo.h> diff --git a/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in b/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in deleted file mode 100644 index a461359..0000000 --- a/chinese/oxim/files/patch-src__util__oxim-setup__Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/util/oxim-setup/Makefile.in.orig Fri Sep 22 17:20:09 2006 -+++ ./src/util/oxim-setup/Makefile.in Mon Oct 9 09:39:52 2006 -@@ -474,8 +474,8 @@ - @ENABLE_SETUP_TOOL_TRUE@ main.cpp - - @ENABLE_SETUP_TOOL_TRUE@oxim-setup: oxim-setup.pro --@ENABLE_SETUP_TOOL_TRUE@ $(QTDIR)/bin/qmake oxim-setup.pro -o Makefile.qt --@ENABLE_SETUP_TOOL_TRUE@ QTDIR=$(QTDIR) make -f Makefile.qt -+@ENABLE_SETUP_TOOL_TRUE@ QMAKESPEC=$(QMAKESPEC) $(LOCALBASE)/bin/qmake oxim-setup.pro -o Makefile.qt -+@ENABLE_SETUP_TOOL_TRUE@ QTDIR=$(QTDIR) $(MAKE) -f Makefile.qt - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/chinese/oxim/pkg-plist b/chinese/oxim/pkg-plist index b42b259..f8f5eb5 100644 --- a/chinese/oxim/pkg-plist +++ b/chinese/oxim/pkg-plist @@ -1,6 +1,5 @@ bin/oxim bin/oxim-conv -%%SETUP%%bin/oxim-setup bin/oxim2tab etc/oxim/locale.list etc/oxim/oxim.conf @@ -24,15 +23,16 @@ lib/oxim/tables/cnscj.tab lib/oxim/tables/cnsphone.tab lib/oxim/tables/default.phr lib/oxim/tables/symbol.list -share/applications/oxim-setup.desktop -share/pixmaps/oxim-setup.png -@dirrmtry share/applications +share/locale/zh_CN/LC_MESSAGES/oxim.mo +share/locale/zh_HK/LC_MESSAGES/oxim.mo +share/locale/zh_TW/LC_MESSAGES/oxim.mo @dirrm etc/oxim @dirrm lib/oxim/immodules @dirrm lib/oxim/modules @dirrm lib/oxim/panels @dirrm lib/oxim/tables @dirrm lib/oxim +@dirrmtry share/locale/zh_HK %%GTK2%%@dirrmtry lib/gtk-2.0/immodules %%GTK2%%@dirrmtry lib/gtk-2.0 %%GTK2%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules |