Put back additions of some native gettext tools.

3 files changed, 36 insertions, 3 deletions

diff --git a/mk/tools/tools.Cygwin.mk b/mk/tools/tools.Cygwin.mk
index 905bccf6279..5991699eb8c 100644
--- a/mk/tools/tools.Cygwin.mk
+++ b/mk/tools/tools.Cygwin.mk
@@ -1,8 +1,11 @@
-# $NetBSD: tools.Cygwin.mk,v 1.12 2015/02/01 09:15:49 obache Exp $
+# $NetBSD: tools.Cygwin.mk,v 1.13 2015/02/16 11:01:40 jperkin Exp $
 #
 # System-supplied tools for the Cygwin operating system.
 
 TOOLS_PLATFORM.[?=		[			# shell builtin
+.if exists(/bin/autopoint)
+TOOLS_PLATFORM.autopoint?=	/bin/autopoint
+.endif
 TOOLS_PLATFORM.awk?=		/bin/awk
 TOOLS_PLATFORM.basename?=	/bin/basename
 TOOLS_PLATFORM.bash?=		/bin/bash
@@ -50,6 +53,9 @@ TOOLS_PLATFORM.flex?=		/bin/flex
 TOOLS_PLATFORM.ftp?=		/bin/tnftp
 .endif
 TOOLS_PLATFORM.gawk?=		/bin/gawk
+.if exists(/bin/gettext)
+TOOLS_PLATFORM.gettext?=	/bin/gettext
+.endif
 .if exists(/bin/m4)
 TOOLS_PLATFORM.gm4?=		/bin/m4
 .endif
@@ -82,9 +88,15 @@ TOOLS_PLATFORM.gmake?=		/bin/make
 TOOLS_PLATFORM.makeinfo?=	/bin/makeinfo
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mktemp?=		/bin/mktemp
+.if exists(/bin/msgconv)
+TOOLS_PLATFORM.msgconv?=	/bin/msgconv
+.endif
 .if exists(/bin/msgfmt)
 TOOLS_PLATFORM.msgfmt?=		/bin/msgfmt
 .endif
+.if exists(/bin/msgmerge)
+TOOLS_PLATFORM.msgmerge?=	/bin/msgmerge
+.endif
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/bin/nice
 TOOLS_PLATFORM.nroff?=		/bin/nroff
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 1131462c9c1..c0c42fa59a6 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,9 +1,12 @@
-# $NetBSD: tools.Linux.mk,v 1.58 2015/02/01 09:15:49 obache Exp $
+# $NetBSD: tools.Linux.mk,v 1.59 2015/02/16 11:01:40 jperkin Exp $
 #
 # System-supplied tools for the Linux operating system.
 
 TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		${TOOLS_PLATFORM.gawk}
+.if exists(/usr/bin/autopoint)
+TOOLS_PLATFORM.autopoint?=	/usr/bin/autopoint
+.endif
 .if exists(/bin/basename)
 TOOLS_PLATFORM.basename?=	/bin/basename
 .elif exists(/usr/bin/basename)
@@ -92,6 +95,9 @@ TOOLS_PLATFORM.gawk?=		/bin/awk
 .else
 TOOLS_PLATFORM.gawk?=		/usr/bin/awk
 .endif
+.if exists(/usr/bin/gettext)
+TOOLS_PLATFORM.gettext?=	/usr/bin/gettext
+.endif
 .if exists(/usr/bin/m4)
 TOOLS_PLATFORM.gm4?=		/usr/bin/m4
 .endif
@@ -178,9 +184,15 @@ TOOLS_PLATFORM.mktemp?=		/usr/bin/mktemp
 .elif exists(/bin/mktemp)
 TOOLS_PLATFORM.mktemp?=		/bin/mktemp
 .endif
+.if exists(/usr/bin/msgconv)
+TOOLS_PLATFORM.msgconv?=	/usr/bin/msgconv
+.endif
 .if exists(/usr/bin/msgfmt)
 TOOLS_PLATFORM.msgfmt?=		/usr/bin/msgfmt
 .endif
+.if exists(/usr/bin/msgmerge)
+TOOLS_PLATFORM.msgmerge?=	/usr/bin/msgmerge
+.endif
 TOOLS_PLATFORM.mv?=		/bin/mv
 .if exists(/bin/nice)
 TOOLS_PLATFORM.nice?=		/bin/nice
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index e683128f5ec..a8bcee7a6ce 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.55 2015/02/01 09:15:49 obache Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.56 2015/02/16 11:01:40 jperkin Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -35,6 +35,9 @@ TOOLS_PLATFORM.ftp?=		/usr/bin/ftp
 .if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
 TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
 .endif
+.if exists(/usr/bin/gettext)
+TOOLS_PLATFORM.gettext?=	/usr/bin/gettext
+.endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 TOOLS_PLATFORM.groff?=		/usr/bin/groff
 TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}	# GNUish
@@ -67,9 +70,15 @@ TOOLS_PLATFORM.makeinfo?=	/usr/bin/makeinfo
 .endif
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mktemp?=		/usr/bin/mktemp
+.if exists(/usr/bin/msgconv)
+TOOLS_PLATFORM.msgconv?=	/usr/bin/msgconv
+.endif
 .if exists(/usr/bin/msgfmt)
 TOOLS_PLATFORM.msgfmt?=		/usr/bin/msgfmt
 .endif
+.if exists(/usr/bin/msgmerge)
+TOOLS_PLATFORM.msgmerge?=	/usr/bin/msgmerge
+.endif
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice