Unbreak the port and modernize.

5 files changed, 23 insertions, 66 deletions

diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index 96ec3c545746..95c4b2249649 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -3,36 +3,34 @@
 
 PORTNAME=	libhangul
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	korean
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Library for Hangul processing
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
+TEST_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/check.pc:devel/libcheck
+
+GH_ACCOUNT=	choehwanjin
+GH_TAGNAME=	9fe2d4e
+USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	NLS
+PATHFIX_MAKEFILEIN=	Makefile.am
+TEST_TARGET=	test
+TEST_WRKSRC=	${WRKSRC}/test
 USE_LDCONFIG=	yes
-USES=		iconv libtool pkgconfig
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS=	--enable-nls
-.else
-CONFIGURE_ARGS=	--disable-nls
-.endif
-
-.if exists(${LOCALBASE}/libdata/pkgconfig/check.pc)
-test:	build
-	@( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
-	@( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test && ./test )
-.endif
+USES=		autoreconf iconv libtool pathfix pkgconfig
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=	gettext
+
+post-test:
+	@${TEST_WRKSRC}/test
 
 .include <bsd.port.mk>
diff --git a/korean/libhangul/distinfo b/korean/libhangul/distinfo
index 493592e40877..0f389531e333 100644
--- a/korean/libhangul/distinfo
+++ b/korean/libhangul/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libhangul-0.1.0.tar.gz) = 5905aa5c557d8d46e190fec1afdd75babf3bc086ef286b42007572703658295a
-SIZE (libhangul-0.1.0.tar.gz) = 2899845
+TIMESTAMP = 1473878096
+SHA256 (choehwanjin-libhangul-0.1.0-9fe2d4e_GH0.tar.gz) = f7f36f051b9b88f77be4849ab1b2ad13f7812440547e9cd9bf4caed0742e9a2d
+SIZE (choehwanjin-libhangul-0.1.0-9fe2d4e_GH0.tar.gz) = 3981418
diff --git a/korean/libhangul/files/patch-Makefile.in b/korean/libhangul/files/patch-Makefile.in
deleted file mode 100644
index b2869f8a21f8..000000000000
--- a/korean/libhangul/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-03-29 02:50:33.000000000 +0900
-+++ Makefile.in	2011-03-29 02:47:59.000000000 +0900
-@@ -270,7 +270,7 @@
- top_srcdir = @top_srcdir@
- SUBDIRS = hangul data tools po
- DIST_SUBDIRS = hangul data tools po test
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libhangul.pc
- EXTRA_DIST = \
-     config.rpath \
diff --git a/korean/libhangul/files/patch-test b/korean/libhangul/files/patch-test
deleted file mode 100644
index 851d4cbdf527..000000000000
--- a/korean/libhangul/files/patch-test
+++ /dev/null
@@ -1,18 +0,0 @@
---- test/Makefile.in.orig	2011-12-14 03:50:49.000000000 +0900
-+++ test/Makefile.in	2011-12-14 03:53:19.000000000 +0900
-@@ -235,12 +235,12 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--hangul_CFLAGS = 
-+hangul_CFLAGS = -I$(LOCALBASE)/include
- hangul_SOURCES = hangul.c
--hangul_LDADD = ../hangul/libhangul.la $(LTLIBINTL) $(LTLIBICONV)
-+hangul_LDADD = $(top_builddir)/hangul/libhangul.la $(LTLIBINTL) $(LTLIBICONV)
- hanja_CFLAGS = 
- hanja_SOURCES = hanja.c
--hanja_LDADD = ../hangul/libhangul.la $(LTLIBINTL)
-+hanja_LDADD = $(top_builddir)/hangul/libhangul.la $(LTLIBINTL)
- test_SOURCES = test.c ../hangul/hangul.h
- test_CFLAGS = $(CHECK_CFLAGS)
- test_LDADD = $(CHECK_LIBS) $(top_builddir)/hangul/libhangul.la $(LTLIBINTL)
diff --git a/korean/libhangul/files/patch-tools b/korean/libhangul/files/patch-tools
deleted file mode 100644
index 744e725f881b..000000000000
--- a/korean/libhangul/files/patch-tools
+++ /dev/null
@@ -1,13 +0,0 @@
---- tools/Makefile.in.orig	2011-12-14 03:54:37.000000000 +0900
-+++ tools/Makefile.in	2011-12-14 03:55:19.000000000 +0900
-@@ -220,8 +220,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- hangul_SOURCES = hangul.c
--hangul_CFLAGS = -DLOCALEDIR=\"$(localedir)\"
--hangul_LDADD = ../hangul/libhangul.la $(LTLIBINTL) $(LTLIBICONV)
-+hangul_CFLAGS = -I$(LOCALBASE)/include -DLOCALEDIR=\"$(localedir)\"
-+hangul_LDADD = $(top_builddir)/hangul/libhangul.la $(LTLIBINTL) $(LTLIBICONV)
- all: all-am
- 
- .SUFFIXES: