CVS commit: pkgsrc/devel/gettext-m4

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Mon Dec 16 14:44:56 UTC 2019

Modified Files:
        pkgsrc/devel/gettext-m4: Makefile PLIST

Log Message:
Also install host-cpu-c-abi.m4 from gettext-tools/gnulib-m4

This fixes errors about gl_HOST_CPU_C_ABI_32BIT not being defined when
running autoreconf, and errors about such a command not being found when
the generated configure script is run.

configure.ac:20: warning: gl_HOST_CPU_C_ABI_32BIT is m4_require'd but not m4_defun'd

Based on only a cursory understanding of autoconf, it seems like all
the files in share/aclocal are always included. Therefore it should be
possible to detect errors like this by running autoconf or autoreconf,
before committing to pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/gettext-m4/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/gettext-m4/PLIST

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

Modified files:

Index: pkgsrc/devel/gettext-m4/Makefile
diff -u pkgsrc/devel/gettext-m4/Makefile:1.25 pkgsrc/devel/gettext-m4/Makefile:1.26
--- pkgsrc/devel/gettext-m4/Makefile:1.25       Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/gettext-m4/Makefile    Mon Dec 16 14:44:56 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2019/12/16 14:44:56 kim Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-m4-/}
+PKGREVISION=   1
 COMMENT=       Autoconf/automake m4 files for GNU NLS library
 LICENSE=       gnu-gpl-v2
 
@@ -14,16 +15,28 @@ NO_CONFIGURE=               yes
 
 INSTALLATION_DIRS+=    share/aclocal
 
+GNULIB_M4_FILES=                       \
+       codeset.m4              \
+       extern-inline.m4        \
+       host-cpu-c-abi.m4       \
+       lcmessage.m4            \
+       lib-ld.m4               \
+       lib-link.m4             \
+       lib-prefix.m4           \
+       lock.m4                 \
+       longlong.m4             \
+       threadlib.m4            \
+       wchar_t.m4              \
+       wint_t.m4               \
+
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \
                ${DESTDIR}${PREFIX}/share/aclocal
        ${INSTALL_DATA} ${WRKSRC}/gettext-tools/m4/*.m4 \
                ${DESTDIR}${PREFIX}/share/aclocal
-.for i in lib-ld.m4 lib-link.m4 lib-prefix.m4 extern-inline.m4 \
-           lock.m4 longlong.m4 lcmessage.m4 threadlib.m4 wchar_t.m4 \
-           wint_t.m4 codeset.m4
-           ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \
-               ${DESTDIR}${PREFIX}/share/aclocal
+.for i in ${GNULIB_M4_FILES}
+       ${INSTALL_DATA} ${WRKSRC}/gettext-tools/gnulib-m4/${i} \
+           ${DESTDIR}${PREFIX}/share/aclocal
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gettext-m4/PLIST
diff -u pkgsrc/devel/gettext-m4/PLIST:1.9 pkgsrc/devel/gettext-m4/PLIST:1.10
--- pkgsrc/devel/gettext-m4/PLIST:1.9   Mon May 27 13:21:41 2019
+++ pkgsrc/devel/gettext-m4/PLIST       Mon Dec 16 14:44:56 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2019/05/27 13:21:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/12/16 14:44:56 kim Exp $
 share/aclocal/codeset.m4
 share/aclocal/exported.m4
 share/aclocal/extern-inline.m4
@@ -7,6 +7,7 @@ share/aclocal/flexmember.m4
 share/aclocal/gettext.m4
 share/aclocal/glibc2.m4
 share/aclocal/glibc21.m4
+share/aclocal/host-cpu-c-abi.m4
 share/aclocal/hostname.m4
 share/aclocal/iconv.m4
 share/aclocal/intdiv0.m4