From 6d3bc395919160ff10f94416f3eaf14d77e1ef32 Mon Sep 17 00:00:00 2001
From: hans <hans@pkgsrc.org>
Date: Thu, 14 Apr 2011 19:38:13 +0000
Subject: Fix option nls.

Include devel/gettext-lib/buildlink3.mk in buildlink3.mk only if option
nls is enabled. Msgfmt is only needed if nls is enabled.
---
 lang/gcc44/Makefile      | 4 ++--
 lang/gcc44/buildlink3.mk | 6 +++++-
 lang/gcc44/options.mk    | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d650a6ee324..f696e50fd93 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/04/14 19:31:35 hans Exp $
+# $NetBSD: Makefile,v 1.19 2011/04/14 19:38:13 hans Exp $
 
 DISTNAME=		gcc-${GCC_VERSION}
 PKGNAME=		gcc44-${GCC_VERSION}
@@ -15,7 +15,7 @@ LICENSE=		gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		awk:run bash:run perl chmod \
-			gmake:run makeinfo msgfmt bison flex gm4 \
+			gmake:run makeinfo bison flex gm4 \
 			sed:run unzip
 
 DEPENDS+=		zip-[0-9]*:../../archivers/zip
diff --git a/lang/gcc44/buildlink3.mk b/lang/gcc44/buildlink3.mk
index e149e48f411..02b32159b78 100644
--- a/lang/gcc44/buildlink3.mk
+++ b/lang/gcc44/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/03/15 08:27:06 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2011/04/14 19:38:13 hans Exp $
 
 BUILDLINK_TREE+=	gcc44
 
@@ -57,7 +57,11 @@ BUILDLINK_DEPMETHOD.gcc44?=	build
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
+pkgbase := gcc44
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.gcc44:Mnls)
 .include "../../devel/gettext-lib/buildlink3.mk"
+.endif
 .endif # GCC44_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gcc44
diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk
index feeaa4ba972..b2bb6e1d8d8 100644
--- a/lang/gcc44/options.mk
+++ b/lang/gcc44/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2009/10/24 20:16:02 tnn Exp $
+# $NetBSD: options.mk,v 1.3 2011/04/14 19:38:13 hans Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc44
 PKG_SUPPORTED_OPTIONS=	nls
@@ -14,6 +14,7 @@ PKG_SUGGESTED_OPTIONS+=	nls
 ###
 .if !empty(PKG_OPTIONS:Mnls)
 CONFIGURE_ARGS+=	--enable-nls
+USE_TOOLS+=		msgfmt
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .else
-- 
cgit v1.2.3