Thu Dec 27 15:09:53 2018 UTC ()
Do not require _nl_expand_alias to exist, it's a pointless reference to
internals of the GNU libintl implementation. Bump gettext-m4.


(joerg)
diff -r1.35 -r1.36 pkgsrc/devel/gettext/distinfo
diff -r1.22 -r1.23 pkgsrc/devel/gettext-m4/Makefile
diff -r0 -r1.1 pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4
cvs diff -r1.35 -r1.36 pkgsrc/devel/gettext/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gettext/distinfo 2016/06/11 18:26:15 1.35
+++ pkgsrc/devel/gettext/distinfo 2018/12/27 15:09:53 1.36
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.35 2016/06/11 18:26:15 wiz Exp $ 1$NetBSD: distinfo,v 1.36 2018/12/27 15:09:53 joerg Exp $
2 2
3SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784 3SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784
4RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b 4RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b
5SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 5SHA512 (gettext-0.19.8.1.tar.gz) = 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
6Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes 6Size (gettext-0.19.8.1.tar.gz) = 19704011 bytes
7SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2 7SHA1 (patch-aa) = ec9cad88d5a0de67b70d417915ec0f1cfb3552b2
8SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0 8SHA1 (patch-ab) = caf95d3fa21ce5cab9febc9f6e9164e633ab39e0
9SHA1 (patch-ad) = 3e04eca9d824ed1bed282f3d49d5ce60ebac576f 9SHA1 (patch-ad) = 3e04eca9d824ed1bed282f3d49d5ce60ebac576f
10SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c 10SHA1 (patch-ae) = 662975f811495f13604001964fcc6e3d13b1276c
11SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96 11SHA1 (patch-ag) = 57cd120015eeddcb8ca1d7605c42af3374755c96
12SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481 12SHA1 (patch-aj) = d5e66478ddf343ad74eb8429de47c567a81a8481
13SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c 13SHA1 (patch-ak) = 05b06eae21fcf49af91479a63c5b9bbc1388101c
14SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c 14SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
15SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785 15SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785
16SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f 16SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
 17SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
17SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679 18SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679
cvs diff -r1.22 -r1.23 pkgsrc/devel/gettext-m4/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext-m4/Makefile 2014/10/09 13:44:36 1.22
+++ pkgsrc/devel/gettext-m4/Makefile 2018/12/27 15:09:53 1.23
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.22 2014/10/09 13:44:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2018/12/27 15:09:53 joerg Exp $
2 2
3.include "../../devel/gettext/Makefile.common" 3.include "../../devel/gettext/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-m4-/} 5PKGNAME= ${DISTNAME:S/-/-m4-/}
 6PKGREVISION= 1
6COMMENT= Autoconf/automake m4 files for GNU NLS library 7COMMENT= Autoconf/automake m4 files for GNU NLS library
7LICENSE= gnu-gpl-v2 8LICENSE= gnu-gpl-v2
8 9
9DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../devel/gettext/distinfo
10PATCHDIR= ${.CURDIR}/../../devel/gettext/patches 11PATCHDIR= ${.CURDIR}/../../devel/gettext/patches
11 12
12NO_BUILD= yes 13NO_BUILD= yes
13NO_CONFIGURE= yes 14NO_CONFIGURE= yes
14 15
15INSTALLATION_DIRS+= share/aclocal 16INSTALLATION_DIRS+= share/aclocal
16 17
17do-install: 18do-install:
18 ${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \ 19 ${INSTALL_DATA} ${WRKSRC}/gettext-runtime/m4/*.m4 \
File Added: pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4
$NetBSD: patch-gettext-runtime_m4_gettext.m4,v 1.1 2018/12/27 15:09:53 joerg Exp $

--- gettext-runtime/m4/gettext.m4.orig	2018-12-26 00:43:05.863552486 +0000
+++ gettext-runtime/m4/gettext.m4
@@ -204,8 +204,7 @@ extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr)
 #else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
@@ -230,8 +229,7 @@ extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr)
 #else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif