Date: Thu, 13 Feb 2003 09:55:42 -0800 (PST) From: Yu-Shun Wang <yushunwa@isi.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48254: upgrade chinese/eterm from 0.9 to 0.9.1 Message-ID: <200302131755.h1DHtgbo051237@tnn.isi.edu>
next in thread | raw e-mail | index | archive | help
>Number: 48254 >Category: ports >Synopsis: upgrade chinese/eterm from 0.9 to 0.9.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 13 10:00:26 PST 2003 >Closed-Date: >Last-Modified: >Originator: Yu-Shun Wang >Release: FreeBSD 5.0-CURRENT i386 >Organization: USC Information Sciences Institute >Environment: System: FreeBSD tnn.isi.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Feb 12 18:06:18 PST 2003 root@tnn.isi.edu:/usr/obj/usr/src/sys/KERNEL-1.15 i386 >Description: Upgrade chinese/eterm port from 0.9 to 0.9.1. >How-To-Repeat: >Fix: --- eterm.PR begins here --- diff -ruN eterm.bak/Makefile eterm/Makefile --- eterm.bak/Makefile Wed Feb 12 16:46:18 2003 +++ eterm/Makefile Wed Feb 12 20:57:33 2003 @@ -3,47 +3,23 @@ # Whom: Michael C. Wu # $FreeBSD: ports/chinese/eterm/Makefile,v 1.6 2002/12/22 05:15:12 keichii Exp $ -PORTNAME= eterm -PORTVERSION= 0.9 CATEGORIES= chinese 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= ports@freebsd.org -BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html -RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts +EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure.in + +USE_AUTOCONF= yes +CONFIGURE_ARGS= --enable-trans --enable-utmp \ + --enable-xim --with-theme-update \ + --with-backspace=bs --without-terminfo \ + --enable-multi-charset=big5 + +PKGDIR= ${.CURDIR} +PLIST= ${MASTERDIR}/pkg-plist -USE_GMAKE= yes -USE_X_PREFIX= yes -USE_GNOMENG= yes -USE_GNOME= imlib -USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-trans=imlib --enable-multi-charset=big5 \ - --enable-xim --with-theme-update - -CONFIGURE_ENV= LIBS="-lxpg4" - -MAN1= Eterm.1 -INSTALLS_SHLIB= yes - -pre-patch: - @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \ - ${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c - -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 - @${CAT} ${PKGMESSAGE} +RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff -ruN eterm.bak/README.html eterm/README.html --- eterm.bak/README.html Wed Feb 12 16:46:18 2003 +++ eterm/README.html Wed Dec 31 16:00:00 1969 @@ -1,30 +0,0 @@ -<html> -<title> The FreeBSD Ports Collection (chinese/eterm)</title> -<head><h1> The FreeBSD Ports Collection ("chinese/eterm")</h1> </head> <hr> -<body> - -<p>You are now in the directory for the port "chinese/eterm" (package name "zh-eterm-0.9"). - -<p>This is the one-line description for this port: - -<p><hr><p> -X11 terminal emulator that supports Chinese GB/BIG-5 -<p><hr> - -<p>Please read the "<a href="pkg-descr">description file</a>" for a -longer description. - -<p>Go to the <a href="../../README.html">top of the ports tree</a> for -a summary on how to use the ports collection. - -<p> -This port requires package(s) "XFree86-libraries-4.2.1_5 expat-1.95.5 freetype2-2.1.2_1 gettext-0.11.5_1 glib-1.2.10_8 gmake-3.80 gtk-1.2.10_9 imake-4.2.0_1 imlib-1.9.14_1 jpeg-6b_1 libiconv-1.8_2 libtool-1.3.4_4 libungif-4.1.0b1 man2html-3.0.1_1 perl-5.6.1_11 pkgconfig-0.13.0 png-1.2.5 tiff-3.5.7" to build. -<p> -This port requires package(s) "XFree86-clients-4.2.1_2 XFree86-libraries-4.2.1_5 expat-1.95.5 freetype2-2.1.2_1 gettext-0.11.5_1 glib-1.2.10_8 gtk-1.2.10_9 imake-4.2.0_1 imlib-1.9.14_1 jpeg-6b_1 libiconv-1.8_2 libungif-4.1.0b1 perl-5.6.1_11 pkgconfig-0.13.0 png-1.2.5 tiff-3.5.7 zh-kcfonts-1.05" to run. - -<p><hr><p> -<a href="../README.html"> Go up one level</a> -| -<a href="../../README.html"> Go to top of ports tree</a> -</body> -</html> diff -ruN eterm.bak/distinfo eterm/distinfo --- eterm.bak/distinfo Wed Feb 12 16:46:18 2003 +++ eterm/distinfo Wed Dec 31 16:00:00 1969 @@ -1 +0,0 @@ -MD5 (Eterm-0.9.tar.gz) = 73dff9c93da8393b906d2713bb2d480d diff -ruN eterm.bak/files/extra-patch-configure.in eterm/files/extra-patch-configure.in --- eterm.bak/files/extra-patch-configure.in Wed Dec 31 16:00:00 1969 +++ eterm/files/extra-patch-configure.in Wed Feb 12 20:57:33 2003 @@ -0,0 +1,23 @@ +--- configure.in.orig Wed Feb 12 17:14:28 2003 ++++ configure.in Wed Feb 12 17:19:31 2003 +@@ -652,16 +652,10 @@ + AC_DEFINE(MULTI_CHARSET) + DEF_FONT_IDX=0 + MULTICHAR_ENCODING="big5" +- FONT0="8x16" +- FONT1="9x18" +- FONT2="10x20" +- FONT3="12x24" +- FONT4="13x26" +- MFONT0="-*-ming-medium-r-normal--16-*-*-*-c-*-big5-0" +- MFONT1="-*-ming-medium-r-normal--18-*-*-*-c-*-big5-0" +- MFONT2="-*-ming-medium-r-normal--20-*-*-*-c-*-big5-0" +- MFONT3="-*-ming-medium-r-normal--24-*-*-*-c-*-big5-0" +- MFONT4="-*-ming-medium-r-normal--26-*-*-*-c-*-big5-0" ++ FONT0="kc8x15" ++ FONT1="kc12x24" ++ MFONT0="kc15f" ++ MFONT1="kc24f" + else + MULTI_CHARSET_TYPE="" + fi diff -ruN eterm.bak/files/patch-ae eterm/files/patch-ae --- eterm.bak/files/patch-ae Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ae Wed Dec 31 16:00:00 1969 @@ -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 <stdio.h> - #include <stdlib.h> -@@ -1560,6 +1562,9 @@ - # endif - # if VTIME != VEOL - tio->c_cc[VTIME] = 0; -+# endif -+# ifdef VSTATUS -+ tio->c_cc[VSTATUS] = CSTATUS; - # endif - - /* input modes */ diff -ruN eterm.bak/files/patch-ah eterm/files/patch-ah --- eterm.bak/files/patch-ah Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ah Wed Dec 31 16:00:00 1969 @@ -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 ; \ diff -ruN eterm.bak/files/patch-ar eterm/files/patch-ar --- eterm.bak/files/patch-ar Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ar Wed Dec 31 16:00:00 1969 @@ -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 diff -ruN eterm.bak/files/patch-as eterm/files/patch-as --- eterm.bak/files/patch-as Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-as Wed Dec 31 16:00:00 1969 @@ -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 diff -ruN eterm.bak/files/patch-at eterm/files/patch-at --- eterm.bak/files/patch-at Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-at Wed Dec 31 16:00:00 1969 @@ -1,495 +0,0 @@ ---- configure.orig Sat Jan 29 03:29:45 2000 -+++ configure Mon Dec 25 13:29:58 2000 -@@ -4881,6 +4881,18 @@ - FONT2="fixed" - FONT3="8x13" - FONT4="9x15" -+ elif test "$enableval" = "big5" -o "$enableval" = "big5"; then -+ echo "$ac_t""big5" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define MULTI_CHARSET 1 -+EOF -+ -+ DEF_FONT_IDX=0 -+ MULTICHAR_ENCODING="big5" -+ MFONT0="kc15f" -+ MFONT1="kc24f" -+ FONT0="kc8x15" -+ FONT1="kc12x24" - elif test "$enableval" = "no"; then - echo "$ac_t""no" 1>&6 - DEF_FONT_IDX=2 -@@ -4973,7 +4985,7 @@ - - - echo $ac_n "checking for XIM support""... $ac_c" 1>&6 --echo "configure:4977: checking for XIM support" >&5 -+echo "configure:4989: checking for XIM support" >&5 - # Check whether --enable-xim or --disable-xim was given. - if test "${enable_xim+set}" = set; then - enableval="$enable_xim" -@@ -4994,7 +5006,7 @@ - fi - - echo $ac_n "checking for Greek keyboard support""... $ac_c" 1>&6 --echo "configure:4998: checking for Greek keyboard support" >&5 -+echo "configure:5010: checking for Greek keyboard support" >&5 - # Check whether --enable-greek or --disable-greek was given. - if test "${enable_greek+set}" = set; then - enableval="$enable_greek" -@@ -5029,7 +5041,7 @@ - - - echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 --echo "configure:5033: checking for XOpenDisplay in -lX11" >&5 -+echo "configure:5045: checking for XOpenDisplay in -lX11" >&5 - ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5037,7 +5049,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $X_LIBS $SUBLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5041 "configure" -+#line 5053 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5048,7 +5060,7 @@ - XOpenDisplay() - ; return 0; } - EOF --if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5075,7 +5087,7 @@ - fi - - echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 --echo "configure:5079: checking for XextAddDisplay in -lXext" >&5 -+echo "configure:5091: checking for XextAddDisplay in -lXext" >&5 - ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5083,7 +5095,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $X_LIBS $SUBLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5087 "configure" -+#line 5099 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5094,7 +5106,7 @@ - XextAddDisplay() - ; return 0; } - EOF --if { (eval echo configure:5098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5122,7 +5134,7 @@ - - - echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6 --echo "configure:5126: checking for XShapeQueryExtension in -lXext" >&5 -+echo "configure:5138: checking for XShapeQueryExtension in -lXext" >&5 - ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5130,7 +5142,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lXext $X_LIBS $SUBLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5134 "configure" -+#line 5146 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5141,7 +5153,7 @@ - XShapeQueryExtension() - ; return 0; } - EOF --if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5167,7 +5179,7 @@ - - # check if we need X_LOCALE definition - echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 --echo "configure:5171: checking for _Xsetlocale in -lX11" >&5 -+echo "configure:5183: checking for _Xsetlocale in -lX11" >&5 - ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5175,7 +5187,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5179 "configure" -+#line 5191 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5186,7 +5198,7 @@ - _Xsetlocale() - ; return 0; } - EOF --if { (eval echo configure:5190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5221,7 +5233,7 @@ - # check X11R6 for XIM - if test "$XIM" = "TRUE"; then - echo $ac_n "checking for XRegisterIMInstantiateCallback in -lX11""... $ac_c" 1>&6 --echo "configure:5225: checking for XRegisterIMInstantiateCallback in -lX11" >&5 -+echo "configure:5237: checking for XRegisterIMInstantiateCallback in -lX11" >&5 - ac_lib_var=`echo X11'_'XRegisterIMInstantiateCallback | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5229,7 +5241,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lX11 $X_LIBS $SUBLIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5233 "configure" -+#line 5245 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5240,7 +5252,7 @@ - XRegisterIMInstantiateCallback() - ; return 0; } - EOF --if { (eval echo configure:5244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5270,7 +5282,7 @@ - # Extract the first word of "imlib-config", so it can be a program name with args. - set dummy imlib-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5274: checking for $ac_word" >&5 -+echo "configure:5286: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_IMLIB_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5302,18 +5314,18 @@ - - if test "$prefix" = "NONE"; then - echo $ac_n "checking imlib-config for prefix""... $ac_c" 1>&6 --echo "configure:5306: checking imlib-config for prefix" >&5 -+echo "configure:5318: checking imlib-config for prefix" >&5 - prefix="`$IMLIB_CONFIG --prefix`" - echo "$ac_t""$prefix" 1>&6 - fi - - echo $ac_n "checking imlib-config for the value of CFLAGS""... $ac_c" 1>&6 --echo "configure:5312: checking imlib-config for the value of CFLAGS" >&5 -+echo "configure:5324: checking imlib-config for the value of CFLAGS" >&5 - CFLAGS="$CFLAGS `$IMLIB_CONFIG --cflags`" - echo "$ac_t""$CFLAGS" 1>&6 - - echo $ac_n "checking imlib-config for the value of GRLIBS""... $ac_c" 1>&6 --echo "configure:5317: checking imlib-config for the value of GRLIBS" >&5 -+echo "configure:5329: checking imlib-config for the value of GRLIBS" >&5 - GRLIBS="$GRLIBS `$IMLIB_CONFIG --libs`" - echo "$ac_t""$GRLIBS" 1>&6 - -@@ -5321,16 +5333,16 @@ - LIBS="$GRLIBS" - - echo $ac_n "checking the sanity of new compile/link flags""... $ac_c" 1>&6 --echo "configure:5325: checking the sanity of new compile/link flags" >&5 -+echo "configure:5337: checking the sanity of new compile/link flags" >&5 - cat > conftest.$ac_ext <<EOF --#line 5327 "configure" -+#line 5339 "configure" - #include "confdefs.h" - - int main() { - - ; return 0; } - EOF --if { (eval echo configure:5334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "yes" - else -@@ -5350,7 +5362,7 @@ - if test "$IMLIB_CONFIG" = "no"; then - - echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 --echo "configure:5354: checking for png_get_valid in -lpng" >&5 -+echo "configure:5366: checking for png_get_valid in -lpng" >&5 - ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5358,7 +5370,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lpng $SUBLIBS $X_LIBS -lz -lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5362 "configure" -+#line 5374 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5369,7 +5381,7 @@ - png_get_valid() - ; return 0; } - EOF --if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5390,7 +5402,7 @@ - fi - - echo $ac_n "checking for jpeg_read_scanlines in -ljpeg""... $ac_c" 1>&6 --echo "configure:5394: checking for jpeg_read_scanlines in -ljpeg" >&5 -+echo "configure:5406: checking for jpeg_read_scanlines in -ljpeg" >&5 - ac_lib_var=`echo jpeg'_'jpeg_read_scanlines | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5398,7 +5410,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ljpeg $SUBLIBS $X_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5402 "configure" -+#line 5414 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5409,7 +5421,7 @@ - jpeg_read_scanlines() - ; return 0; } - EOF --if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5430,7 +5442,7 @@ - fi - - echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 --echo "configure:5434: checking for TIFFOpen in -ltiff" >&5 -+echo "configure:5446: checking for TIFFOpen in -ltiff" >&5 - ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5438,7 +5450,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-ltiff $SUBLIBS $X_LIBS -lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5442 "configure" -+#line 5454 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5449,7 +5461,7 @@ - TIFFOpen() - ; return 0; } - EOF --if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5470,7 +5482,7 @@ - fi - - echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 --echo "configure:5474: checking for DGifOpenFileName in -lgif" >&5 -+echo "configure:5486: checking for DGifOpenFileName in -lgif" >&5 - ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5478,7 +5490,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lgif $SUBLIBS $X_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5482 "configure" -+#line 5494 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5489,7 +5501,7 @@ - DGifOpenFileName() - ; return 0; } - EOF --if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5510,7 +5522,7 @@ - fi - - echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 --echo "configure:5514: checking for DGifOpenFileName in -lungif" >&5 -+echo "configure:5526: checking for DGifOpenFileName in -lungif" >&5 - ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5518,7 +5530,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lungif $SUBLIBS $X_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5522 "configure" -+#line 5534 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5529,7 +5541,7 @@ - DGifOpenFileName() - ; return 0; } - EOF --if { (eval echo configure:5533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5550,7 +5562,7 @@ - fi - - echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 --echo "configure:5554: checking for Imlib_init in -lImlib" >&5 -+echo "configure:5566: checking for Imlib_init in -lImlib" >&5 - ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5558,7 +5570,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lImlib $GRLIBS $SUBLIBS $X_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5562 "configure" -+#line 5574 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5569,7 +5581,7 @@ - Imlib_init() - ; return 0; } - EOF --if { (eval echo configure:5573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5611,7 +5623,7 @@ - # Extract the first word of "Eterm", so it can be a program name with args. - set dummy Eterm; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5615: checking for $ac_word" >&5 -+echo "configure:5627: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ETERM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5653,7 +5665,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5657: checking for $ac_word" >&5 -+echo "configure:5669: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GCC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5715,7 +5727,7 @@ - # Extract the first word of "dbx", so it can be a program name with args. - set dummy dbx; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5719: checking for $ac_word" >&5 -+echo "configure:5731: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_DBX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5757,7 +5769,7 @@ - # Extract the first word of "gdb", so it can be a program name with args. - set dummy gdb; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5761: checking for $ac_word" >&5 -+echo "configure:5773: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GDB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5799,7 +5811,7 @@ - # Extract the first word of "pstack", so it can be a program name with args. - set dummy pstack; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5803: checking for $ac_word" >&5 -+echo "configure:5815: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PSTACK'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -5839,7 +5851,7 @@ - - fi - echo $ac_n "checking for U_STACK_TRACE in -lcl""... $ac_c" 1>&6 --echo "configure:5843: checking for U_STACK_TRACE in -lcl" >&5 -+echo "configure:5855: checking for U_STACK_TRACE in -lcl" >&5 - ac_lib_var=`echo cl'_'U_STACK_TRACE | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5847,7 +5859,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lcl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5851 "configure" -+#line 5863 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5858,7 +5870,7 @@ - U_STACK_TRACE() - ; return 0; } - EOF --if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -5881,7 +5893,7 @@ - fi - - echo $ac_n "checking for Linux 2.1 or higher""... $ac_c" 1>&6 --echo "configure:5885: checking for Linux 2.1 or higher" >&5 -+echo "configure:5897: checking for Linux 2.1 or higher" >&5 - OS_NAME=`uname -s` - if test "$OS_NAME" = "Linux"; then - OS_REV=`uname -r` -@@ -5911,7 +5923,7 @@ - - if test -z "$HUMOR"; then - echo $ac_n "checking for life_signs in -lKenny""... $ac_c" 1>&6 --echo "configure:5915: checking for life_signs in -lKenny" >&5 -+echo "configure:5927: checking for life_signs in -lKenny" >&5 - ac_lib_var=`echo Kenny'_'life_signs | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5919,7 +5931,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lKenny $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5923 "configure" -+#line 5935 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -5930,7 +5942,7 @@ - life_signs() - ; return 0; } - EOF --if { (eval echo configure:5934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else diff -ruN eterm.bak/files/patch-au eterm/files/patch-au --- eterm.bak/files/patch-au Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-au Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/Eterm/theme.cfg.in.orig Fri Jan 7 23:51:12 2000 -+++ themes/Eterm/theme.cfg.in Mon Dec 25 13:33:16 2000 -@@ -84,25 +84,17 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 - # font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -248,10 +240,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -342,7 +334,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - # exec foo diff -ruN eterm.bak/files/patch-av eterm/files/patch-av --- eterm.bak/files/patch-av Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-av Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/auto/theme.cfg.in.orig Fri Jan 7 23:51:14 2000 -+++ themes/auto/theme.cfg.in Mon Dec 25 13:35:29 2000 -@@ -84,25 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -248,10 +239,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -337,7 +328,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - # exec foo diff -ruN eterm.bak/files/patch-aw eterm/files/patch-aw --- eterm.bak/files/patch-aw Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-aw Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/cEterm/theme.cfg.in.orig Fri Jan 7 23:51:16 2000 -+++ themes/cEterm/theme.cfg.in Mon Dec 25 13:36:20 2000 -@@ -83,25 +83,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -247,10 +238,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 xim -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -331,7 +322,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - # exec foo diff -ruN eterm.bak/files/patch-ax eterm/files/patch-ax --- eterm.bak/files/patch-ax Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ax Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/chooser/theme.cfg.in.orig Fri Jan 7 23:51:17 2000 -+++ themes/chooser/theme.cfg.in Mon Dec 25 13:36:58 2000 -@@ -84,25 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -248,10 +239,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -332,7 +323,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - # exec foo diff -ruN eterm.bak/files/patch-ay eterm/files/patch-ay --- eterm.bak/files/patch-ay Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ay Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/emacs/theme.cfg.in.orig Fri Jan 7 23:51:19 2000 -+++ themes/emacs/theme.cfg.in Mon Dec 25 13:37:28 2000 -@@ -84,25 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -248,10 +239,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -332,7 +323,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - exec emacs -nw diff -ruN eterm.bak/files/patch-az eterm/files/patch-az --- eterm.bak/files/patch-az Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-az Wed Dec 31 16:00:00 1969 @@ -1,59 +0,0 @@ ---- themes/irc/theme.cfg.in.orig Fri Jan 7 23:51:21 2000 -+++ themes/irc/theme.cfg.in Mon Dec 25 13:38:03 2000 -@@ -84,27 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 8x13 -- font 6 9x15 -- font 7 10x20 -- font 8 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -250,10 +239,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -339,7 +328,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - exec irc diff -ruN eterm.bak/files/patch-ba eterm/files/patch-ba --- eterm.bak/files/patch-ba Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-ba Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/mutt/theme.cfg.in.orig Fri Jan 7 23:51:21 2000 -+++ themes/mutt/theme.cfg.in Mon Dec 25 13:38:25 2000 -@@ -84,25 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -194,10 +185,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -283,7 +274,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - exec mutt diff -ruN eterm.bak/files/patch-bb eterm/files/patch-bb --- eterm.bak/files/patch-bb Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-bb Wed Dec 31 16:00:00 1969 @@ -1,57 +0,0 @@ ---- themes/trans/theme.cfg.in.orig Fri Jan 7 23:51:22 2000 -+++ themes/trans/theme.cfg.in Mon Dec 25 13:38:51 2000 -@@ -84,25 +84,16 @@ - font default @DEF_FONT_IDX@ - font 0 @FONT0@ - font 1 @FONT1@ -- font 2 @FONT2@ -- font 3 @FONT3@ -- font 4 @FONT4@ -- font 5 10x20 -- font 6 12x24 --# font bold 7x14 - end attributes - - # The Multichar support options. Same goes for these fonts as for the normal - # ones. The "encoding" attribute can be either "eucj" or "sjis" or "euckr" - # or big5 or gb --# begin multichar --# font 0 @MFONT0@ --# font 1 @MFONT1@ --# font 2 @MFONT2@ --# font 3 @MFONT3@ --# font 4 @MFONT4@ --# encoding @MULTICHAR_ENCODING@ --# end multichar -+ begin multichar -+ font 0 @MFONT0@ -+ font 1 @MFONT1@ -+ encoding @MULTICHAR_ENCODING@ -+ end multichar - - # Define the imageclasses. - begin imageclasses -@@ -248,10 +239,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 xcin -+ preedit_type OverTheSpot -+ end xim - - # Boolean variables. The values can be "1", "on", or "true" for TRUE, or "0", - # "off", or "false" for FALSE. -@@ -335,7 +326,7 @@ - # line_space 2 - - # Value to use for $TERM -- term_name xterm -+ term_name xterm-color - - # Program to exec (intended for use with themes) - # exec foo diff -ruN eterm.bak/files/patch-bc eterm/files/patch-bc --- eterm.bak/files/patch-bc Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-bc Wed Dec 31 16:00:00 1969 @@ -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 <stdio.h> - #include <stdlib.h> - #include <string.h> diff -ruN eterm.bak/files/patch-zh eterm/files/patch-zh --- eterm.bak/files/patch-zh Wed Feb 12 16:46:18 2003 +++ eterm/files/patch-zh Wed Dec 31 16:00:00 1969 @@ -1,37 +0,0 @@ ---- src/options.c.orig Tue Jan 18 22:17:19 2000 -+++ src/options.c Sun Dec 24 10:56:22 2000 -@@ -362,7 +362,7 @@ - OPT_LONG("mfont2", "multichar font 2", &rs_mfont[2]), - OPT_LONG("mfont3", "multichar font 3", &rs_mfont[3]), - OPT_LONG("mfont4", "multichar font 4", &rs_mfont[4]), -- OPT_LONG("mencoding", "multichar encoding mode (eucj or sjis or euckr)", -+ OPT_LONG("mencoding", "multichar encoding mode (eucj or sjis or euckr or big5 or gb)", - &rs_multichar_encoding), - #endif /* MULTI_CHARSET */ - #ifdef USE_XIM -@@ -2794,12 +2794,13 @@ - if (rs_multichar_encoding != NULL) { - if (BEG_STRCASECMP(rs_multichar_encoding, "eucj") - && BEG_STRCASECMP(rs_multichar_encoding, "sjis") -- && BEG_STRCASECMP(rs_multichar_encoding, "euckr")) { -+ && BEG_STRCASECMP(rs_multichar_encoding, "euckr") -+ && BEG_STRCASECMP(rs_multichar_encoding, "big5") -+ && BEG_STRCASECMP(rs_multichar_encoding, "gb")) { - print_error("Parse error in file %s, line %lu: Invalid multichar encoding mode \"%s\"", - file_peek_path(), file_peek_line(), rs_multichar_encoding); - return; - } -- set_multichar_encoding(rs_multichar_encoding); - } else { - print_error("Parse error in file %s, line %lu: Invalid parameter list \"\" for attribute encoding", - file_peek_path(), file_peek_line()); -@@ -3248,6 +3249,9 @@ - } - } - #ifdef MULTI_CHARSET -+ if (rs_multichar_encoding) { -+ set_multichar_encoding(rs_multichar_encoding); -+ } - if (rs_mfont[i]) { - if (def_font_idx == 0) { - eterm_font_add(&etmfonts, rs_mfont[i], i); diff -ruN eterm.bak/pkg-comment eterm/pkg-comment --- eterm.bak/pkg-comment Wed Feb 12 16:46:18 2003 +++ eterm/pkg-comment Wed Feb 12 20:57:33 2003 @@ -1 +1 @@ -X11 terminal emulator that supports Chinese GB/BIG-5 +X11 terminal emulator based on rxvt/xterm that supports traditional Chinese (Big5) diff -ruN eterm.bak/pkg-descr eterm/pkg-descr --- eterm.bak/pkg-descr Wed Feb 12 16:46:18 2003 +++ eterm/pkg-descr Wed Feb 12 20:57:33 2003 @@ -1,7 +1,9 @@ -Eterm is a color vt102 terminal emulator for X Window system. -It supports pixmap and pseudo-transparent background. It also -supports Japanese input with XIM (X Input Method) protocol. +Eterm is a color vt102 terminal emulator intended as a replacement for +xterm. It is designed with a Freedom of Choice philosophy, leaving as +much power, flexibility, and freedom as possible in the hands of the +user. It is designed to look good and work well, but takes a +feature-rich approach rather than one of minimalism while still +maintaining speed and efficiency. + +WWW: http://www.eterm.org/ -WWW: http://eterm.sourceforge.net/ --- -Michael C. Wu <keichii@iteration.net> diff -ruN eterm.bak/pkg-message eterm/pkg-message --- eterm.bak/pkg-message Wed Feb 12 16:46:18 2003 +++ eterm/pkg-message Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ ------------------------------------------------------------------------------ -If you want to input Chinese, use the following command: -Eterm --font <English font> --mfont <Chinese font> --mencoding <encoding> \ - --input-method xcin - -Example: -Eterm --font "-*-medium-r-normal-*-*-160-*-*-c-*-iso8859-1" \ - --mfont kc15f --mencoding big5 --input-method xcin \ - --preedit-type OverTheSpot -8 -g 80x24 -B next -O \ - --cmod 200 --scrollbar-width 10 --scrollbar-popup ------------------------------------------------------------------------------ diff -ruN eterm.bak/pkg-plist eterm/pkg-plist --- eterm.bak/pkg-plist Wed Feb 12 16:46:18 2003 +++ eterm/pkg-plist Wed Dec 31 16:00:00 1969 @@ -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 -%%PORTDOCS%%share/doc/Eterm/Eterm.1.html -%%PORTDOCS%%share/doc/Eterm/Eterm_reference.html -%%PORTDOCS%%share/doc/Eterm/Eterm.tcap -%%PORTDOCS%%share/doc/Eterm/Eterm.ti -%%PORTDOCS%%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 -%%PORTDOCS%%@dirrm share/doc/Eterm --- eterm.PR ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302131755.h1DHtgbo051237>