[pkgsrc/trunk]: pkgsrc/devel/gmake gmake: fix PR pkg/54629

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a5b0a416d8a
branches:  trunk
changeset: 416184:5a5b0a416d8a
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Sun Oct 20 16:29:42 2019 +0000

description:
gmake: fix PR pkg/54629

pkgsrc changes:
- Remove PLIST_SRC in Makefile.
- Remove PLIST.locale file (use PLIST.nls instead).

diffstat:

 devel/gmake/Makefile     |   6 ++----
 devel/gmake/PLIST        |  27 ++++++++++++++++++++++++++-
 devel/gmake/PLIST.locale |  26 --------------------------
 devel/gmake/options.mk   |  15 +++++++++------
 4 files changed, 37 insertions(+), 37 deletions(-)

diffs (120 lines):

diff -r 10934c3f0843 -r 5a5b0a416d8a devel/gmake/Makefile
--- a/devel/gmake/Makefile      Sun Oct 20 15:27:30 2019 +0000
+++ b/devel/gmake/Makefile      Sun Oct 20 16:29:42 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2018/11/16 16:00:18 leot Exp $
+# $NetBSD: Makefile,v 1.108 2019/10/20 16:29:42 triaxx Exp $
 
 DISTNAME=      make-4.2.1
 PKGNAME=       g${DISTNAME}
@@ -34,12 +34,10 @@
 
 AUTO_MKDIRS=           yes
 
-PLIST_SRC=             ${PKGDIR}/PLIST
-
 .include "options.mk"
 
 post-install:
-       ${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}/bin/make
+       ${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/make
        ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10934c3f0843 -r 5a5b0a416d8a devel/gmake/PLIST
--- a/devel/gmake/PLIST Sun Oct 20 15:27:30 2019 +0000
+++ b/devel/gmake/PLIST Sun Oct 20 16:29:42 2019 +0000
@@ -1,7 +1,32 @@
-@comment $NetBSD: PLIST,v 1.12 2013/10/23 08:54:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/10/20 16:29:42 triaxx Exp $
 bin/gmake
 gnu/bin/make
 gnu/man/man1/make.1
 include/gnumake.h
 info/make.info
 man/man1/gmake.1
+${PLIST.nls}share/locale/be/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/ga/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/gl/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/hr/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/lt/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/make.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/make.mo
diff -r 10934c3f0843 -r 5a5b0a416d8a devel/gmake/PLIST.locale
--- a/devel/gmake/PLIST.locale  Sun Oct 20 15:27:30 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST.locale,v 1.5 2013/10/23 08:54:59 wiz Exp $
-share/locale/be/LC_MESSAGES/make.mo
-share/locale/cs/LC_MESSAGES/make.mo
-share/locale/da/LC_MESSAGES/make.mo
-share/locale/de/LC_MESSAGES/make.mo
-share/locale/es/LC_MESSAGES/make.mo
-share/locale/fi/LC_MESSAGES/make.mo
-share/locale/fr/LC_MESSAGES/make.mo
-share/locale/ga/LC_MESSAGES/make.mo
-share/locale/gl/LC_MESSAGES/make.mo
-share/locale/he/LC_MESSAGES/make.mo
-share/locale/hr/LC_MESSAGES/make.mo
-share/locale/id/LC_MESSAGES/make.mo
-share/locale/it/LC_MESSAGES/make.mo
-share/locale/ja/LC_MESSAGES/make.mo
-share/locale/ko/LC_MESSAGES/make.mo
-share/locale/lt/LC_MESSAGES/make.mo
-share/locale/nl/LC_MESSAGES/make.mo
-share/locale/pl/LC_MESSAGES/make.mo
-share/locale/pt_BR/LC_MESSAGES/make.mo
-share/locale/ru/LC_MESSAGES/make.mo
-share/locale/sv/LC_MESSAGES/make.mo
-share/locale/tr/LC_MESSAGES/make.mo
-share/locale/uk/LC_MESSAGES/make.mo
-share/locale/vi/LC_MESSAGES/make.mo
-share/locale/zh_CN/LC_MESSAGES/make.mo
diff -r 10934c3f0843 -r 5a5b0a416d8a devel/gmake/options.mk
--- a/devel/gmake/options.mk    Sun Oct 20 15:27:30 2019 +0000
+++ b/devel/gmake/options.mk    Sun Oct 20 16:29:42 2019 +0000
@@ -1,17 +1,20 @@
-# $NetBSD: options.mk,v 1.3 2016/01/01 01:42:53 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/20 16:29:42 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gmake
 PKG_SUPPORTED_OPTIONS= nls
 
-PKG_OPTIONS_LEGACY_VARS+=      GMAKE_LOCALE
+PLIST_VARS+=           nls
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mnls)
-USE_PKGLOCALEDIR=              yes
-PLIST_SRC+=                    ${PKGDIR}/PLIST.locale
-USE_TOOLS+=                    msgfmt
+.include "../../devel/gettext-lib/builtin.mk"
+.if !empty(PKG_OPTIONS:Mnls) && \
+    !empty(IS_BUILTIN.gettext:M[yY][eE][sS])
+USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            msgfmt
+PREFER.gettext=                native
 .  include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=             yes
 .else
 CONFIGURE_ARGS+=       --without-libintl-prefix
 CONFIGURE_ARGS+=       --without-libiconv-prefix