9 files changed, 58 insertions, 45 deletions

diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 6618e5bc869c..526f90c8c1be 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -6,28 +6,23 @@
 #
 
 PORTNAME=	gtkcomm
-PORTVERSION=	0.6.4
-PORTREVISION=	8
+PORTVERSION=	0.8.1
 CATEGORIES=	korean comms
-MASTER_SITES=	http://download.kldp.net/gtkcomm/
+MASTER_SITES=	http://kldp.net/frs/download.php/480/
 
-MAINTAINER=	cjh@kr.freebsd.org
+MAINTAINER=	ports@freebsd.org
 COMMENT=	Serial controlling software, with gtk+ widget
 
+LICENSE=	GPLv2
+
 RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 USE_PERL5_BUILD=yes
-USE_GNOME=	imlib
+USE_GNOME=	glib20 gtk20
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
-.endif
-
 pre-patch:
 	@${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/gtkcomm/distinfo b/korean/gtkcomm/distinfo
index fe48879620dc..33a8d4a88c06 100644
--- a/korean/gtkcomm/distinfo
+++ b/korean/gtkcomm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkcomm-0.6.4.tar.gz) = 069cb158e4044eaae1fbf91c72259ed0af02e03f66fa7212f18b509868c2ed4c
-SIZE (gtkcomm-0.6.4.tar.gz) = 222467
+SHA256 (gtkcomm-0.8.1.tar.gz) = 16a2205ebf89e9c9659d6a2c92f142335a7c5633980251ae1e67b92fe42ca7b1
+SIZE (gtkcomm-0.8.1.tar.gz) = 285205
diff --git a/korean/gtkcomm/files/patch-aa b/korean/gtkcomm/files/patch-aa
deleted file mode 100644
index 22a489e27615..000000000000
--- a/korean/gtkcomm/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- gtkcommrc	Mon Mar 27 15:10:49 2000
-+++ res/gtkcommrc	Sun Apr  2 21:54:18 2000
-@@ -35,8 +35,8 @@
- # ¹öÆ°µî¿¡ ¾²ÀÌ´Â ÆùÆ®´Â gtkrcÆÄÀÏ¿¡¼­ ¼³Á¤ÇØÁֽʽÿä.
- # Çü½ÄÀº "english_font_name,hangul_font_name"
- # ¿©±â¿¡¼­ ÇÑ±Û ÆùÆ®ÀÇ ÆøÀÌ ¿µ¹®ÆùÆ®ÆøÀÇ µÎ¹èÀÌ¿©¾ßÇÕ´Ï´Ù.
--#TermFontName "-*-fixed-medium-r-*--16-*-*-*-*-80-iso8859-1,\
--#             -*-gulim-medium-r-normal--16-*-*-*-*-160-ksc5601.1987-0"
-+TermFontName "-sony-fixed-medium-r-*--16-*-*-*-*-80-iso8859-1,\
-+             -*-gulim-medium-r-normal--16-*-*-*-*-160-ksc5601.1987-0"
- 
- # prevent ^G -> beep translation
- # if you want really silent environment,
diff --git a/korean/gtkcomm/files/patch-src-Makefile.in b/korean/gtkcomm/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..0ea6077d9c07
--- /dev/null
+++ b/korean/gtkcomm/files/patch-src-Makefile.in
@@ -0,0 +1,13 @@
+--- src/Makefile.in.orig	2003-05-11 20:00:43.000000000 -0400
++++ src/Makefile.in	2011-08-03 19:09:28.000000000 -0400
+@@ -143,9 +143,7 @@
+ 	$(GTK_CFLAGS) $(GTHREAD_CFLAGS)			\
+ 	-DLOCALE_DIR=\"$(localedir)\"			\
+ 	-DG_DISABLE_DEPRECATED				\
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+-	-DGDK_DISABLE_DEPRECATED			\
+-	-DGTK_DISABLE_DEPRECATED
++	-DGDK_PIXBUF_DISABLE_DEPRECATED
+ 
+ 
+ bin_PROGRAMS = gtkcomm
diff --git a/korean/gtkcomm/files/patch-src-pcConfig.c b/korean/gtkcomm/files/patch-src-pcConfig.c
new file mode 100644
index 000000000000..b5a10f378b8d
--- /dev/null
+++ b/korean/gtkcomm/files/patch-src-pcConfig.c
@@ -0,0 +1,22 @@
+--- src/pcConfig.c.orig	2003-03-26 03:23:38.000000000 -0500
++++ src/pcConfig.c	2011-08-03 18:58:36.000000000 -0400
+@@ -155,7 +155,7 @@
+ {
+     if (target == (char *) &ControlBarShow)
+ 	ControlBarFix();
+-    else if (target == (char *) &ToolBarType || target == (char *) ToolBarShow)
++    else if (target == (char *) &ToolBarType || target == (char *) &ToolBarShow)
+ 	StatusShowMessage(_("Use menu instead!"));
+     else if (Term)
+     {
+@@ -180,8 +180,8 @@
+ 		MouseRightButtonNum = 3;
+ 	    }
+ 	}
+-	else if (target == (char *) ModemMaxHistory
+-		 || target == (char *) ModemHistoryBufSize)
++	else if (target == (char *) &ModemMaxHistory
++		 || target == (char *) &ModemHistoryBufSize)
+ 	    ModemHistoryNew();
+     }
+ }
diff --git a/korean/gtkcomm/files/patch-src-pcPTY.c b/korean/gtkcomm/files/patch-src-pcPTY.c
new file mode 100644
index 000000000000..9160f6dac6cb
--- /dev/null
+++ b/korean/gtkcomm/files/patch-src-pcPTY.c
@@ -0,0 +1,12 @@
+--- src/pcPTY.c.orig	2003-02-17 20:30:10.000000000 -0500
++++ src/pcPTY.c	2011-08-03 19:07:17.000000000 -0400
+@@ -21,8 +21,8 @@
+ # include <libutil.h>
+ #else
+ # include <pty.h>	/* openpty() */
++# include <utmp.h>	/* login_tty() */
+ #endif
+-#include <utmp.h>	/* login_tty() */
+ 
+ #include "pcMain.h"
+ 
diff --git a/korean/gtkcomm/files/patch-src_pcISel.c b/korean/gtkcomm/files/patch-src_pcISel.c
deleted file mode 100644
index c62b190e4568..000000000000
--- a/korean/gtkcomm/files/patch-src_pcISel.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/pcISel.c.orig	Sun Aug 22 23:21:11 2004
-+++ src/pcISel.c	Sun Aug 22 23:21:23 2004
-@@ -540,7 +540,7 @@
- 		    break;
- 	    }
- 	}
--      next:
-+      next: break;
-     }
- 
-     if (currTbl)
diff --git a/korean/gtkcomm/pkg-descr b/korean/gtkcomm/pkg-descr
index 9198bafd2784..925e47070e69 100644
--- a/korean/gtkcomm/pkg-descr
+++ b/korean/gtkcomm/pkg-descr
@@ -6,4 +6,4 @@ It is for hardware control using serial ports.
 
 --
 Ports by CHOI Junho <cjh@kr.freebsd.org>
