4 files changed, 41 insertions, 17 deletions

diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index 1bd2e12c575e..d158eaf515b7 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -13,13 +13,28 @@ MASTER_SITES=	http://kldp.net/frs/download.php/5855/
 MAINTAINER=	hyogeollee@gmail.com
 COMMENT=	A library for hangul processing
 
+LICENSE=	LGPL21
+
 USE_ICONV=	yes
-USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS=	"-I${LOCALBASE}/include"
+CPPFLAGS+=	"-I${LOCALBASE}/include"
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
 
-LICENSE=	GPLv2
+test:	build
+	@( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} )
+.if exists(${LOCALBASE}/libdata/pkgconfig/check.pc)
+	@( cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${GMAKE} test && ./test )
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/libhangul/files/patch-test b/korean/libhangul/files/patch-test
index 2dbfd967233a..9264dfcf07cd 100644
--- a/korean/libhangul/files/patch-test
+++ b/korean/libhangul/files/patch-test
@@ -1,15 +1,22 @@
---- test/Makefile.in.orig	2011-03-29 02:51:55.000000000 +0900
-+++ test/Makefile.in	2011-03-29 02:48:45.000000000 +0900
-@@ -230,10 +230,10 @@
+--- test/Makefile.in.orig	2011-01-02 02:44:52.000000000 -0500
++++ test/Makefile.in	2011-08-26 13:56:01.000000000 -0400
+@@ -228,15 +228,15 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- hangul_CFLAGS = 
+-hangul_CFLAGS = 
++hangul_CFLAGS = -I$(LOCALBASE)/include
  hangul_SOURCES = hangul.c
 -hangul_LDADD = ../hangul/libhangul.la
-+hangul_LDADD = ../hangul/libhangul.la -liconv -lintl
++hangul_LDADD = $(top_builddir)/hangul/libhangul.la $(LIBICONV) $(LIBINTL)
  hanja_CFLAGS = 
  hanja_SOURCES = hanja.c
 -hanja_LDADD = ../hangul/libhangul.la
-+hanja_LDADD = ../hangul/libhangul.la -liconv -lintl
++hanja_LDADD = $(top_builddir)/hangul/libhangul.la $(LIBINTL)
  test_SOURCES = test.c ../hangul/hangul.h
  test_CFLAGS = @CHECK_CFLAGS@
- test_LDADD = @CHECK_LIBS@ $(top_builddir)/hangul/libhangul.la
+-test_LDADD = @CHECK_LIBS@ $(top_builddir)/hangul/libhangul.la
++test_LDADD = @CHECK_LIBS@ $(top_builddir)/hangul/libhangul.la $(LIBINTL)
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/korean/libhangul/files/patch-tools b/korean/libhangul/files/patch-tools
index 910a79a48956..f43b29f92bbc 100644
--- a/korean/libhangul/files/patch-tools
+++ b/korean/libhangul/files/patch-tools
@@ -1,11 +1,13 @@
---- tools/Makefile.in.orig	2011-03-29 02:52:55.000000000 +0900
-+++ tools/Makefile.in	2011-03-29 02:48:13.000000000 +0900
-@@ -215,7 +215,7 @@
+--- tools/Makefile.in.orig	2011-01-02 02:44:52.000000000 -0500
++++ tools/Makefile.in	2011-08-26 14:00:01.000000000 -0400
+@@ -214,8 +214,8 @@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  hangul_SOURCES = hangul.c
- hangul_CFLAGS = -DLOCALEDIR=\"$(localedir)\"
+-hangul_CFLAGS = -DLOCALEDIR=\"$(localedir)\"
 -hangul_LDADD = ../hangul/libhangul.la
-+hangul_LDADD = ../hangul/libhangul.la -lintl
++hangul_CFLAGS = -I$(LOCALBASE)/include -DLOCALEDIR=\"$(localedir)\"
++hangul_LDADD = $(top_builddir)/hangul/libhangul.la $(LIBICONV) $(LIBINTL)
  all: all-am
  
  .SUFFIXES:
diff --git a/korean/libhangul/pkg-plist b/korean/libhangul/pkg-plist
index b8134c16568c..fea09809362d 100644
--- a/korean/libhangul/pkg-plist
+++ b/korean/libhangul/pkg-plist
@@ -5,7 +5,7 @@ lib/libhangul.la
 lib/libhangul.so
 lib/libhangul.so.1
 libdata/pkgconfig/libhangul.pc
-share/locale/ko/LC_MESSAGES/libhangul.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libhangul.mo
 %%DATADIR%%/hanja/hanja.txt
 @dirrm %%DATADIR%%/hanja
 @dirrm %%DATADIR%%