CVS commit: pkgsrc/devel

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Dec 27 15:09:53 UTC 2018

Modified Files:
        pkgsrc/devel/gettext: distinfo
        pkgsrc/devel/gettext-m4: Makefile
Added Files:
        pkgsrc/devel/gettext/patches: patch-gettext-runtime_m4_gettext.m4

Log Message:
Do not require _nl_expand_alias to exist, it's a pointless reference to
internals of the GNU libintl implementation. Bump gettext-m4.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/gettext/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/gettext-m4/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4

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/distinfo
diff -u pkgsrc/devel/gettext/distinfo:1.35 pkgsrc/devel/gettext/distinfo:1.36
--- pkgsrc/devel/gettext/distinfo:1.35  Sat Jun 11 18:26:15 2016
+++ pkgsrc/devel/gettext/distinfo       Thu Dec 27 15:09:53 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2016/06/11 18:26:15 wiz Exp $
+$NetBSD: distinfo,v 1.36 2018/12/27 15:09:53 joerg Exp $
 
 SHA1 (gettext-0.19.8.1.tar.gz) = b5d24ba2958c91fc5cc0058165837c99a0f58784
 RMD160 (gettext-0.19.8.1.tar.gz) = 29a5f29d186fe2aece5c450fd1a743b819c02c5b
@@ -14,4 +14,5 @@ SHA1 (patch-ak) = 05b06eae21fcf49af91479
 SHA1 (patch-al) = 15563935bd43886309dd95a0816a5c2153b5da3c
 SHA1 (patch-an) = ec67e2bf66950190b2077b3d888efdf5ca2d6785
 SHA1 (patch-ao) = d0ab5520f53f38c7b2eb76395c5d6dd24407ef4f
+SHA1 (patch-gettext-runtime_m4_gettext.m4) = a154919e5da2013c3a2eaa965dc5f12460b1d4f4
 SHA1 (patch-gettext-tools_tests_Makefile.in) = 7ea89df2c45e6c544e2ec6c91cde6d135d964679

Index: pkgsrc/devel/gettext-m4/Makefile
diff -u pkgsrc/devel/gettext-m4/Makefile:1.22 pkgsrc/devel/gettext-m4/Makefile:1.23
--- pkgsrc/devel/gettext-m4/Makefile:1.22       Thu Oct  9 13:44:36 2014
+++ pkgsrc/devel/gettext-m4/Makefile    Thu Dec 27 15:09:53 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2014/10/09 13:44:36 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/12/27 15:09:53 joerg 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
 

Added files:

Index: pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4
diff -u /dev/null pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4:1.1
--- /dev/null   Thu Dec 27 15:09:53 2018
+++ pkgsrc/devel/gettext/patches/patch-gettext-runtime_m4_gettext.m4    Thu Dec 27 15:09:53 2018
@@ -0,0 +1,24 @@
+$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