-WWW: http://kldp.org/~namsh/tools/gtkcomm/
+WWW: http://kldp.net/projects/gtkcomm/
diff --git a/korean/gtkcomm/pkg-plist b/korean/gtkcomm/pkg-plist
index 61b58b9d9026..69059b61054c 100644
--- a/korean/gtkcomm/pkg-plist
+++ b/korean/gtkcomm/pkg-plist
@@ -6,16 +6,14 @@ share/gtkcomm/down/DEFAULT_DOWNLOAD_DIR
 share/gtkcomm/gtkcommrc
 share/gtkcomm/gtkrc
 share/gtkcomm/iselrc
-share/gtkcomm/pixmap/bg.xpm
+share/gtkcomm/pixmap/tb_capture.xpm
 share/gtkcomm/pixmap/tb_close.xpm
 share/gtkcomm/pixmap/tb_down.xpm
 share/gtkcomm/pixmap/tb_exit.xpm
-share/gtkcomm/pixmap/tb_macro.xpm
 share/gtkcomm/pixmap/tb_open.xpm
 share/gtkcomm/pixmap/tb_save.xpm
 share/gtkcomm/pixmap/tb_up.xpm
 share/gtkcomm/pixmap/tux-anim.png
-share/gtkcomm/pixmap/tux-anim.xpm
 share/gtkcomm/script/SCRIPT.txt
 share/gtkcomm/script/chol-login.scr
 share/gtkcomm/script/chol-logout.scr