From da6f3ec69f90011a6b6154ec2cde204a06ca4a4b Mon Sep 17 00:00:00 2001 From: Jacques Vidrine Date: Mon, 12 Apr 2004 16:22:17 +0000 Subject: Update 0.9 -> 1.0 --- japanese/im-ja/Makefile | 39 +++++++++++------- japanese/im-ja/distinfo | 4 +- japanese/im-ja/files/patch-configure | 42 +++++++++++++++++-- japanese/im-ja/files/patch-src%Makefile.in | 56 +++++++------------------- japanese/im-ja/files/patch-src%xim%Makefile.in | 11 +++++ japanese/im-ja/files/patch-src%xim-handler.c | 15 ------- japanese/im-ja/files/patch-src%xim-ic.c | 16 -------- japanese/im-ja/pkg-plist | 2 +- 8 files changed, 91 insertions(+), 94 deletions(-) create mode 100644 japanese/im-ja/files/patch-src%xim%Makefile.in delete mode 100644 japanese/im-ja/files/patch-src%xim-handler.c delete mode 100644 japanese/im-ja/files/patch-src%xim-ic.c (limited to 'japanese/im-ja') diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile index 2952d511a3d4..16e3a3cb7fe0 100644 --- a/japanese/im-ja/Makefile +++ b/japanese/im-ja/Makefile @@ -6,20 +6,15 @@ # PORTNAME= im-ja -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 1.0 CATEGORIES= japanese x11-toolkits MASTER_SITES= http://im-ja.sourceforge.net/ MAINTAINER= nectar@FreeBSD.org COMMENT= A Japanese input module for GTK2 -.if !defined(WITHOUT_CANNA) -LIB_DEPENDS+= RKC.1:${PORTSDIR}/japanese/Canna -.endif -.if !defined(WITHOUT_WNN) -LIB_DEPENDS+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib -.endif +OPTIONS+= CANNA "Use Canna" on +OPTIONS+= WNN "Use FreeWnn" on USE_X_PREFIX= yes USE_GMAKE= yes @@ -27,20 +22,34 @@ USE_LIBTOOL_VER=13 USE_GNOME= gnomeprefix gnomehack gnomepanel GNU_CONFIGURE= yes -.if defined(WITHOUT_CANNA) -CONFIGURE_ARGS+= --disable-canna -.endif -.if defined(WITHOUT_WNN) -CONFIGURE_ARGS+= --disable-wnn -.endif LIBS+= -L${LOCALBASE}/lib -L${X11BASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include +CPPFLAGS+= -DNO_MALLOC_H CONFIGURE_ENV= LIBS="${LIBS}" CPPFLAGS="${CPPFLAGS}" -MAN1= im-ja-conf.1 +MAN1= im-ja-conf.1 im-ja-xim-server.1 .include +.if defined(WITH_CANNA) +LIB_DEPENDS+= RKC.1:${PORTSDIR}/japanese/Canna +.else +CONFIGURE_ARGS+= --disable-canna +.endif +.if defined(WITH_WNN) +LIB_DEPENDS+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +.else +CONFIGURE_ARGS+= --disable-wnn +.endif + +post-patch: + ${FIND} ${WRKSRC} -name configure.in | ${XARGS} ${TOUCH} + ${FIND} ${WRKSRC} -name aclocal.m4 | ${XARGS} ${TOUCH} + ${FIND} ${WRKSRC} -name configure | ${XARGS} ${TOUCH} + ${FIND} ${WRKSRC} -name config.h.in | ${XARGS} ${TOUCH} + ${FIND} ${WRKSRC} -name Makefile.am | ${XARGS} ${TOUCH} + ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${TOUCH} + post-install: ${X11BASE}/bin/gtk-query-immodules-2.0 > \ ${X11BASE}/etc/gtk-2.0/gtk.immodules diff --git a/japanese/im-ja/distinfo b/japanese/im-ja/distinfo index c44bb979e75a..06e07401a40c 100644 --- a/japanese/im-ja/distinfo +++ b/japanese/im-ja/distinfo @@ -1,2 +1,2 @@ -MD5 (im-ja-0.9.tar.gz) = 2bde9e0d85b39591d132c700d5d87047 -SIZE (im-ja-0.9.tar.gz) = 717708 +MD5 (im-ja-1.0.tar.gz) = 0adc0e09db96ba416ce6ce72a77680e6 +SIZE (im-ja-1.0.tar.gz) = 663614 diff --git a/japanese/im-ja/files/patch-configure b/japanese/im-ja/files/patch-configure index 492eb99c36dd..1be57c399558 100644 --- a/japanese/im-ja/files/patch-configure +++ b/japanese/im-ja/files/patch-configure @@ -1,8 +1,8 @@ -*** configure.orig Tue Sep 2 17:14:05 2003 ---- configure Tue Sep 2 17:14:21 2003 +*** configure.orig Mon Apr 12 09:41:56 2004 +--- configure Mon Apr 12 09:42:55 2004 *************** -*** 7666,7671 **** ---- 7666,7672 ---- +*** 8185,8190 **** +--- 8185,8191 ---- # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -10,3 +10,37 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +*************** +*** 14905,14911 **** + #define IM_JA_BINDIR "$IM_JA_BINDIR" + _ACEOF + +! IM_JA_DATADIR="$im_ja_prefix/share/im-ja" + + cat >>confdefs.h <<_ACEOF + #define IM_JA_DATADIR "$IM_JA_DATADIR" +--- 14906,14912 ---- + #define IM_JA_BINDIR "$IM_JA_BINDIR" + _ACEOF + +! IM_JA_DATADIR="$im_ja_prefix/share/gnome/im-ja" + + cat >>confdefs.h <<_ACEOF + #define IM_JA_DATADIR "$IM_JA_DATADIR" +*************** +*** 14918,14924 **** + _ACEOF + + +! PIXMAPDIR="$im_ja_prefix/share/pixmaps" + + cat >>confdefs.h <<_ACEOF + #define PIXMAPDIR "$PIXMAPDIR" +--- 14919,14925 ---- + _ACEOF + + +! PIXMAPDIR="$im_ja_prefix/share/gnome/pixmaps" + + cat >>confdefs.h <<_ACEOF + #define PIXMAPDIR "$PIXMAPDIR" diff --git a/japanese/im-ja/files/patch-src%Makefile.in b/japanese/im-ja/files/patch-src%Makefile.in index 41bb6b4f6fd8..463635803262 100644 --- a/japanese/im-ja/files/patch-src%Makefile.in +++ b/japanese/im-ja/files/patch-src%Makefile.in @@ -1,41 +1,15 @@ -*** src/Makefile.in.orig Sat Feb 21 10:22:53 2004 ---- src/Makefile.in Sat Feb 21 10:39:38 2004 -*************** -*** 2429,2450 **** - - - ../IMdkit/libXimd.a : -! cd ../IMdkit; make - - gtk.immodules: Makefile.am $(module_LTLIBRARIES) -! /usr/bin/gtk-query-immodules-2.0 im-ja.la > gtk.immodules - - all-local: gtk.immodules - - romakana.c: hiragana-convtable.h zenkaku-convtable.h halfkata-convtable.h -- hiragana-convtable.h: hiragana-convtable.txt -- perl convtable.pl hiragana -- zenkaku-convtable.h: zenkaku-convtable.txt -- perl convtable.pl zenkaku -- halfkata-convtable.h: halfkata-convtable.txt -- perl convtable.pl halfkata -- jdata.dat: strokedata.h conv_jdata.pl -- perl conv_jdata.pl < strokedata.h > jdata.dat - # 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: ---- 2429,2442 ---- - - - ../IMdkit/libXimd.a : -! cd ../IMdkit; $(MAKE) - - gtk.immodules: Makefile.am $(module_LTLIBRARIES) -! gtk-query-immodules-2.0 im-ja.la > gtk.immodules - - all-local: gtk.immodules - - romakana.c: hiragana-convtable.h zenkaku-convtable.h halfkata-convtable.h - # 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: +--- src/Makefile.in.ORIG Mon Apr 12 08:00:59 2004 ++++ src/Makefile.in Mon Apr 12 08:01:22 2004 +@@ -512,12 +512,6 @@ + uninstall-recursive + + +-hiragana-convtable.h: hiragana-convtable.txt +- perl convtable.pl hiragana +-zenkaku-convtable.h: zenkaku-convtable.txt +- perl convtable.pl zenkaku +-halfkata-convtable.h: halfkata-convtable.txt +- perl convtable.pl halfkata + # 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/japanese/im-ja/files/patch-src%xim%Makefile.in b/japanese/im-ja/files/patch-src%xim%Makefile.in new file mode 100644 index 000000000000..504c008914ca --- /dev/null +++ b/japanese/im-ja/files/patch-src%xim%Makefile.in @@ -0,0 +1,11 @@ +--- src/xim/Makefile.in.ORIG Mon Apr 12 07:58:51 2004 ++++ src/xim/Makefile.in Mon Apr 12 07:59:06 2004 +@@ -1663,7 +1663,7 @@ + + + IMdkit/libXimd.a : +- cd IMdkit; make ++ cd IMdkit; $(MAKE) + # 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/japanese/im-ja/files/patch-src%xim-handler.c b/japanese/im-ja/files/patch-src%xim-handler.c deleted file mode 100644 index 81aa04fd2f02..000000000000 --- a/japanese/im-ja/files/patch-src%xim-handler.c +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/xim-handler.c -diff -u -p src/xim-handler.c.orig src/xim-handler.c ---- src/xim-handler.c.orig Wed Dec 17 13:17:26 2003 -+++ src/xim-handler.c Wed Mar 24 21:10:11 2004 -@@ -214,8 +214,9 @@ static Bool im_ja_xim_handler_destroy_ic - static Bool im_ja_xim_handler_set_ic_values(XIMS ims, IMProtocol *call_data) { - IMChangeICStruct *data = (IMChangeICStruct *)call_data; - -- IM_JA_DEBUG("im_ja_xim_handler_set_ic_values\n"); - IMJAContext *ic = im_ja_xim_server_get_ic(data->icid); -+ -+ IM_JA_DEBUG("im_ja_xim_handler_set_ic_values\n"); - - if (ic != NULL) im_ja_xim_ic_set_values(ic, data); - diff --git a/japanese/im-ja/files/patch-src%xim-ic.c b/japanese/im-ja/files/patch-src%xim-ic.c deleted file mode 100644 index 6cb073ebd263..000000000000 --- a/japanese/im-ja/files/patch-src%xim-ic.c +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/xim-ic.c -diff -u -p src/xim-ic.c.orig src/xim-ic.c ---- src/xim-ic.c.orig Wed Dec 17 13:17:26 2003 -+++ src/xim-ic.c Wed Mar 24 21:12:11 2004 -@@ -572,9 +572,9 @@ static void im_ja_xim_ic_set_preedit_bac - - - static void im_ja_xim_ic_load_preedit_fontset(IMJAContext *ic, char *font_name) { -- IM_JA_DEBUG("im_ja_xim_ic_load_preedit_fontset\n"); -- - IMJAXimFontSet *fontset; -+ -+ IM_JA_DEBUG("im_ja_xim_ic_load_preedit_fontset\n"); - - if (ic->preedit.base_font != NULL && strcmp(ic->preedit.base_font, font_name) == 0) { - // same font, do not create fontset diff --git a/japanese/im-ja/pkg-plist b/japanese/im-ja/pkg-plist index 8b2e33a83f54..b752c00d3357 100644 --- a/japanese/im-ja/pkg-plist +++ b/japanese/im-ja/pkg-plist @@ -1,8 +1,8 @@ bin/im-ja-conf bin/im-ja-xim-server etc/gconf/schemas/im-ja.schemas -lib/gnome-panel/im-ja-applet lib/gtk-2.0/2.4.0/immodules/im-ja.so +lib/im-ja/im-ja-applet lib/im-ja/kpengine @dirrm lib/im-ja libdata/bonobo/servers/GNOME_ImJaApplet.server -- cgit v1.2.3