summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2015-02-01 09:15:49 +0000
committerobache <obache@pkgsrc.org>2015-02-01 09:15:49 +0000
commit46bd43bee9724ac9b29a4fd108679e7d2bed3c9d (patch)
tree7c355dcd7698a249687b073e08a709227a35a287
parent4e252d0dfbd008b14ca4cb5420f56f69b72edd2f (diff)
downloadpkgsrc-46bd43bee9724ac9b29a4fd108679e7d2bed3c9d.tar.gz
Revert "Add some missing builtin gettext-tools path.",
proposed/discussed is required for such changes.
-rw-r--r--mk/tools/tools.Cygwin.mk14
-rw-r--r--mk/tools/tools.Linux.mk14
-rw-r--r--mk/tools/tools.NetBSD.mk11
3 files changed, 3 insertions, 36 deletions
diff --git a/mk/tools/tools.Cygwin.mk b/mk/tools/tools.Cygwin.mk
index 1959f8b226b..905bccf6279 100644
--- a/mk/tools/tools.Cygwin.mk
+++ b/mk/tools/tools.Cygwin.mk
@@ -1,11 +1,8 @@
-# $NetBSD: tools.Cygwin.mk,v 1.11 2015/02/01 08:48:56 obache Exp $
+# $NetBSD: tools.Cygwin.mk,v 1.12 2015/02/01 09:15:49 obache 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
@@ -53,9 +50,6 @@ 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
@@ -88,15 +82,9 @@ 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 a169c95d35c..1131462c9c1 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,12 +1,9 @@
-# $NetBSD: tools.Linux.mk,v 1.57 2015/02/01 08:48:56 obache Exp $
+# $NetBSD: tools.Linux.mk,v 1.58 2015/02/01 09:15:49 obache 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)
@@ -95,9 +92,6 @@ 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
@@ -184,15 +178,9 @@ 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 ba650cdc837..e683128f5ec 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.54 2015/02/01 08:48:56 obache Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.55 2015/02/01 09:15:49 obache Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -35,9 +35,6 @@ 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
@@ -70,15 +67,9 @@ 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