aboutsummaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2004-01-17 20:59:25 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2004-01-17 20:59:25 +0000
commitd3861848eeaf4cd7c5fc7db75b96c2eb0debb0e3 (patch)
tree1c39f217d4def01b03f784c4d13df9c9319bfdd9 /japanese
parentfc697244cb8d4efb0c3cf97af9c33ddd1410dccc (diff)
downloadports-d3861848eeaf4cd7c5fc7db75b96c2eb0debb0e3.tar.gz
ports-d3861848eeaf4cd7c5fc7db75b96c2eb0debb0e3.zip
Notes
Diffstat (limited to 'japanese')
-rw-r--r--japanese/eterm/Makefile4
-rw-r--r--japanese/eterm/files/extra-patch-configure.in32
-rw-r--r--japanese/eterm/files/extra-patch-src:defaultfont.h15
-rw-r--r--japanese/eterm/files/extra-patch-src:options.c11
4 files changed, 33 insertions, 29 deletions
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index dbdda1066542..4a3871e21536 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -14,7 +14,9 @@ COMMENT= X11 terminal emulator based on rxvt/xterm that supports Japanese
EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure.in \
${.CURDIR}/files/extra-patch-src:command.c \
- ${.CURDIR}/files/extra-patch-src:feature.h
+ ${.CURDIR}/files/extra-patch-src:defaultfont.h \
+ ${.CURDIR}/files/extra-patch-src:feature.h \
+ ${.CURDIR}/files/extra-patch-src:options.c
USE_AUTOCONF= yes
CONFIGURE_ARGS= --enable-trans --enable-utmp \
diff --git a/japanese/eterm/files/extra-patch-configure.in b/japanese/eterm/files/extra-patch-configure.in
index 58fa535c519e..94c63d30e52c 100644
--- a/japanese/eterm/files/extra-patch-configure.in
+++ b/japanese/eterm/files/extra-patch-configure.in
@@ -1,18 +1,6 @@
---- 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 @@
+--- configure.in.orig Tue Jul 1 09:53:01 2003
++++ configure.in Sun Jan 18 05:29:35 2004
+@@ -666,16 +666,16 @@
AC_DEFINE(MULTI_CHARSET)
DEF_FONT_IDX=0
MULTICHAR_ENCODING="eucj"
@@ -25,7 +13,7 @@
+ FONT1="a10"
+ FONT2="r12"
+ FONT3="8x16"
-+ FONT4="12x14"
++ FONT4="12x24"
MFONT0="k14"
- MFONT1="jiskan16"
- MFONT2="jiskan18"
@@ -38,15 +26,3 @@
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,
diff --git a/japanese/eterm/files/extra-patch-src:defaultfont.h b/japanese/eterm/files/extra-patch-src:defaultfont.h
new file mode 100644
index 000000000000..5eccec35b2b1
--- /dev/null
+++ b/japanese/eterm/files/extra-patch-src:defaultfont.h
@@ -0,0 +1,15 @@
+--- src/defaultfont.h.orig Tue Aug 26 09:35:29 2003
++++ src/defaultfont.h Sun Jan 18 05:39:35 2004
+@@ -95,9 +95,9 @@
+ #define NFONT_LIST_NULL NFONT_LIST_10646
+ #define MFONT_LIST_NULL MFONT_LIST_10646
+
+-#define DEF_EUCJ 1
+-#define NFONT_LIST_EUCJ "6x12","7x14", "8x16", "9x18", "12x24"
+-#define MFONT_LIST_EUCJ "k12", "k14", "kanji16", "k18", "kanji24"
++#define DEF_EUCJ 0
++#define NFONT_LIST_EUCJ "7x14","a10", "r12", "8x16", "12x24"
++#define MFONT_LIST_EUCJ "k14", "k10", "k12", "kanji16", "kanji24"
+
+ #define DEF_GB 0
+ #define NFONT_LIST_GB "8x16", "12x24", "", "", ""
diff --git a/japanese/eterm/files/extra-patch-src:options.c b/japanese/eterm/files/extra-patch-src:options.c
new file mode 100644
index 000000000000..b01f4b72bf23
--- /dev/null
+++ b/japanese/eterm/files/extra-patch-src:options.c
@@ -0,0 +1,11 @@
+--- src/options.c.orig Sun Jan 18 05:19:54 2004
++++ src/options.c Sun Jan 18 05:25:51 2004
+@@ -2648,8 +2648,6 @@
+ eterm_font_add(&etmfonts, rs_mfont[i], ((i == 0) ? def_font_idx : ((i <= def_font_idx) ? (i - 1) : i)));
+ RESET_AND_ASSIGN(rs_mfont[i], NULL);
+ }
+- } else {
+- eterm_font_add(&etmfonts, etfonts[i], i);
+ }
+ #endif
+ }