Update 2.0.4-172 (based on xterm-172)

6 files changed, 28 insertions, 33 deletions

diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index 31bce89ac1ae..790dc9af4156 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -6,24 +6,16 @@
 #
 
 PORTNAME=	hanterm
-PORTVERSION=	2.0.0
-PORTREVISION=	3
-PORTEPOCH=	1
+PORTVERSION=	2.0.4.172
 CATEGORIES=	korean x11
-MASTER_SITES=	http://www.kr.FreeBSD.org/~hwang/hanterm/ \
-		http://hanterm.org/download/hanterm-xf/
+MASTER_SITES=	http://download.kldp.net/hanterm-xf/
 PKGNAMESUFFIX=	-xf
-DISTNAME=	hanterm${PKGNAMESUFFIX}-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
-PATCHFILES=	hanterm-xf-2.0.0.patch3
-PATCH_DIST_STRIP=	-p1
+DISTNAME=	hanterm${PKGNAMESUFFIX}-2.0.4-172
 
 MAINTAINER=	cjh@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 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
@@ -31,6 +23,7 @@ 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"
+MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 MAN1=		hanterm.1 resize.1
 
 pre-install:
diff --git a/korean/hanterm-xf86/distinfo b/korean/hanterm-xf86/distinfo
index 370df20e6774..21a8a015cbf3 100644
--- a/korean/hanterm-xf86/distinfo
+++ b/korean/hanterm-xf86/distinfo
@@ -1,2 +1 @@
-MD5 (hanterm-xf-2.0.0.tar.gz) = 76c3b30a8749e255909f1b0d5be55b6b
-MD5 (hanterm-xf-2.0.0.patch3) = 79ddf39d3ce7721cecfc73f87f7dc644
+MD5 (hanterm-xf-2.0.4-172.tar.gz) = 1b163fb254635a4baf922a9f9dfb1eb5
diff --git a/korean/hanterm-xf86/files/patch-configure b/korean/hanterm-xf86/files/patch-configure
index ad344330e809..8e80b748b859 100644
--- a/korean/hanterm-xf86/files/patch-configure
+++ b/korean/hanterm-xf86/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Aug 28 14:36:15 2001
-+++ configure	Tue Sep 11 18:52:18 2001
-@@ -5956,11 +5956,11 @@
+--- configure.orig	Mon Dec 30 11:21:21 2002
++++ configure	Tue Feb 18 18:50:55 2003
+@@ -6077,11 +6077,11 @@
  
  int main (int argc, char **argv)
  {
@@ -16,12 +16,12 @@
  	size_t utf8_real_len = strlen (utf8);
  
  #ifdef HAVE_GNU_GET_LIBC_VERSION
-@@ -5969,7 +5969,7 @@
+@@ -6090,7 +6090,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)
+ 	if (cd == (iconv_t) -1) {
+ 		/* ÇÑ±Û solaris */
+ 		cd = iconv_open ("ko_KR-UTF-8", "ko_KR-euc");
diff --git a/korean/hanterm-xf86/files/patch-makefile_in b/korean/hanterm-xf86/files/patch-makefile_in
index a1426418a7d9..5d815e6537bc 100644
--- a/korean/hanterm-xf86/files/patch-makefile_in
+++ b/korean/hanterm-xf86/files/patch-makefile_in
@@ -1,11 +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
+--- Makefile.in.orig	Tue Feb 18 18:56:34 2003
++++ Makefile.in	Tue Feb 18 18:56:45 2003
+@@ -180,7 +180,7 @@
  	$(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_DATA) -m 444 $(srcdir)/keyboard/*.kbd $(srcdir)/keyboard/*.map $(KEYBDIR)
+-	$(INSTALL_PROGRAM) -m  755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm)
++	$(INSTALL_SCRIPT) -m  755 $(srcdir)/uxterm $(BINDIR)/$(binary_uxterm)
  
  install \
  install-man \
diff --git a/korean/hanterm-xf86/pkg-descr b/korean/hanterm-xf86/pkg-descr
index a8951f6214e5..a4d683f2047f 100644
--- a/korean/hanterm-xf86/pkg-descr
+++ b/korean/hanterm-xf86/pkg-descr
@@ -8,4 +8,4 @@ and based on X11R6 xterm code. The scrollbar is displayed in right.
 
 --
 CHOI Junho <cjh@FreeBSD.org>
-WWW: http://www.kr.FreeBSD.org/~hwang/hanterm/index.html
+WWW: http://hanterm-xf.kldp.net
diff --git a/korean/hanterm-xf86/pkg-plist b/korean/hanterm-xf86/pkg-plist
index eb3c3a1830b8..ddc0b2bd8e6f 100644
--- a/korean/hanterm-xf86/pkg-plist
+++ b/korean/hanterm-xf86/pkg-plist
@@ -1,11 +1,14 @@
 bin/hanterm
 bin/resize
+bin/uxterm
 lib/X11/app-defaults/Hanterm
 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
+lib/X11/app-defaults/UXTerm
+share/hangul_keyboard/2bul.kbd
+share/hangul_keyboard/3bul_390.kbd
+share/hangul_keyboard/3bul_final.kbd
+share/hangul_keyboard/dvorak_2bul.kbd
+share/hangul_keyboard/dvorak_3bul_390.kbd
+share/hangul_keyboard/dvorak_3bul_final.kbd
+share/hangul_keyboard/dvorak.map
 @dirrm share/hangul_keyboard