 @@ -1,14 +1,14 @@
-# $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.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -112,28 +112,27 @@ CHECK_BUILTIN.gettext:=	no
 _TOOLS_USE_PKGSRC.msgfmt=	yes
 .    endif
 .    if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS])
 TOOLS_CREATE+=		msgfmt
 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
 .    endif
 .    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} \
 			${TOOLS_SH} ${PKGSRCDIR}/mk/tools/msgfmt.sh "$$@"
 .    endif
 .  endif
 .endif
 .for _t_ in ${_TOOLS.gettext-tools}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_})
 .    if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS])
 _TOOLS_USE_PKGSRC.${_t_}=	yes
 .    elif defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)

 @@ -1,18 +1,19 @@
-# $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; }
 else { entry = entry $0 "\n" }
+}
 END { entry_end(); }
 function entry_end() {
     if (!skip)
 	print entry;
     entry = "";
     skip = 0;

 @@ -1,16 +1,16 @@
 #!/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.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -74,27 +74,26 @@
 #	multimedia/gmencoder
 #	multimedia/gnome2-media
 #	net/gtk-gnutella
 #	sysutils/gnome-vfs
 #	wm/icewm
 #	www/epiphany
 #	x11/matchbox-panel
+#
 : ${AWK=awk}
 : ${CAT=cat}
 : ${MSGFMT=/usr/bin/msgfmt}
 : ${TEE=tee}
 : ${TR=tr}
 case "${MSGFMT}" in
 /*)	;;
 *)	echo 1>&2 "$0: \`\`${MSGFMT}'' must be an absolute pathname."
 	exit 1
 	;;
 esac
 if test ! -x "${MSGFMT}"; then
 	echo 1>&2 "$0: \`\`${MSGFMT}'' does not exist."
 	exit 1
 fi
 # Parse the command line options.
 @@ -153,23 +152,22 @@ if test "$pofile" != "-" -a ! -e "$pofil
 		if test -e "$pofile.$extension"; then
 			popofile="$pofile.$extension"
 			break;
 		fi
 	done
 	if test "x$popofile" = "x"; then
 		echo 1>&2 "$0: error while opening \"$pofile\" for reading: No such file or directory"
 		exit 1
 	fi
 	pofile="$popofile"
 fi
 ${CAT} $pofile | \
 ${TR} -d '\015' | \
 if test "${MSGFMT_STRIP_MSGCTXT}" = "yes"; then
 	${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgctxt.awk
 else
 	${CAT}
 fi | if test "$MSGFMT_STRIP_MSGID_PLURAL" = "yes"; then
 	${AWK} -f ${PKGSRCDIR}/mk/tools/msgfmt-msgid_plural.awk
 else
 	${CAT}
 fi | $debug | $cmd