CVS commit: pkgsrc/devel/gmake

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Sun Oct 20 16:29:42 UTC 2019

Modified Files:
        pkgsrc/devel/gmake: Makefile PLIST options.mk
Removed Files:
        pkgsrc/devel/gmake: PLIST.locale

Log Message:
gmake: fix PR pkg/54629

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


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/devel/gmake/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/gmake/PLIST
cvs rdiff -u -r1.5 -r0 pkgsrc/devel/gmake/PLIST.locale
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gmake/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gmake/Makefile
diff -u pkgsrc/devel/gmake/Makefile:1.107 pkgsrc/devel/gmake/Makefile:1.108
--- pkgsrc/devel/gmake/Makefile:1.107   Fri Nov 16 16:00:18 2018
+++ pkgsrc/devel/gmake/Makefile Sun Oct 20 16:29:42 2019
@@ -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 @@ CONFIGURE_ARGS+=    ac_cv_func_getloadavg_s
 
 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"

Index: pkgsrc/devel/gmake/PLIST
diff -u pkgsrc/devel/gmake/PLIST:1.12 pkgsrc/devel/gmake/PLIST:1.13
--- pkgsrc/devel/gmake/PLIST:1.12       Wed Oct 23 08:54:59 2013
+++ pkgsrc/devel/gmake/PLIST    Sun Oct 20 16:29:42 2019
@@ -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

Index: pkgsrc/devel/gmake/options.mk
diff -u pkgsrc/devel/gmake/options.mk:1.3 pkgsrc/devel/gmake/options.mk:1.4
--- pkgsrc/devel/gmake/options.mk:1.3   Fri Jan  1 01:42:53 2016
+++ pkgsrc/devel/gmake/options.mk       Sun Oct 20 16:29:42 2019
@@ -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