[pkgsrc/trunk]: pkgsrc/lang/gcc46 Move ICONVPREFIX definition to nls option.

[hans <hans%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/879b2729e149
branches:  trunk
changeset: 602384:879b2729e149
user:      hans <hans%pkgsrc.org@localhost>
date:      Fri Apr 13 10:38:26 2012 +0000

description:
Move ICONVPREFIX definition to nls option.

diffstat:

 lang/gcc46/Makefile   |  3 +--
 lang/gcc46/options.mk |  3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 2fe316f58001 -r 879b2729e149 lang/gcc46/Makefile
--- a/lang/gcc46/Makefile       Fri Apr 13 10:35:38 2012 +0000
+++ b/lang/gcc46/Makefile       Fri Apr 13 10:38:26 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/03/15 06:45:26 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/04/13 10:38:26 hans Exp $
 
 DISTNAME=              gcc-${GCC_VERSION}
 PKGNAME=               gcc46-${GCC_VERSION}
@@ -87,7 +87,6 @@
 
 CONFIGURE_ENV+=                CONFIG_SHELL=${CONFIG_SHELL}
 
-MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=             SHELL=${CONFIG_SHELL}
 MAKE_ENV+=             ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
 
diff -r 2fe316f58001 -r 879b2729e149 lang/gcc46/options.mk
--- a/lang/gcc46/options.mk     Fri Apr 13 10:35:38 2012 +0000
+++ b/lang/gcc46/options.mk     Fri Apr 13 10:38:26 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2012/04/08 05:04:46 sbd Exp $
+# $NetBSD: options.mk,v 1.7 2012/04/13 10:38:26 hans Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc46
 PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada
@@ -21,6 +21,7 @@
 USE_TOOLS+=            msgfmt
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
+MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .else