From 67b669b9dc98b11420bf3d4dbf7a57f7461a4109 Mon Sep 17 00:00:00 2001
From: Yen-Ming Lee <leeym@FreeBSD.org>
Date: Tue, 26 Oct 2004 16:37:44 +0000
Subject: [PATCH] - wrap USE_GETTEXT by adding "if !defined(WITHOUT_NLS)" - use
 system libintl instead of included one

---
 chinese/zhcon/Makefile  | 13 ++++++++++---
 chinese/zhcon/pkg-plist | 12 ++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index a914e96c643c..ead2bbf7e285 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -16,16 +16,23 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast Console Chinese System which supports framebuffer device
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-included-gettext=${LOCALBASE}
-USE_GETTEXT=	yes
+CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 MAN1=		zhcon.1
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's,(\s*=\s*)("?)/usr/local([^"]*)("?),\1\2${PREFIX}\3\4,g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+		-e '/_nl_expand_alias/s,\(0\),\(\),g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff --git a/chinese/zhcon/pkg-plist b/chinese/zhcon/pkg-plist
index bd80742facb2..cd33b2a388dc 100644
--- a/chinese/zhcon/pkg-plist
+++ b/chinese/zhcon/pkg-plist
@@ -34,12 +34,12 @@ lib/zhcon/input/wbh.mb
 lib/zhcon/input/winpy.mb
 lib/zhcon/input/winsp.mb
 lib/zhcon/input/winzm.mb
-share/locale/ja/LC_MESSAGES/zhcon.mo
-share/locale/ko/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
-share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
+%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo
 @dirrm lib/zhcon/input
 @dirrm lib/zhcon/font
 @dirrm lib/zhcon