aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2006-12-14 23:26:45 +0800
committernobutaka <nobutaka@FreeBSD.org>2006-12-14 23:26:45 +0800
commitcb1fab25c05eca1d08b7fc05e6ffe805fe11e0bf (patch)
tree8a8edfb1b3dc5c979c68d99630af4988d6f4aa1c
parent3fedc03f9b1ae7587f5e3d959a1841f506957fca (diff)
downloadfreebsd-ports-gnome-cb1fab25c05eca1d08b7fc05e6ffe805fe11e0bf.tar.gz
freebsd-ports-gnome-cb1fab25c05eca1d08b7fc05e6ffe805fe11e0bf.tar.zst
freebsd-ports-gnome-cb1fab25c05eca1d08b7fc05e6ffe805fe11e0bf.zip
Fix build error.
Reported by: pointyhat via kris
-rw-r--r--japanese/eterm/Makefile3
-rw-r--r--japanese/eterm/files/extra-patch-configure12
-rw-r--r--japanese/eterm/files/extra-patch-src:options.c11
3 files changed, 7 insertions, 19 deletions
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index 585a5f51f466..e3b929ed6d53 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -15,8 +15,7 @@ COMMENT= X11 terminal emulator based on rxvt/xterm that supports Japanese
EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-configure \
${.CURDIR}/files/extra-patch-src:command.c \
${.CURDIR}/files/extra-patch-src:defaultfont.h \
- ${.CURDIR}/files/extra-patch-src:feature.h \
- ${.CURDIR}/files/extra-patch-src:options.c
+ ${.CURDIR}/files/extra-patch-src:feature.h
CONFIGURE_ARGS= --enable-trans --enable-utmp \
--enable-xim --with-theme-update \
diff --git a/japanese/eterm/files/extra-patch-configure b/japanese/eterm/files/extra-patch-configure
index 19b5df201135..c729abd5e7d2 100644
--- a/japanese/eterm/files/extra-patch-configure
+++ b/japanese/eterm/files/extra-patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Thu Mar 3 01:05:32 2005
-+++ configure Thu Mar 3 01:07:03 2005
-@@ -9731,16 +9731,16 @@
+--- configure.orig Wed Aug 23 03:24:36 2006
++++ configure Wed Dec 13 02:10:34 2006
+@@ -25608,16 +25608,16 @@
DEF_FONT_IDX=0
MULTICHAR_ENCODING="eucj"
@@ -23,6 +23,6 @@
+ MFONT2="k12"
+ MFONT3="kanji16"
+ MFONT4="kanji24"
- elif test "$MULTI_CHARSET_TYPE" = "euc-kr" -o "$MULTI_CHARSET_TYPE" = "euckr"; then
- echo "$ac_t""euckr" 1>&6
- cat >> confdefs.h <<\EOF
+ elif test "$MULTI_CHARSET_TYPE" = "euc-kr" -o "$MULTI_CHARSET_TYPE" = "euckr"; then
+ echo "$as_me:$LINENO: result: euckr" >&5
+ echo "${ECHO_T}euckr" >&6
diff --git a/japanese/eterm/files/extra-patch-src:options.c b/japanese/eterm/files/extra-patch-src:options.c
deleted file mode 100644
index b01f4b72bf23..000000000000
--- a/japanese/eterm/files/extra-patch-src:options.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- }