From owner-freebsd-ports Mon Sep 17 6: 0:51 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B67BA37B415 for ; Mon, 17 Sep 2001 06:00:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f8HD02131945; Mon, 17 Sep 2001 06:00:02 -0700 (PDT) (envelope-from gnats) Received: from aerotus.nobutaka.com (pl009.nas921.m-hiroshima.nttpc.ne.jp [210.153.226.9]) by hub.freebsd.org (Postfix) with ESMTP id 0B18537B414 for ; Mon, 17 Sep 2001 05:57:14 -0700 (PDT) Received: (from nobutaka@localhost) by triton.nobutaka.com (8.11.6/8.11.4) id f8HCkYq70240; Mon, 17 Sep 2001 21:46:34 +0900 (JST) (envelope-from nobutaka@nobutaka.com) Message-Id: <200109171246.f8HCkYq70240@triton.nobutaka.com> Date: Mon, 17 Sep 2001 21:46:34 +0900 (JST) From: MANTANI Nobutaka Reply-To: MANTANI Nobutaka To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/30629: Update port: japanese/eterm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 30629 >Category: ports >Synopsis: Update port: japanese/eterm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Sep 17 06:00:02 PDT 2001 >Closed-Date: >Last-Modified: >Originator: MANTANI Nobutaka >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD triton.nobutaka.com 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Sat Sep 15 14:57:32 JST 2001 nobutaka@triton.nobutaka.com:/usr/src/sys/i386/compile/TRITON i386 >Description: Update to 0.9.1. japanese/eterm becomes a slave port of x11/eterm. Added files: files/extra-patch-configure.in files/extra-patch-src:command.c files/extra-patch-src:feature.h Removed files: distinfo pkg-plist files/patch-ae files/patch-ah files/patch-ar files/patch-as files/patch-at files/patch-au files/patch-av files/patch-aw files/patch-ax files/patch-ay files/patch-az files/patch-ba files/patch-bb files/patch-bc >How-To-Repeat: >Fix: Index: eterm/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/eterm/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- eterm/Makefile 5 Oct 2000 06:57:40 -0000 1.14 +++ eterm/Makefile 16 Sep 2001 10:03:37 -0000 @@ -5,39 +5,30 @@ # $FreeBSD: ports/japanese/eterm/Makefile,v 1.14 2000/10/05 06:57:40 reg Exp $ # -PORTNAME= eterm -PORTVERSION= 0.9 -CATEGORIES= japanese x11 -MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \ - ftp://ftp.dti.ad.jp/pub/X/enlightenment/Eterm/ \ - ftp://ftp.kddlabs.co.jp/.10/X11/window_manager/enlightenment/Eterm/ \ - ftp://ftp.sogang.ac.kr/.c/tools/X11/Enlightenment/Eterm/ -DISTNAME= Eterm-${PORTVERSION} +MASTERDIR= ${.CURDIR}/../../x11/eterm MAINTAINER= nobutaka@nobutaka.com -BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html +EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure.in \ + ${.CURDIR}/files/extra-patch-src:command.c \ + ${.CURDIR}/files/extra-patch-src:feature.h + +USE_AUTOCONF= yes +CONFIGURE_ARGS= --enable-trans --enable-utmp \ + --enable-xim --with-theme-update \ + --with-backspace=bs --without-terminfo \ + --enable-multi-charset=kanji + +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist + +THEMES= Eterm auto chooser trans + +post-configure: + for theme in ${THEMES} ; do \ + ${CP} ${WRKSRC}/themes/$$theme/theme.cfg ${WRKSRC}/themes/$$theme/theme.cfg.bak ; \ + ${SED} -e "s,term_name Eterm,term_name kterm," < ${WRKSRC}/themes/$$theme/theme.cfg.bak > ${WRKSRC}/themes/$$theme/theme.cfg ; \ + ${RM} ${WRKSRC}/themes/$$theme/theme.cfg.bak ; \ + done -USE_GMAKE= yes -USE_X_PREFIX= yes -USE_IMLIB= yes -USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-trans=imlib --enable-utmp --enable-multi-charset=kanji \ - --enable-xim --with-theme-update -CONFIGURE_ENV= LIBS="-lxpg4" - -MAN1= Eterm.1 -INSTALLS_SHLIB= yes - -post-install: - @${CHMOD} 4711 ${PREFIX}/bin/Eterm -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/doc/Eterm.1.html ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/doc/Eterm_reference.html ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm -.endif - -.include +.include "${MASTERDIR}/Makefile" Index: eterm/distinfo =================================================================== RCS file: eterm/distinfo diff -N eterm/distinfo --- eterm/distinfo 13 Feb 2000 15:18:09 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1 +0,0 @@ -MD5 (Eterm-0.9.tar.gz) = 73dff9c93da8393b906d2713bb2d480d Index: eterm/pkg-descr =================================================================== RCS file: /home/ncvs/ports/japanese/eterm/pkg-descr,v retrieving revision 1.6 diff -u -r1.6 pkg-descr --- eterm/pkg-descr 13 Feb 2000 15:18:18 -0000 1.6 +++ eterm/pkg-descr 15 Sep 2001 05:52:16 -0000 @@ -4,7 +4,7 @@ If you want to input Japanese, use "--input-method" and "--preedit-type" option. -WWW: http://eterm.sourceforge.net/ +WWW: http://www.eterm.org/ -- MANTANI Nobutaka Index: eterm/pkg-plist =================================================================== RCS file: eterm/pkg-plist diff -N eterm/pkg-plist --- eterm/pkg-plist 5 Oct 2000 06:57:40 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,98 +0,0 @@ -bin/Esetroot -bin/Etbg -bin/Eterm -@exec chmod 4711 %D/bin/Eterm -bin/Ettable -bin/Etcolors -bin/Etwinop -lib/libEterm.a -lib/libEterm.so -lib/libEterm.so.9 -lib/libmej.a -lib/libmej.so -lib/libmej.so.9 -share/Eterm/pix/014.jpg -share/Eterm/pix/40.jpg -share/Eterm/pix/backwave.jpg -share/Eterm/pix/bar_horizontal_1.png -share/Eterm/pix/bar_horizontal_2.png -share/Eterm/pix/bar_horizontal_3.png -share/Eterm/pix/bar_vertical_1.png -share/Eterm/pix/bar_vertical_2.png -share/Eterm/pix/bar_vertical_3.png -share/Eterm/pix/blackstone.jpg -share/Eterm/pix/button_arrow_down_1.png -share/Eterm/pix/button_arrow_down_2.png -share/Eterm/pix/button_arrow_down_3.png -share/Eterm/pix/button_arrow_up_1.png -share/Eterm/pix/button_arrow_up_2.png -share/Eterm/pix/button_arrow_up_3.png -share/Eterm/pix/circuit.jpg -share/Eterm/pix/fourthday.jpg -share/Eterm/pix/gaia.jpg -share/Eterm/pix/galleon.jpg -share/Eterm/pix/menu1.png -share/Eterm/pix/menu2.png -share/Eterm/pix/menu3.png -share/Eterm/pix/nebula.jpg -share/Eterm/pix/night_of_the_dragon.jpg -share/Eterm/pix/pixmaps.list -share/Eterm/pix/scaled-pixmaps.list -share/Eterm/pix/tiled-pixmaps.list -share/Eterm/themes/Eterm/menus.cfg -share/Eterm/themes/Eterm/pixmaps.list -share/Eterm/themes/Eterm/scaled-pixmaps.list -share/Eterm/themes/Eterm/theme.cfg -share/Eterm/themes/Eterm/tiled-pixmaps.list -share/Eterm/themes/auto/menus.cfg -share/Eterm/themes/auto/pixmaps.list -share/Eterm/themes/auto/scaled-pixmaps.list -share/Eterm/themes/auto/theme.cfg -share/Eterm/themes/auto/tiled-pixmaps.list -share/Eterm/themes/cEterm/menus.cfg -share/Eterm/themes/cEterm/pixmaps.list -share/Eterm/themes/cEterm/scaled-pixmaps.list -share/Eterm/themes/cEterm/theme.cfg -share/Eterm/themes/cEterm/tiled-pixmaps.list -share/Eterm/themes/chooser/menus.cfg -share/Eterm/themes/chooser/pixmaps.list -share/Eterm/themes/chooser/scaled-pixmaps.list -share/Eterm/themes/chooser/theme.cfg -share/Eterm/themes/chooser/tiled-pixmaps.list -share/Eterm/themes/emacs/menus.cfg -share/Eterm/themes/emacs/pixmaps.list -share/Eterm/themes/emacs/scaled-pixmaps.list -share/Eterm/themes/emacs/theme.cfg -share/Eterm/themes/emacs/tiled-pixmaps.list -share/Eterm/themes/irc/menus.cfg -share/Eterm/themes/irc/pixmaps.list -share/Eterm/themes/irc/scaled-pixmaps.list -share/Eterm/themes/irc/theme.cfg -share/Eterm/themes/irc/tiled-pixmaps.list -share/Eterm/themes/mutt/menus.cfg -share/Eterm/themes/mutt/pixmaps.list -share/Eterm/themes/mutt/scaled-pixmaps.list -share/Eterm/themes/mutt/theme.cfg -share/Eterm/themes/mutt/tiled-pixmaps.list -share/Eterm/themes/trans/menus.cfg -share/Eterm/themes/trans/pixmaps.list -share/Eterm/themes/trans/scaled-pixmaps.list -share/Eterm/themes/trans/theme.cfg -share/Eterm/themes/trans/tiled-pixmaps.list -share/doc/Eterm/Eterm.1.html -share/doc/Eterm/Eterm_reference.html -share/doc/Eterm/Eterm.tcap -share/doc/Eterm/Eterm.ti -share/doc/Eterm/ReleaseNotes -@dirrm share/Eterm/themes/trans -@dirrm share/Eterm/themes/mutt -@dirrm share/Eterm/themes/irc -@dirrm share/Eterm/themes/emacs -@dirrm share/Eterm/themes/chooser -@dirrm share/Eterm/themes/cEterm -@dirrm share/Eterm/themes/auto -@dirrm share/Eterm/themes/Eterm -@dirrm share/Eterm/themes -@dirrm share/Eterm/pix -@dirrm share/Eterm -@dirrm share/doc/Eterm Index: eterm/files/extra-patch-configure.in =================================================================== RCS file: eterm/files/extra-patch-configure.in diff -N eterm/files/extra-patch-configure.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eterm/files/extra-patch-configure.in 15 Sep 2001 08:13:55 -0000 @@ -0,0 +1,52 @@ +--- configure.in.orig Fri Aug 24 09:22:54 2001 ++++ configure.in Sat Sep 15 17:13:21 2001 +@@ -319,11 +319,6 @@ + AC_CHECK_LIB(Xmu, XmuInternAtom) + fi + +-# check X11R6 for XIM +-if test "$XIM" = "TRUE"; then +- AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM)) +-fi +- + dnl# + dnl# FEATURES + dnl# +@@ -607,16 +602,16 @@ + AC_DEFINE(MULTI_CHARSET) + DEF_FONT_IDX=0 + MULTICHAR_ENCODING="eucj" +- FONT0="fixed" +- FONT1="8x16" +- FONT2="9x18" +- FONT3="12x24" +- FONT4="13x26" ++ FONT0="7x14" ++ FONT1="a10" ++ FONT2="r12" ++ FONT3="8x16" ++ FONT4="12x14" + MFONT0="k14" +- MFONT1="jiskan16" +- MFONT2="jiskan18" +- MFONT3="jiskan24" +- MFONT4="jiskan26" ++ MFONT1="k10" ++ MFONT2="k12" ++ MFONT3="kanji16" ++ MFONT4="kanji24" + elif test "$MULTI_CHARSET_TYPE" = "euc-kr" -o "$MULTI_CHARSET_TYPE" = "euckr"; then + AC_MSG_RESULT(euckr) + AC_DEFINE(MULTI_CHARSET) +@@ -724,6 +719,11 @@ + AC_DEFINE(USE_XIM) + XIM="TRUE" + ) ++ ++# check X11R6 for XIM ++if test "$XIM" = "TRUE"; then ++ AC_CHECK_LIB(X11, XRegisterIMInstantiateCallback, AC_DEFINE(USE_X11R6_XIM)) ++fi + + AC_MSG_CHECKING(for Greek keyboard support) + AC_ARG_ENABLE(greek, Index: eterm/files/extra-patch-src:command.c =================================================================== RCS file: eterm/files/extra-patch-src:command.c diff -N eterm/files/extra-patch-src:command.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eterm/files/extra-patch-src:command.c 15 Sep 2001 07:58:24 -0000 @@ -0,0 +1,13 @@ +--- src/command.c.orig Sat Sep 15 16:57:02 2001 ++++ src/command.c Sat Sep 15 16:57:24 2001 +@@ -1737,10 +1737,6 @@ + setlocale(LC_ALL, ""); + fontset = XCreateFontSet(Xdisplay, fontname, &ml, &mc, &ds); + FREE(fontname); +- if (mc) { +- XFreeStringList(ml); +- fontset = 0; +- } + } + return fontset; + } Index: eterm/files/extra-patch-src:feature.h =================================================================== RCS file: eterm/files/extra-patch-src:feature.h diff -N eterm/files/extra-patch-src:feature.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ eterm/files/extra-patch-src:feature.h 15 Sep 2001 08:21:36 -0000 @@ -0,0 +1,13 @@ +--- src/feature.h.orig Sat Sep 15 17:19:46 2001 ++++ src/feature.h Sat Sep 15 17:20:24 2001 +@@ -254,8 +254,8 @@ + #define APL_NAME "Eterm" + + /* COLORTERM, TERM environment variables */ +-#define TERMENV "Eterm" +-#define COLORTERMENV "Eterm" ++#define TERMENV "kterm" ++#define COLORTERMENV "kterm" + + #ifdef NO_MOUSE_REPORT + # ifndef NO_MOUSE_REPORT_SCROLLBAR Index: eterm/files/patch-ae =================================================================== RCS file: eterm/files/patch-ae diff -N eterm/files/patch-ae --- eterm/files/patch-ae 13 Feb 2000 15:18:10 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ ---- src/command.c.orig Mon Feb 7 22:20:41 2000 -+++ src/command.c Mon Feb 7 22:22:16 2000 -@@ -40,6 +40,8 @@ - #include "config.h" - #include "feature.h" - -+#undef HAVE_SAVED_UIDS -+ - /* System Headers */ - #include - #include -@@ -1560,6 +1562,9 @@ - # endif - # if VTIME != VEOL - tio->c_cc[VTIME] = 0; -+# endif -+# ifdef VSTATUS -+ tio->c_cc[VSTATUS] = CSTATUS; - # endif - - /* input modes */ Index: eterm/files/patch-ah =================================================================== RCS file: eterm/files/patch-ah diff -N eterm/files/patch-ah --- eterm/files/patch-ah 13 Feb 2000 15:18:12 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- themes/Makefile.in.orig Wed Feb 2 05:36:43 2000 -+++ themes/Makefile.in Wed Feb 9 03:46:59 2000 -@@ -239,6 +239,7 @@ - $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \ - $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \ - rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \ -+ rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in.orig ; \ - else \ - echo "ALERT! Not overwriting $$i theme in $(DESTDIR)$(pkgdatadir)/themes. You will need to update this theme manually." ; \ - fi ; \ Index: eterm/files/patch-ar =================================================================== RCS file: eterm/files/patch-ar diff -N eterm/files/patch-ar --- eterm/files/patch-ar 13 Feb 2000 15:18:15 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Mon Feb 7 21:50:25 2000 -+++ src/Makefile.in Mon Feb 7 21:51:29 2000 -@@ -120,7 +120,7 @@ - - - libEterm_la_DEPENDENCIES = $(top_builddir)/libmej/libmej.la feature.h --libEterm_la_LDFLAGS = -release $(VERSION) -+libEterm_la_LDFLAGS = -version-info 9:9:9 - - bin_PROGRAMS = Eterm - Eterm_SOURCES = main.c Index: eterm/files/patch-as =================================================================== RCS file: eterm/files/patch-as diff -N eterm/files/patch-as --- eterm/files/patch-as 13 Feb 2000 15:18:15 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- libmej/Makefile.in.orig Mon Feb 7 21:52:12 2000 -+++ libmej/Makefile.in Mon Feb 7 21:52:44 2000 -@@ -120,7 +120,7 @@ - - INCLUDES = -I. -I.. -I$(includedir) -I$(prefix)/include - --libmej_la_LDFLAGS = -release $(VERSION) -+libmej_la_LDFLAGS = -version-info 9:9:9 - - EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs Index: eterm/files/patch-at =================================================================== RCS file: eterm/files/patch-at diff -N eterm/files/patch-at --- eterm/files/patch-at 13 Feb 2000 15:18:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ ---- configure.orig Mon Feb 7 22:00:40 2000 -+++ configure Mon Feb 7 22:04:47 2000 -@@ -4835,16 +4835,16 @@ - - DEF_FONT_IDX=0 - MULTICHAR_ENCODING="eucj" -- FONT0="fixed" -- FONT1="8x16" -- FONT2="9x18" -- FONT3="12x24" -- FONT4="13x26" -+ FONT0="7x14" -+ FONT1="a10" -+ FONT2="r12" -+ FONT3="8x16" -+ FONT4="12x24" - MFONT0="k14" -- MFONT1="jiskan16" -- MFONT2="jiskan18" -- MFONT3="jiskan24" -- MFONT4="jiskan26" -+ MFONT1="k10" -+ MFONT2="k12" -+ MFONT3="kanji16" -+ MFONT4="kanji24" - elif test "$enableval" = "euc-kr" -o "$enableval" = "euckr"; then - echo "$ac_t""euckr" 1>&6 - cat >> confdefs.h <<\EOF Index: eterm/files/patch-au =================================================================== RCS file: eterm/files/patch-au diff -N eterm/files/patch-au --- eterm/files/patch-au 13 Feb 2000 15:18:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/Eterm/theme.cfg.in.orig Mon Feb 7 21:54:05 2000 -+++ themes/Eterm/theme.cfg.in Mon Feb 7 21:55:37 2000 -@@ -248,10 +248,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-av =================================================================== RCS file: eterm/files/patch-av diff -N eterm/files/patch-av --- eterm/files/patch-av 13 Feb 2000 15:18:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/auto/theme.cfg.in.orig Mon Feb 7 22:07:25 2000 -+++ themes/auto/theme.cfg.in Mon Feb 7 22:08:35 2000 -@@ -248,10 +248,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-aw =================================================================== RCS file: eterm/files/patch-aw diff -N eterm/files/patch-aw --- eterm/files/patch-aw 13 Feb 2000 15:18:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/cEterm/theme.cfg.in.orig Mon Feb 7 22:09:32 2000 -+++ themes/cEterm/theme.cfg.in Mon Feb 7 22:10:07 2000 -@@ -247,10 +247,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-ax =================================================================== RCS file: eterm/files/patch-ax diff -N eterm/files/patch-ax --- eterm/files/patch-ax 13 Feb 2000 15:18:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/chooser/theme.cfg.in.orig Mon Feb 7 22:10:53 2000 -+++ themes/chooser/theme.cfg.in Mon Feb 7 22:11:31 2000 -@@ -248,10 +248,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-ay =================================================================== RCS file: eterm/files/patch-ay diff -N eterm/files/patch-ay --- eterm/files/patch-ay 13 Feb 2000 15:18:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/emacs/theme.cfg.in.orig Mon Feb 7 22:12:28 2000 -+++ themes/emacs/theme.cfg.in Mon Feb 7 22:12:49 2000 -@@ -248,10 +248,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-az =================================================================== RCS file: eterm/files/patch-az diff -N eterm/files/patch-az --- eterm/files/patch-az 13 Feb 2000 15:18:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/irc/theme.cfg.in.orig Mon Feb 7 22:13:53 2000 -+++ themes/irc/theme.cfg.in Mon Feb 7 22:14:09 2000 -@@ -250,10 +250,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method Ami -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-ba =================================================================== RCS file: eterm/files/patch-ba diff -N eterm/files/patch-ba --- eterm/files/patch-ba 13 Feb 2000 15:18:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/mutt/theme.cfg.in.orig Mon Feb 7 22:14:53 2000 -+++ themes/mutt/theme.cfg.in Mon Feb 7 22:15:08 2000 -@@ -194,10 +194,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method Ami -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-bb =================================================================== RCS file: eterm/files/patch-bb diff -N eterm/files/patch-bb --- eterm/files/patch-bb 13 Feb 2000 15:18:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ ---- themes/trans/theme.cfg.in.orig Mon Feb 7 22:29:10 2000 -+++ themes/trans/theme.cfg.in Mon Feb 7 22:29:27 2000 -@@ -248,10 +248,10 @@ - # The XIM support options. - # input_method: set the name of your favorate input method program - # preedit_type: OverTheSpot or OffTheSpot or Root --# begin xim --# input_method Ami --# preedit_type OverTheSpot --# end xim -+ begin xim -+ input_method kinput2 -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. Index: eterm/files/patch-bc =================================================================== RCS file: eterm/files/patch-bc diff -N eterm/files/patch-bc --- eterm/files/patch-bc 13 Feb 2000 15:18:17 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- src/startup.c.orig Mon Feb 7 22:24:54 2000 -+++ src/startup.c Mon Feb 7 22:24:57 2000 -@@ -29,6 +29,8 @@ - #include "config.h" - #include "feature.h" - -+#define NEED_LINUX_HACK 1 -+ - #include - #include - #include >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message