- Unbreak and modernize the port.

- Switch to GTK3 by default.

4 files changed, 44 insertions, 23 deletions

diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile
index 0daf2b66791f..dd17a133d9f1 100644
--- a/korean/imhangul/Makefile
+++ b/korean/imhangul/Makefile
@@ -2,34 +2,44 @@
 # $FreeBSD$
 
 PORTNAME=	imhangul
-PORTVERSION=	${GTKVER}.1.1
-PORTREVISION=	2
+PORTVERSION=	${GTKVER:R}.1.1
+PORTREVISION=	3
 CATEGORIES=	korean
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	GTK+ Hangul input module
 
-LICENSE=	GPLv2
-
-BROKEN=		Unfetchable (google code has gone away)
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhangul.so:korean/libhangul
 
+GH_ACCOUNT=	choehwanjin
+USE_GITHUB=	yes
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	GTKVER=${GTKVER}.0
-USE_GNOME=	gtk${GTKVER}0
-USES=		gmake libtool pkgconfig tar:bzip2
-
-OPTIONS_DEFINE=	GTK3 NLS
+PLIST_SUB=	GTKVER=${GTKVER}
+USE_GNOME=	cairo gdkpixbuf2 gtk${GTKVER:S|.||}
+USES=		autoreconf gmake libtool pkgconfig
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_DEFAULT=	GTK3
+OPTIONS_SINGLE=	GTK
+OPTIONS_SINGLE_GTK=	GTK2 GTK3
 OPTIONS_SUB=	yes
-
-GTK3_VARS=	GTKVER=3
-GTK3_VARS_OFF=	GTKVER=2
-
-NLS_CPPFLAGS=	-I${LOCALBASE}/include
-NLS_LDFLAGS=	-L${LOCALBASE}/lib
-NLS_USES=	gettext
+GTK_DESC=	Select GTK+ version
+GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2
+GTK2_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
+GTK2_VARS=	GH_TAGNAME=d2f555d GTKVER=2.0
+GTK3_VARS=	GH_TAGNAME=85f6d10 GTKVER=3.0
+NLS_USES=	gettext localbase
+
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e '/^SUBDIRS /s| po||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/^po\/Makefile\.in/d' ${WRKSRC}/configure.in
+
+pre-configure-NLS-on:
+	@(cd ${WRKSRC} && ${LOCALBASE}/bin/glib-gettextize)
 
 .include <bsd.port.mk>
diff --git a/korean/imhangul/distinfo b/korean/imhangul/distinfo
index 1324b7a6c73e..21709ceaa0f9 100644
--- a/korean/imhangul/distinfo
+++ b/korean/imhangul/distinfo
@@ -1,4 +1,5 @@
-SHA256 (imhangul-2.1.1.tar.bz2) = b4860b718b2775ce1e298e80004d5d7b5ac89faa75b30654e51d325643a02e19
-SIZE (imhangul-2.1.1.tar.bz2) = 288452
-SHA256 (imhangul-3.1.1.tar.bz2) = 24f103e55c38f2cd4b708398106ac19760e2ef1834513f46f32b0baf439461e0
-SIZE (imhangul-3.1.1.tar.bz2) = 288236
+TIMESTAMP = 1473877928
+SHA256 (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = e489cb293da229cb1e07d7f301e8fe4b65396cd762aca30aa54cd1555f354288
+SIZE (choehwanjin-imhangul-2.1.1-d2f555d_GH0.tar.gz) = 256752
+SHA256 (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = a2bd9baf56c5b624c035ce6890553fb513feb6404453549a2f523691df86f2cc
+SIZE (choehwanjin-imhangul-3.1.1-85f6d10_GH0.tar.gz) = 256731
diff --git a/korean/imhangul/files/patch-Makefile.am b/korean/imhangul/files/patch-Makefile.am
new file mode 100644
index 000000000000..66effdce47c6
--- /dev/null
+++ b/korean/imhangul/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2012-12-31 14:14:19 UTC
++++ Makefile.am
+@@ -18,7 +18,6 @@ im_hangul_la_CFLAGS = \
+ 	-DG_DISABLE_DEPRECATED                          \
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED                 \
+ 	-DGDK_DISABLE_DEPRECATED                        \
+-	-DGTK_DISABLE_DEPRECATED                        \
+ 	$(GTK_CFLAGS)					\
+ 	$(LIBHANGUL_CFLAGS)
+ 
diff --git a/korean/imhangul/pkg-plist b/korean/imhangul/pkg-plist
index f69e08a6d528..56ec2cf0e685 100644
--- a/korean/imhangul/pkg-plist
+++ b/korean/imhangul/pkg-plist
@@ -1,5 +1,5 @@
 lib/gtk-%%GTKVER%%/immodules/im-hangul.so
-%%NO_GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
+%%GTK2%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul.mo
 %%GTK3%%%%NLS%%share/locale/ko/LC_MESSAGES/im-hangul-%%GTKVER%%.mo
 @postexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache
 @postunexec %D/bin/gtk-query-immodules-%%GTKVER%% --update-cache