5 files changed, 18 insertions, 60 deletions

diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index d78c68b6102d..2ebca8f43946 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -6,23 +6,32 @@
 #
 
 PORTNAME=	hanterm
-PORTVERSION=	18
+PORTVERSION=	19
 CATEGORIES=	korean x11
-MASTER_SITES=	http://www.kr.FreeBSD.org/~hwang/hanterm/
+MASTER_SITES=	http://www.kr.FreeBSD.org/~hwang/hanterm/ \
+		http://hanterm.org/download/hanterm-xf/
 PKGNAMESUFFIX=	-xf
-DISTNAME=	hanterm-xf-p18
+DISTNAME=	hanterm${PKGNAMESUFFIX}-p${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
 
 USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-x --enable-16-color
-CONFIGURE_ENV+=		LIBS="-lxpg4"
+CONFIGURE_ARGS+=	--enable-16-color
+CONFIGURE_ENV+=		LIBS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" \
+			CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/Hanterm.ad ${PREFIX}/lib/X11/app-defaults/Hanterm
+	@${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
 
 .include <bsd.port.mk>
diff --git a/korean/hanterm-xf86/distinfo b/korean/hanterm-xf86/distinfo
index 40af63eb73d4..8ecd0cabb894 100644
--- a/korean/hanterm-xf86/distinfo
+++ b/korean/hanterm-xf86/distinfo
@@ -1 +1 @@
-MD5 (hanterm-xf-p18.tar.gz) = 2c7275122e3ce9ed725fc3d7dca8efd4
+MD5 (hanterm-xf-p19.tar.gz) = 5843e11a5d8b2e9c455c42e8743f3d5c
diff --git a/korean/hanterm-xf86/files/patch-aa b/korean/hanterm-xf86/files/patch-aa
deleted file mode 100644
index 3c02bb2d9251..000000000000
--- a/korean/hanterm-xf86/files/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-*** configure.orig	Sat Aug  1 10:14:54 1998
---- configure	Sat Jan  2 00:45:20 1999
-***************
-*** 2289,2295 ****
-  
-    # It would also be nice to do this for all -L options, not just this one.
-    if test -n "$x_libraries"; then
-!     X_LIBS="$X_LIBS -L$x_libraries"
-      # For Solaris; some versions of Sun CC require a space after -R and
-      # others require no space.  Words are not sufficient . . . .
-      case "`(uname -sr) 2>/dev/null`" in
---- 2289,2298 ----
-  
-    # It would also be nice to do this for all -L options, not just this one.
-    if test -n "$x_libraries"; then
-!     case "${PORTOBJFORMAT}" in
-!       elf) X_LIBS="$X_LIBS -L$x_libraries -rpath $x_libraries -lxpg4" ;;
-!       *) X_LIBS="$X_LIBS -L$x_libraries -lxpg4" ;;
-!     esac
-      # For Solaris; some versions of Sun CC require a space after -R and
-      # others require no space.  Words are not sufficient . . . .
-      case "`(uname -sr) 2>/dev/null`" in
-***************
-*** 2824,2830 ****
-  
-    # Check for libraries that X11R6 Xt/Xaw programs need.
-    ac_save_LDFLAGS="$LDFLAGS"
-!   test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-    # check for ICE first), but we must link in the order -lSM -lICE or
-    # we get undefined symbols.  So assume we have SM if we have ICE.
---- 2827,2836 ----
-  
-    # Check for libraries that X11R6 Xt/Xaw programs need.
-    ac_save_LDFLAGS="$LDFLAGS"
-!   test -n "$x_libraries" && case "${PORTOBJFORMAT}" in
-!     elf) LDFLAGS="$LDFLAGS -L$x_libraries -rpath $x_libraries -lxpg4" ;;
-!     *) LDFLAGS="$LDFLAGS -L$x_libraries -lxpg4" ;;
-!   esac
-    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-    # check for ICE first), but we must link in the order -lSM -lICE or
-    # we get undefined symbols.  So assume we have SM if we have ICE.
diff --git a/korean/hanterm-xf86/files/patch-ab b/korean/hanterm-xf86/files/patch-ab
deleted file mode 100644
index 76765a0a0d53..000000000000
--- a/korean/hanterm-xf86/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- main.c~	Thu Mar  2 17:08:33 2000
-+++ main.c	Sun Aug 27 00:10:09 2000
-@@ -2001,7 +2001,7 @@
-     int *pty;
- {
-     static int devindex, letter = 0;
--    printf("%s\n",__FUNCTION__);
-+    /*printf("%s\n",__FUNCTION__);*/
- 
- #if defined(CRAY)
-     for (; devindex < MAXPTTYS; devindex++) {
diff --git a/korean/hanterm-xf86/pkg-plist b/korean/hanterm-xf86/pkg-plist
index 09d746367b3e..2e06e87cabcb 100644
--- a/korean/hanterm-xf86/pkg-plist
+++ b/korean/hanterm-xf86/pkg-plist
@@ -1,2 +1,4 @@
 bin/hanterm
 lib/X11/app-defaults/Hanterm
+share/doc/hanterm-xf/README.xf
+share/doc/hanterm-xf/README.xf.old