Index: head/korean/nabi/Makefile
===================================================================
--- head/korean/nabi/Makefile	(revision 422170)
+++ head/korean/nabi/Makefile	(revision 422171)
@@ -1,46 +1,46 @@
 # Created by: Hye-Shik Chang <perky@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nabi
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	korean gnome
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Hangul X Input Method for Everywhere
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
-
 LIB_DEPENDS=	libhangul.so:korean/libhangul
+LIB_DEPENDS+=	libfreetype.so:print/freetype2
+LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 
-USE_GNOME=	gtk20
+GH_ACCOUNT=	choehwanjin
+GH_TAGNAME=	f08d7d3
+USE_GITHUB=	yes
+
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_XORG=	ice sm x11
+USES=		autoreconf gmake pkgconfig
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_RADIO=	LAYOUT
 OPTIONS_RADIO_LAYOUT=	LAYOUT_390 LAYOUT_FINAL
+OPTIONS_SUB=	yes
 LAYOUT_DESC=	Select 3-beolsik layout (default: 2-beolsik)
 LAYOUT_390_DESC=	3-beolsik 390 keyboard
 LAYOUT_FINAL_DESC=	3-beolsik final keyboard
-OPTIONS_SUB=	NLS
+LAYOUT_390_CONFIGURE_ON=	--with-default-keyboard=39
+LAYOUT_FINAL_CONFIGURE_ON=	--with-default-keyboard=3f
+NLS_USES=	gettext localbase
 
-.include <bsd.port.options.mk>
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e '/^SUBDIRS /s| po||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/^po\/Makefile\.in/d' ${WRKSRC}/configure.ac
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
-
-.if ${PORT_OPTIONS:MLAYOUT_390}
-CONFIGURE_ARGS=	--with-default-keyboard=39
-.elif ${PORT_OPTIONS:MLAYOUT_FINAL}
-CONFIGURE_ARGS=	--with-default-keyboard=3f
-.else
-CONFIGURE_ARGS=	--with-default-keyboard=2
-.endif
+pre-configure-NLS-on:
+	@(cd ${WRKSRC} && ${LOCALBASE}/bin/glib-gettextize)
 
 .include <bsd.port.mk>
Index: head/korean/nabi/distinfo
===================================================================
--- head/korean/nabi/distinfo	(revision 422170)
+++ head/korean/nabi/distinfo	(revision 422171)
@@ -1,2 +1,3 @@
-SHA256 (nabi-1.0.0.tar.gz) = 9c59cb3b70b66cbb86d68e4b0debc0c4ebf456da598d22a006671d7e89502a33
-SIZE (nabi-1.0.0.tar.gz) = 868761
+TIMESTAMP = 1473878127
+SHA256 (choehwanjin-nabi-1.0.0-f08d7d3_GH0.tar.gz) = 91438bbb55b22a96099abd0f3bf492e9357c608df939328bf2eed1baf93b71f2
+SIZE (choehwanjin-nabi-1.0.0-f08d7d3_GH0.tar.gz) = 926902