[pkgsrc/trunk]: pkgsrc/lang/gcc9 lang/gcc9: fix build on NetBSD-9.0_RC1-amd64

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f78b8e2f852
branches:  trunk
changeset: 347182:3f78b8e2f852
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Jan 08 17:00:06 2020 +0000

description:
lang/gcc9: fix build on NetBSD-9.0_RC1-amd64

gcc9 needs to install the fixed malloc.h in that configuration.
On NetBSD-8.0-amd64 this was not necessary though.

diffstat:

 lang/gcc9/PLIST      |  82 ++++++++++++++++++++++++++--------------------------
 lang/gcc9/options.mk |   5 ++-
 2 files changed, 45 insertions(+), 42 deletions(-)

diffs (119 lines):

diff -r 9a39c5957193 -r 3f78b8e2f852 lang/gcc9/PLIST
--- a/lang/gcc9/PLIST   Wed Jan 08 16:59:17 2020 +0000
+++ b/lang/gcc9/PLIST   Wed Jan 08 17:00:06 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/06 15:43:51 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/01/08 17:00:06 minskim Exp $
 gcc9/bin/c++
 gcc9/bin/cc
 gcc9/bin/cpp
@@ -1432,43 +1432,43 @@
 gcc9/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
 gcc9/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
 gcc9/share/gcc-${PKGVERSION}/python/libstdcxx/v6/xmethods.py
-gcc9/share/locale/be/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/be/LC_MESSAGES/gcc.mo
-gcc9/share/locale/ca/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/da/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/da/LC_MESSAGES/gcc.mo
-gcc9/share/locale/de/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/de/LC_MESSAGES/gcc.mo
-gcc9/share/locale/el/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/el/LC_MESSAGES/gcc.mo
-gcc9/share/locale/eo/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/es/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/es/LC_MESSAGES/gcc.mo
-gcc9/share/locale/fi/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/fi/LC_MESSAGES/gcc.mo
-gcc9/share/locale/fr/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/fr/LC_MESSAGES/gcc.mo
-gcc9/share/locale/hr/LC_MESSAGES/gcc.mo
-gcc9/share/locale/id/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/id/LC_MESSAGES/gcc.mo
-gcc9/share/locale/ja/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/ja/LC_MESSAGES/gcc.mo
-gcc9/share/locale/nl/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/nl/LC_MESSAGES/gcc.mo
-gcc9/share/locale/pt_BR/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/ru/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/ru/LC_MESSAGES/gcc.mo
-gcc9/share/locale/sr/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/sr/LC_MESSAGES/gcc.mo
-gcc9/share/locale/sv/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/sv/LC_MESSAGES/gcc.mo
-gcc9/share/locale/tr/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/tr/LC_MESSAGES/gcc.mo
-gcc9/share/locale/uk/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/uk/LC_MESSAGES/gcc.mo
-gcc9/share/locale/vi/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/vi/LC_MESSAGES/gcc.mo
-gcc9/share/locale/zh_CN/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/zh_CN/LC_MESSAGES/gcc.mo
-gcc9/share/locale/zh_TW/LC_MESSAGES/cpplib.mo
-gcc9/share/locale/zh_TW/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/be/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/be/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/ca/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/da/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/da/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/de/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/de/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/el/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/el/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/eo/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/es/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/es/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/fi/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/fi/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/fr/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/fr/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/hr/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/id/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/id/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/ja/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/ja/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/nl/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/nl/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/pt_BR/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/ru/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/ru/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/sr/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/sr/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/sv/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/sv/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/tr/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/tr/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/uk/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/uk/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/vi/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/vi/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/zh_CN/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/zh_CN/LC_MESSAGES/gcc.mo
+${PLIST.nls}/gcc9/share/locale/zh_TW/LC_MESSAGES/cpplib.mo
+${PLIST.nls}/gcc9/share/locale/zh_TW/LC_MESSAGES/gcc.mo
diff -r 9a39c5957193 -r 3f78b8e2f852 lang/gcc9/options.mk
--- a/lang/gcc9/options.mk      Wed Jan 08 16:59:17 2020 +0000
+++ b/lang/gcc9/options.mk      Wed Jan 08 17:00:06 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/01/05 21:15:45 rillig Exp $
+# $NetBSD: options.mk,v 1.2 2020/01/08 17:00:06 minskim Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc9
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-c++ gcc-fortran \
@@ -6,6 +6,8 @@
 PKG_SUGGESTED_OPTIONS= gcc-c++ gcc-fortran gcc-objc gcc-objc++ \
                        gcc-inplace-math
 
+PLIST_VARS+=   nls
+
 .if ${OPSYS} == NetBSD || ${OPSYS} == Linux || ${OPSYS} == DragonFly
 PKG_SUGGESTED_OPTIONS+=        nls
 .endif
@@ -75,6 +77,7 @@
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
+PLIST.nls=             yes
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .else