 @@ -1,153 +1,152 @@
-# $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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. All advertising materials mentioning features or use of this software
 #    must display the following acknowledgement:
 #        This product includes software developed by the NetBSD
 #        Foundation, Inc. and its contributors.
 # 4. Neither the name of The NetBSD Foundation nor the names of its
 #    contributors may be used to endorse or promote products derived
 #    from this software without specific prior written permission.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 # These tools are all supplied by the devel/gettext-tools package if there
 # is no native tool available.  Don't add "msgfmt" to this list as it's
 # treated specially below.
+#
 _TOOLS.gettext-tools=		gettext msgmerge xgettext msgconv
 _TOOLS_DEP.gettext-tools=	{gettext-tools>=0.14.5,gettext>=0.10.36<0.14.5}
 .for _t_ in ${_TOOLS.gettext-tools}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_})
 USE_TOOLS+=	msgfmt
 .  endif
 .endfor
 ###
 ### Handle "msgfmt".  We use either the pkgsrc version or the built-in
 ### version of msgfmt depending on availability and version.
 ###
 .if !defined(TOOLS_IGNORE.msgfmt) && !empty(USE_TOOLS:C/:.*//:Mmsgfmt)
 .  if !empty(PKGPATH:Mdevel/gettext-tools)
 MAKEFLAGS+=		TOOLS_IGNORE.msgfmt=
 .  else
 .    if defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)
 _TOOLS_USE_PKGSRC.msgfmt?=	no
+#
 # MSGFMT_STRIP_MSGID_PLURAL: Yes for msgfmt < 0.10.36
 # MSGFMT_STRIP_MSGCTXT: Yes for msgfmt < 0.15
+#
 # 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.
+#
 # 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 }'
 .          if !defined(MSGFMT_STRIP_MSGID_PLURAL)
 MSGFMT_STRIP_MSGID_PLURAL!=						\
 	if ${PKG_ADMIN} pmatch "gettext>0.10.35"			\
 			gettext-${_TOOLS_VERSION.msgfmt:Q}; then	\
 		${ECHO} no;						\
 	else								\
 		${ECHO} yes;						\
 	fi
 .          endif
 .      endif
 .          if !defined(MSGFMT_STRIP_MSGCTXT)
 MSGFMT_STRIP_MSGCTXT!=							\
 	if ${PKG_ADMIN} pmatch "gettext>=0.15"				\
 			gettext-${_TOOLS_VERSION.msgfmt:Q}; then	\
 		${ECHO} no;						\
 	else								\
 		${ECHO} yes;						\
 	fi
 .          endif
 .    else
 _TOOLS_USE_PKGSRC.msgfmt=	yes
 .    endif
 MSGFMT_STRIP_MSGID_PLURAL?=	no
 MSGFMT_STRIP_MSGCTXT?=		yes # pkgsrc version is too old
 .if ${MSGFMT_STRIP_MSGID_PLURAL} == "yes" || ${MSGFMT_STRIP_MSGCTXT} == "yes"
 _TOOLS_USE_MSGFMT_SH=		yes
 .else
 _TOOLS_USE_MSGFMT_SH=		no
 .endif
 MAKEVARS+=	_TOOLS_USE_MSGFMT_SH
 # If we're not using the builtin gettext implementation, then we should
 # definitely be using the pkgsrc version of msgfmt (gettext-tools).
+#
 CHECK_BUILTIN.gettext:=	yes
 .    include "../../devel/gettext-lib/builtin.mk"
 CHECK_BUILTIN.gettext:=	no
 .    if !empty(USE_BUILTIN.gettext:M[nN][oO])
 _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)
 _TOOLS_USE_PKGSRC.${_t_}?=	no
 .    else
 _TOOLS_USE_PKGSRC.${_t_}?=	yes
 .    endif
 .    if !empty(PKGPATH:Mdevel/gettext-tools)
 MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?=	${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
 TOOLS_CREATE+=		${_t_}
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.${_t_}:C/:.*//}
 TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 .    endif
 .  endif
 .endfor

 @@ -1,175 +1,173 @@
 #!/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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. All advertising materials mentioning features or use of this software
 #    must display the following acknowledgement:
 #        This product includes software developed by the NetBSD
 #        Foundation, Inc. and its contributors.
 # 4. Neither the name of The NetBSD Foundation nor the names of its
 #    contributors may be used to endorse or promote products derived
 #    from this software without specific prior written permission.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
+#
 # Copyright (c) 2004, 2005, 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
+#
 # 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
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
 # 3. Neither the name of author nor the names of its contributors may
 #    be used to endorse or promote products derived from this software
 #    without specific prior written permission.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 # If you make changes to this file, please test that it can process all
 # of the *.po files in each of the following packages:
+#
 #	databases/libgnomedb
 #	devel/libgnome
 #	fonts/fontforge
 #	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.
 version=
 pofile=
 debug=
 cmd="${MSGFMT}"
 while test $# -gt 0; do
 	case "$1" in
 	--debug)
 		debug=yes; shift
 		;;
 	--version)
 		version="$1"
 		cmd="$cmd $1"; shift
 		;;
 	--statistics|--tcl)
 		cmd="$cmd $1"; shift
 		;;
 	-[aDodl]|--alignment|--directory|--output-file)
 		cmd="$cmd $1 $2"; shift; shift;
 		;;
 	-c)
 		# skip all checks
 		shift
 		;;
 	[!-]*|-)
 		pofile="$1"
 		cmd="$cmd -"; shift
 		;;
 	*)
 		cmd="$cmd $1"; shift
 		;;
 	esac
 done
 # If we are asked for just the version, then avoid spawning awk.
 test -z "$version" || exec $cmd
 test -n "$pofile" || exec $cmd
 # If --debug is specified, then dump the output from the awk script
 # to $pofile.debug along the way.
+#
 if test -z "$debug"; then
 	debug="${CAT}"
 else
 	debug="${TEE} $pofile.debug"
 fi
 # If the input file cannot be found as named, then also search for a file
 # with the same name that ends in ".po".
+#
 if test "$pofile" != "-" -a ! -e "$pofile"; then
 	popofile=""
 	for extension in po pot; do
 		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

	@@ -1,19 +1,20 @@		@@ -1,19 +1,20 @@
1	# $NetBSD: msgfmt-msgctxt.awk,v 1.1 2009/03/20 16:13:02 joerg Exp $	1	# $NetBSD: msgfmt-msgctxt.awk,v 1.2 2010/04/10 00:46:23 obache Exp $
2	#	2	#
3	# Simple awk script to strip out .po entries with "msgctxt" or "#~\|", so the	3	# Simple awk script to strip out .po entries with "msgctxt" or "#~\|", so the
4	# resultant file can be handled by the msgfmt 0.14.x.	4	# resultant file can be handled by the msgfmt 0.14.x.
5	{	5	{
		6	sub(/\r$/, "")
6	if (/^$/) { entry_end(); }	7	if (/^$/) { entry_end(); }
7	else if ($1 == "msgctxt" \|\| $2 == "msgctxt") { skip = 1; }	8	else if ($1 == "msgctxt" \|\| $2 == "msgctxt") { skip = 1; }
8	else if ($1 == "#~\|") { skip = 1; }	9	else if ($1 == "#~\|") { skip = 1; }
9	else { entry = entry $0 "\n" }	10	else { entry = entry $0 "\n" }
10	}	11	}
11		12
12	END { entry_end(); }	13	END { entry_end(); }
13		14
14	function entry_end() {	15	function entry_end() {
15	if (!skip)	16	if (!skip)
16	print entry;	17	print entry;
17	entry = "";	18	entry = "";
18	skip = 0;	19	skip = 0;
19	}	20	}