[pkgsrc/trunk]: pkgsrc/mk/tools There are two things that we need to keep tra...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34acdc5bef93
branches:  trunk
changeset: 511491:34acdc5bef93
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 15 16:48:12 2006 +0000

description:
There are two things that we need to keep track of:

   (1) whether or not the built-in msgfmt supports msgid_plural, and
       thus whether we need to use the msgfmt.sh script
       (_TOOLS_USE_MSGFMT_SH), and

   (2) whether or not we need to use the pkgsrc version of msgfmt
       (_TOOLS_USE_PKGSRC.msgfmt)

If we truly don't need to use msgfmt.sh, then never invoke it.  This is
the case on NetBSD>=3.x.  This should fix the problem with building the
*.po files in fonts/fontforge on NetBSD-current.

diffstat:

 mk/tools/gettext.mk |  23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diffs (53 lines):

diff -r 98da3e9a2d3c -r 34acdc5bef93 mk/tools/gettext.mk
--- a/mk/tools/gettext.mk       Sat Apr 15 15:02:10 2006 +0000
+++ b/mk/tools/gettext.mk       Sat Apr 15 16:48:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gettext.mk,v 1.3 2006/04/14 13:49:17 jlam Exp $
+# $NetBSD: gettext.mk,v 1.4 2006/04/15 16:48:12 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,22 +57,26 @@
 MAKEFLAGS+=            TOOLS_IGNORE.msgfmt=
 .  else
 .    if defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)
-.      if !defined(_TOOLS_USE_PKGSRC.msgfmt)
+_TOOLS_USE_PKGSRC.msgfmt?=     no
+#
+# Determine if the platform-supplied msgfmt is new enough to support
+# the msgid_plural statement.  We need at least 0.10.36 for GNU msgfmt.
 #
-# Discover if the version on the builtin msgfmt is new enough to handle
-# msgid_plural (at least 0.10.35).
-#
+# XXX Solaris msgfmt also understands msgid_plural but more tests are
+# XXX needed to take advantage of this.
+# XXX
+.      if !defined(_TOOLS_USE_MSGFMT_SH)
 _TOOLS_VERSION.msgfmt!=                ${TOOLS_PLATFORM.msgfmt} --version |    \
                                ${AWK} '{ print $$4; exit }'
-_TOOLS_USE_PKGSRC.msgfmt!=                                             \
-       if ${PKG_ADMIN} pmatch "gettext>=0.10.35"                       \
+_TOOLS_USE_MSGFMT_SH!=                                                 \
+       if ${PKG_ADMIN} pmatch "gettext>0.10.35"                        \
                        gettext-${_TOOLS_VERSION.msgfmt:Q}; then        \
                ${ECHO} no;                                             \
        else                                                            \
                ${ECHO} yes;                                            \
        fi
 .      endif
-MAKEVARS+=     _TOOLS_USE_PKGSRC.msgfmt
+MAKEVARS+=     _TOOLS_USE_MSGFMT_SH
 .    else
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 .    endif
@@ -92,7 +96,8 @@
 TOOLS_DEPENDS.msgfmt?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
 TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.msgfmt=${TOOLS_DEPENDS.msgfmt:C/:.*//}
 TOOLS_PATH.msgfmt=     ${TOOLS_PREFIX.msgfmt}/bin/msgfmt
-.    else
+.    elif defined(_TOOLS_USE_MSGFMT_SH) && \
+          !empty(_TOOLS_USE_MSGFMT_SH:M[yY][eE][sS])
 USE_TOOLS+=            awk sh
 TOOLS_PATH.msgfmt=     ${PKGSRCDIR}/mk/tools/msgfmt.sh
 TOOLS_SCRIPT.msgfmt=   AWK=${TOOLS_AWK:Q} CAT=${TOOLS_CAT:Q}           \