8 files changed, 72 insertions, 21 deletions

diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index e12cf6864be1..73f4f17f7e43 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -6,34 +6,30 @@
 #
 
 PORTNAME=	hanterm
-PORTVERSION=	19
-PORTREVISION=	1
+PORTVERSION=	2.0.0
+PORTEPOCH=	1
 CATEGORIES=	korean x11
 MASTER_SITES=	http://www.kr.FreeBSD.org/~hwang/hanterm/ \
 		http://hanterm.org/download/hanterm-xf/
 PKGNAMESUFFIX=	-xf
-DISTNAME=	hanterm${PKGNAMESUFFIX}-p${PORTVERSION}
+DISTNAME=	hanterm${PKGNAMESUFFIX}-${PORTVERSION}
 
 MAINTAINER=	cjh@FreeBSD.org
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf \
+		${LOCALBASE}/share/iconv/johab.cct:${PORTSDIR}/converters/iconv-extra
 
 USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-16-color
+CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
+			--enable-256-color --enable-chat --enable-now-chat
 CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
 			CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-NO_INSTALL_MANPAGES=	yes
+MAN1=		hanterm.1 resize.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hanterm ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/Hanterm.ad \
-			 ${PREFIX}/lib/X11/app-defaults/Hanterm
-	${MKDIR} ${PREFIX}/share/doc/hanterm-xf
-	${INSTALL_DATA} ${WRKSRC}/hanterm-doc/README.xf \
-			${PREFIX}/share/doc/hanterm-xf
-	${INSTALL_DATA} ${WRKSRC}/hanterm-doc/README.xf.old \
-			${PREFIX}/share/doc/hanterm-xf
+pre-install:
+	${MKDIR} ${PREFIX}/share/hangul_keyboard
+	${CAT} ${FILESDIR}/defaultfont.ad >> ${WRKSRC}/Hanterm.ad
 
 .include <bsd.port.mk>
diff --git a/korean/hanterm-xf86/distinfo b/korean/hanterm-xf86/distinfo
index 8ecd0cabb894..d22f01bcf2cf 100644
--- a/korean/hanterm-xf86/distinfo
+++ b/korean/hanterm-xf86/distinfo
@@ -1 +1 @@
-MD5 (hanterm-xf-p19.tar.gz) = 5843e11a5d8b2e9c455c42e8743f3d5c
+MD5 (hanterm-xf-2.0.0.tar.gz) = 76c3b30a8749e255909f1b0d5be55b6b
diff --git a/korean/hanterm-xf86/files/defaultfont.ad b/korean/hanterm-xf86/files/defaultfont.ad
new file mode 100644
index 000000000000..4596e62b36c5
--- /dev/null
+++ b/korean/hanterm-xf86/files/defaultfont.ad
@@ -0,0 +1,10 @@
+! Default font configuration for hanterm-xf
+! $FreeBSD$
+!
+! Hanterm.ad has no font configuration, so we need default font working in
+! any case
+!
+*vt100.boldFont: -schumacher-clean-medium-r-normal--16-*-*-*-*-*-*
+*vt100.font: -schumacher-clean-medium-r-normal--16-*-*-*-*-*-*
+*vt100.hangulFont: -baekmuk-gulim-medium-r-normal--16-160-75-75-m-160-ksc5601.1987-0
+*fontSet: -adobe-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-baekmuk-gulim-medium-r-normal--16-*-*-*-*-*-ksc5601.1987-0
diff --git a/korean/hanterm-xf86/files/patch-configure b/korean/hanterm-xf86/files/patch-configure
new file mode 100644
index 000000000000..ad344330e809
--- /dev/null
+++ b/korean/hanterm-xf86/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig	Tue Aug 28 14:36:15 2001
++++ configure	Tue Sep 11 18:52:18 2001
+@@ -5956,11 +5956,11 @@
+ 
+ int main (int argc, char **argv)
+ {
+-	const char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
+-	const char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
+-	char *transbuf = malloc (10), *trans = transbuf;
++	const char *jp = "\xbe\xc8\xb3\xe7\xc7\xcf\xbc\xbc\xbf\xe4";
++	const char *utf8 = "\xec\x95\x88\xeb\x85\x95\xed\x95\x98\xec\x84\xb8\xec\x9a\x94";
++	char *transbuf = malloc (16), *trans = transbuf;
+ 	iconv_t cd;
+-	size_t jp_len = strlen (jp), utf8_len = 10;
++	size_t jp_len = strlen (jp), utf8_len = 16;
+ 	size_t utf8_real_len = strlen (utf8);
+ 
+ #ifdef HAVE_GNU_GET_LIBC_VERSION
+@@ -5969,7 +5969,7 @@
+ 		exit (1);
+ #endif
+ 
+-	cd = iconv_open ("UTF-8", "ISO-2022-JP");
++	cd = iconv_open ("UTF-8", "EUC-KR");
+ 	if (!cd)
+ 		exit (1);
+ 	if (iconv (cd, &jp, &jp_len, &trans, &utf8_len) == -1 || jp_len != 0)
diff --git a/korean/hanterm-xf86/files/patch-makefile_in b/korean/hanterm-xf86/files/patch-makefile_in
new file mode 100644
index 000000000000..a1426418a7d9
--- /dev/null
+++ b/korean/hanterm-xf86/files/patch-makefile_in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Sep 11 19:00:32 2001
++++ Makefile.in	Tue Sep 11 19:00:48 2001
+@@ -151,7 +151,7 @@
+ install-full :: $(BINNAME)$x resize$x
+ 	$(SHELL) $(srcdir)/sinstall.sh "$(INSTALL_PROGRAM)" $(BINNAME)$x  @XTERM_PATH@ $(BINDIR)/$(binary_xterm)
+ 	$(INSTALL_PROGRAM) -s -m  755 resize$x $(BINDIR)/$(binary_resize)
+-	$(INSTALL_PROGRAM) -m 444 keyboard/*.kbd $(prefix)/share/hangul_keyboard
++	$(INSTALL_DATA) -m 444 keyboard/*.kbd $(prefix)/share/hangul_keyboard
+ 
+ install \
+ install-man \
diff --git a/korean/hanterm-xf86/pkg-comment b/korean/hanterm-xf86/pkg-comment
index 7669e52c2030..b2d3c5cfe095 100644
--- a/korean/hanterm-xf86/pkg-comment
+++ b/korean/hanterm-xf86/pkg-comment
@@ -1 +1 @@
-An X11R6-based xterm hacked for managing Korean languages
+X11R6-based xterm hacked for managing Korean languages
diff --git a/korean/hanterm-xf86/pkg-descr b/korean/hanterm-xf86/pkg-descr
index 72072e174fce..a8951f6214e5 100644
--- a/korean/hanterm-xf86/pkg-descr
+++ b/korean/hanterm-xf86/pkg-descr
@@ -3,8 +3,8 @@ hanterm-xf
 
 It is one of many variants of hanterm, a well-known program for managing
 Korean language in X11. This version supports the features
-such as automatic fonts detection, johab844 font support, and based on
-XFree86's xterm code. The scrollbar is displayed in right.
+such as automatic fonts detection, johab844 font support,
+and based on X11R6 xterm code. The scrollbar is displayed in right.
 
 --
 CHOI Junho <cjh@FreeBSD.org>
diff --git a/korean/hanterm-xf86/pkg-plist b/korean/hanterm-xf86/pkg-plist
index 2e06e87cabcb..eb3c3a1830b8 100644
--- a/korean/hanterm-xf86/pkg-plist
+++ b/korean/hanterm-xf86/pkg-plist
@@ -1,4 +1,11 @@
 bin/hanterm
+bin/resize
 lib/X11/app-defaults/Hanterm
-share/doc/hanterm-xf/README.xf
-share/doc/hanterm-xf/README.xf.old
+lib/X11/app-defaults/Hanterm-color
+share/hangul_keyboard/µÎ¹ú½Ä.kbd
+share/hangul_keyboard/µåº¸¶ô_µÎ¹ú½Ä.kbd
+share/hangul_keyboard/µåº¸¶ô_¼¼¹ú½Ä_390.kbd
+share/hangul_keyboard/µåº¸¶ô_¼¼¹ú½Ä_ÃÖÁ¾.kbd
+share/hangul_keyboard/¼¼¹ú½Ä_390.kbd
+share/hangul_keyboard/¼¼¹ú½Ä_ÃÖÁ¾.kbd
+@dirrm share/hangul_keyboard