Sat Apr 10 00:46:23 2010 UTC ()

strip \r in awk script, avoid to extra `tr' exec.


(obache)

diff -r1.13 -r1.14 pkgsrc/mk/tools/gettext.mk
diff -r1.1 -r1.2 pkgsrc/mk/tools/msgfmt-msgctxt.awk
diff -r1.33 -r1.34 pkgsrc/mk/tools/msgfmt.sh

--- pkgsrc/mk/tools/gettext.mk 2010/04/09 15:44:17 1.13
+++ pkgsrc/mk/tools/gettext.mk 2010/04/10 00:46:23 1.14

@@ -1,4 +1,4 @@
-# $NetBSD: gettext.mk,v 1.13 2010/04/09 15:44:17 wiz Exp $
+# $NetBSD: gettext.mk,v 1.14 2010/04/10 00:46:23 obache Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -122,8 +122,7 @@
 .    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}		\
-			TR=${TOOLS_TR:Q}				\
-			MSGFMT=${TOOLS_PATH.msgfmt:Q}			\
+			MSGFMT=${TOOLS_PATH.msgfmt:Q}		\
 			PKGSRCDIR=${PKGSRCDIR:Q}			\
 		        MSGFMT_STRIP_MSGID_PLURAL=${MSGFMT_STRIP_MSGID_PLURAL} \
 			MSGFMT_STRIP_MSGCTXT=${MSGFMT_STRIP_MSGCTXT} \

--- pkgsrc/mk/tools/msgfmt-msgctxt.awk 2009/03/20 16:13:02 1.1
+++ pkgsrc/mk/tools/msgfmt-msgctxt.awk 2010/04/10 00:46:23 1.2

@@ -1,8 +1,9 @@
-# $NetBSD: msgfmt-msgctxt.awk,v 1.1 2009/03/20 16:13:02 joerg Exp $
+# $NetBSD: msgfmt-msgctxt.awk,v 1.2 2010/04/10 00:46:23 obache Exp $
 #
 # Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
 # resultant file can be handled by the msgfmt 0.14.x.
 {
+sub(/\r$/, "")
 if (/^$/) { entry_end(); }
 else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
 else if ($1 == "#~|") { skip = 1; }

--- pkgsrc/mk/tools/msgfmt.sh 2010/04/09 15:44:17 1.33
+++ pkgsrc/mk/tools/msgfmt.sh 2010/04/10 00:46:23 1.34

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: msgfmt.sh,v 1.33 2010/04/09 15:44:17 wiz Exp $
+# $NetBSD: msgfmt.sh,v 1.34 2010/04/10 00:46:23 obache Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -84,7 +84,6 @@
 : ${CAT=cat}
 : ${MSGFMT=/usr/bin/msgfmt}
 : ${TEE=tee}
-: ${TR=tr}
 
 case "${MSGFMT}" in
 /*)	;;
@@ -163,7 +162,6 @@
 fi
 
 ${CAT} $pofile | \
-${TR} -d '\015' | \
 if test "${MSGFMT_STRIP_MSGCTXT}" = "yes"; then
 	${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk
 else