CVS commit: pkgsrc/devel/gettext-lib

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Oct 30 14:43:20 UTC 2019

Modified Files:
        pkgsrc/devel/gettext-lib: builtin.mk

Log Message:
gettext-lib: declare built-in implementation if ngettext() supplied

The H_NGETTEXT_GETTEXT symbol was tested to determine whether we should use
the built-in implementation and to declare USE_BUILTIN.gettext. According
the associated comment, this symbol should be tested to determine if there
is a built-in implementation and to declare IS_BUILTIN.gettext.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/gettext-lib/builtin.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/gettext-lib/builtin.mk
diff -u pkgsrc/devel/gettext-lib/builtin.mk:1.46 pkgsrc/devel/gettext-lib/builtin.mk:1.47
--- pkgsrc/devel/gettext-lib/builtin.mk:1.46    Thu Jul  3 14:59:55 2014
+++ pkgsrc/devel/gettext-lib/builtin.mk Wed Oct 30 14:43:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.46 2014/07/03 14:59:55 wiz Exp $
+# $NetBSD: builtin.mk,v 1.47 2019/10/30 14:43:20 triaxx Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -32,12 +32,17 @@ BUILTIN_FIND_GREP.H_OPNSVR5_GETTEXT=        lib
 # SCO OpenServer 5.0.7/3.2 has an unusual scheme where /usr/include/libintl.h
 # pulls in /usr/include/libgnuintl.h, where the latter is the real libintl.h.
 #
+# By default, assume that the native gettext implementation is good
+# enough to replace GNU gettext if it supplies ngettext().
+#
 .if !defined(IS_BUILTIN.gettext)
 IS_BUILTIN.gettext=    no
 .  if (empty(H_GETTEXT:M__nonexistent__) && \
        empty(H_GETTEXT:M${LOCALBASE}/*)) || \
       (empty(H_GENTOO_GETTEXT:M__nonexistent__) && \
        empty(H_GENTOO_GETTEXT:M${LOCALBASE}/*)) || \
+      (empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \
+       empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*)) || \
       (empty(H_OPNSVR5_GETTEXT:M__nonexistent__) && \
        empty(H_OPNSVR5_GETTEXT:M${LOCALBASE}/*))
 IS_BUILTIN.gettext=    yes
@@ -68,14 +73,7 @@ USE_BUILTIN.gettext!=                                                        \
 .        endif
 .      endfor
 .    endif
-# XXX
-# XXX By default, assume that the native gettext implementation is good
-# XXX enough to replace GNU gettext if it supplies ngettext().
-# XXX
-.    if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \
-       empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*)
-USE_BUILTIN.gettext=   yes
-.    endif
+#
 #
 # Some platforms don't have a gettext implementation that can replace
 # GNU gettext.