diff options
| -rw-r--r-- | mk/tools/gettext.mk | 5 | ||||
| -rwxr-xr-x | mk/tools/msgfmt.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mk/tools/gettext.mk b/mk/tools/gettext.mk index b9d5407dad2..ed373ecb7b2 100644 --- a/mk/tools/gettext.mk +++ b/mk/tools/gettext.mk @@ -1,4 +1,4 @@ -# $NetBSD: gettext.mk,v 1.12 2009/03/22 18:10:27 joerg Exp $ +# $NetBSD: gettext.mk,v 1.13 2010/04/09 15:44:17 wiz Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -122,7 +122,8 @@ TOOLS_PATH.msgfmt= ${TOOLS_PREFIX.msgfmt}/bin/msgfmt . if !empty(_TOOLS_USE_MSGFMT_SH:M[yY][eE][sS]) USE_TOOLS+= awk sh TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q} CAT=${TOOLS_CAT:Q} \ - MSGFMT=${TOOLS_PATH.msgfmt:Q} \ + TR=${TOOLS_TR:Q} \ + MSGFMT=${TOOLS_PATH.msgfmt:Q} \ PKGSRCDIR=${PKGSRCDIR:Q} \ MSGFMT_STRIP_MSGID_PLURAL=${MSGFMT_STRIP_MSGID_PLURAL} \ MSGFMT_STRIP_MSGCTXT=${MSGFMT_STRIP_MSGCTXT} \ diff --git a/mk/tools/msgfmt.sh b/mk/tools/msgfmt.sh index 044ec6a4aed..8c614d51dc5 100755 --- a/mk/tools/msgfmt.sh +++ b/mk/tools/msgfmt.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: msgfmt.sh,v 1.32 2009/03/27 14:44:36 joerg Exp $ +# $NetBSD: msgfmt.sh,v 1.33 2010/04/09 15:44:17 wiz Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -84,6 +84,7 @@ : ${CAT=cat} : ${MSGFMT=/usr/bin/msgfmt} : ${TEE=tee} +: ${TR=tr} case "${MSGFMT}" in /*) ;; @@ -162,6 +163,7 @@ if test "$pofile" != "-" -a ! -e "$pofile"; then fi ${CAT} $pofile | \ +${TR} -d '\015' | \ if test "${MSGFMT_STRIP_MSGCTXT}" = "yes"; then ${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk else |