If TEXINFO_LOCALE is set to "no", then don't build devel/gtexinfo with

NLS support.  This simplifies bootstrapping pkgsrc using a pkgsrc compiler
on a clean system.

3 files changed, 35 insertions, 23 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index ceaca2d474d..caab097e4ea 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/04/02 02:01:34 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2004/04/24 19:47:44 jlam Exp $
 
 DISTNAME=		texinfo-4.6
 PKGNAME=		g${DISTNAME}
@@ -14,16 +14,27 @@ COMMENT=		GNU info file manipulation utilities
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+INFO_FILES=		info-stnd.info info.info texinfo
+TEST_TARGET=		check
+PLIST_SRC=		${PKGDIR}/PLIST
 
 PKGSRC_INFOPATH=	${PREFIX}/info:${X11BASE}/info:${LOCALBASE}/info
 MAKE_ENV+=		PKGSRC_INFOPATH="${PKGSRC_INFOPATH}"
 
-INFO_FILES=		info-stnd.info info.info texinfo
-TEST_TARGET=		check
+.include "../../mk/bsd.prefs.mk"
+
+TEXINFO_LOCALE?=	yes
+BUILD_DEFS+=		TEXINFO_LOCALE
+MAKEFLAGS+=		TEXINFO_LOCALE=${TEXINFO_LOCALE}
+.if !empty(TEXINFO_LOCALE:M[yY][eE][sS])
+USE_PKGLOCALEDIR=	yes
+PLIST_SRC+=		${PKGDIR}/PLIST.locale
+.  include "../../devel/gettext-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
 
-.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # This need to be defined here to override the setting in texinfo.mk
diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST
index 5abd8ba8157..52d7657aea5 100644
--- a/devel/gtexinfo/PLIST
+++ b/devel/gtexinfo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/02/15 22:27:49 seb Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/04/24 19:47:44 jlam Exp $
 bin/info
 bin/infokey
 bin/install-info
@@ -12,23 +12,6 @@ man/man1/texi2dvi.1
 man/man1/texindex.1
 man/man5/info.5
 man/man5/texinfo.5
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/de_AT/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/texinfo.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/texinfo.mo
 share/texinfo/texinfo.dtd
 share/texinfo/texinfo.xsl
 @dirrm share/texinfo
diff --git a/devel/gtexinfo/PLIST.locale b/devel/gtexinfo/PLIST.locale
new file mode 100644
index 00000000000..e944b746c52
--- /dev/null
+++ b/devel/gtexinfo/PLIST.locale
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST.locale,v 1.1 2004/04/24 19:47:44 jlam Exp $
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/de_AT/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/texinfo.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/texinfo.mo