Sun Oct 20 16:29:42 2019 UTC ()
gmake: fix PR pkg/54629

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


(triaxx)
diff -r1.107 -r1.108 pkgsrc/devel/gmake/Makefile
diff -r1.12 -r1.13 pkgsrc/devel/gmake/PLIST
diff -r1.5 -r0 pkgsrc/devel/gmake/PLIST.locale
diff -r1.3 -r1.4 pkgsrc/devel/gmake/options.mk
cvs diff -r1.107 -r1.108 pkgsrc/devel/gmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gmake/Makefile 2018/11/16 16:00:18 1.107
+++ pkgsrc/devel/gmake/Makefile 2019/10/20 16:29:42 1.108
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.107 2018/11/16 16:00:18 leot Exp $ 1# $NetBSD: Makefile,v 1.108 2019/10/20 16:29:42 triaxx Exp $
2 2
3DISTNAME= make-4.2.1 3DISTNAME= make-4.2.1
4PKGNAME= g${DISTNAME} 4PKGNAME= g${DISTNAME}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GNU:=make/} 7MASTER_SITES= ${MASTER_SITE_GNU:=make/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/make/make.html 11HOMEPAGE= http://www.gnu.org/software/make/make.html
12COMMENT= GNU version of 'make' utility 12COMMENT= GNU version of 'make' utility
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -24,22 +24,20 @@ INFO_FILES= yes @@ -24,22 +24,20 @@ INFO_FILES= yes
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26CONFIGURE_ARGS+= --program-prefix=g 26CONFIGURE_ARGS+= --program-prefix=g
27 27
28# workaround for broken strndup 28# workaround for broken strndup
29CONFIGURE_ARGS.MirBSD+= ac_cv_func_strndup=no 29CONFIGURE_ARGS.MirBSD+= ac_cv_func_strndup=no
30 30
31# XXX: Do not install gmake setgid and do not override the owner group 31# XXX: Do not install gmake setgid and do not override the owner group
32# XXX: based on possible /dev/kmem permissions. 32# XXX: based on possible /dev/kmem permissions.
33CONFIGURE_ARGS+= ac_cv_func_getloadavg_setgid=no 33CONFIGURE_ARGS+= ac_cv_func_getloadavg_setgid=no
34 34
35AUTO_MKDIRS= yes 35AUTO_MKDIRS= yes
36 36
37PLIST_SRC= ${PKGDIR}/PLIST 
38 
39.include "options.mk" 37.include "options.mk"
40 38
41post-install: 39post-install:
42 ${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}/bin/make 40 ${LN} -sf ${PREFIX}/bin/gmake ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/make
43 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1 41 ${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/gmake.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/make.1
44 42
45.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/devel/gmake/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gmake/PLIST 2013/10/23 08:54:59 1.12
+++ pkgsrc/devel/gmake/PLIST 2019/10/20 16:29:42 1.13
@@ -1,7 +1,32 @@ @@ -1,7 +1,32 @@
1@comment $NetBSD: PLIST,v 1.12 2013/10/23 08:54:59 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.13 2019/10/20 16:29:42 triaxx Exp $
2bin/gmake 2bin/gmake
3gnu/bin/make 3gnu/bin/make
4gnu/man/man1/make.1 4gnu/man/man1/make.1
5include/gnumake.h 5include/gnumake.h
6info/make.info 6info/make.info
7man/man1/gmake.1 7man/man1/gmake.1
 8${PLIST.nls}share/locale/be/LC_MESSAGES/make.mo
 9${PLIST.nls}share/locale/cs/LC_MESSAGES/make.mo
 10${PLIST.nls}share/locale/da/LC_MESSAGES/make.mo
 11${PLIST.nls}share/locale/de/LC_MESSAGES/make.mo
 12${PLIST.nls}share/locale/es/LC_MESSAGES/make.mo
 13${PLIST.nls}share/locale/fi/LC_MESSAGES/make.mo
 14${PLIST.nls}share/locale/fr/LC_MESSAGES/make.mo
 15${PLIST.nls}share/locale/ga/LC_MESSAGES/make.mo
 16${PLIST.nls}share/locale/gl/LC_MESSAGES/make.mo
 17${PLIST.nls}share/locale/he/LC_MESSAGES/make.mo
 18${PLIST.nls}share/locale/hr/LC_MESSAGES/make.mo
 19${PLIST.nls}share/locale/id/LC_MESSAGES/make.mo
 20${PLIST.nls}share/locale/it/LC_MESSAGES/make.mo
 21${PLIST.nls}share/locale/ja/LC_MESSAGES/make.mo
 22${PLIST.nls}share/locale/ko/LC_MESSAGES/make.mo
 23${PLIST.nls}share/locale/lt/LC_MESSAGES/make.mo
 24${PLIST.nls}share/locale/nl/LC_MESSAGES/make.mo
 25${PLIST.nls}share/locale/pl/LC_MESSAGES/make.mo
 26${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/make.mo
 27${PLIST.nls}share/locale/ru/LC_MESSAGES/make.mo
 28${PLIST.nls}share/locale/sv/LC_MESSAGES/make.mo
 29${PLIST.nls}share/locale/tr/LC_MESSAGES/make.mo
 30${PLIST.nls}share/locale/uk/LC_MESSAGES/make.mo
 31${PLIST.nls}share/locale/vi/LC_MESSAGES/make.mo
 32${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/make.mo
File Deleted: pkgsrc/devel/gmake/Attic/PLIST.locale
cvs diff -r1.3 -r1.4 pkgsrc/devel/gmake/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/gmake/options.mk 2016/01/01 01:42:53 1.3
+++ pkgsrc/devel/gmake/options.mk 2019/10/20 16:29:42 1.4
@@ -1,19 +1,22 @@ @@ -1,19 +1,22 @@
1# $NetBSD: options.mk,v 1.3 2016/01/01 01:42:53 ryoon Exp $ 1# $NetBSD: options.mk,v 1.4 2019/10/20 16:29:42 triaxx Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gmake 3PKG_OPTIONS_VAR= PKG_OPTIONS.gmake
4PKG_SUPPORTED_OPTIONS= nls 4PKG_SUPPORTED_OPTIONS= nls
5 5
6PKG_OPTIONS_LEGACY_VARS+= GMAKE_LOCALE 6PLIST_VARS+= nls
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10.if !empty(PKG_OPTIONS:Mnls) 10.include "../../devel/gettext-lib/builtin.mk"
11USE_PKGLOCALEDIR= yes 11.if !empty(PKG_OPTIONS:Mnls) && \
12PLIST_SRC+= ${PKGDIR}/PLIST.locale 12 !empty(IS_BUILTIN.gettext:M[yY][eE][sS])
13USE_TOOLS+= msgfmt 13USE_PKGLOCALEDIR= yes
 14USE_TOOLS+= msgfmt
 15PREFER.gettext= native
14. include "../../devel/gettext-lib/buildlink3.mk" 16. include "../../devel/gettext-lib/buildlink3.mk"
 17PLIST.nls= yes
15.else 18.else
16CONFIGURE_ARGS+= --without-libintl-prefix 19CONFIGURE_ARGS+= --without-libintl-prefix
17CONFIGURE_ARGS+= --without-libiconv-prefix 20CONFIGURE_ARGS+= --without-libiconv-prefix
18CONFIGURE_ARGS+= --disable-nls 21CONFIGURE_ARGS+= --disable-nls
19.endif 22.endif