--- a/AUTHORS	Fri Apr 01 05:29:22 2016 +0100
+++ b/AUTHORS	Fri Apr 01 06:19:20 2016 +0100
@@ -19,6 +19,7 @@
 Andrew John Hughes <gnu_andrew@member.fsf.org, gnu.andrew@redhat.com>
 Tomas Hurka <tomas.hurka@sun.com>
 Ioana Ivan <iivan@redhat.com>
+Radim Kolar <hsn@sanatana.filez.com>
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
 DJ Lucas <dj@linuxfromscratch.org>

--- a/ChangeLog	Fri Apr 01 05:29:22 2016 +0100
+++ b/ChangeLog	Fri Apr 01 06:19:20 2016 +0100
@@ -1,3 +1,40 @@
+2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2906: Support prefixed variants of GNU
+	tools used on *BSD systems
+	* NEWS: Updated.
+
+2014-04-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2906: Support prefixed variants of GNU
+	tools used on *BSD systems
+	* AUTHORS: Add Radim Kolar.
+	* acinclude.m4:
+	(IT_FIND_TOOL): Cleanup error message.
+	(IT_FIND_TOOLS): Likewise.
+
+2014-03-20  Radim Kolar  <hsn@sanatana.filez.com>
+
+	PR2906: Support prefixed variants of GNU
+	tools used on *BSD systems
+	* Makefile.am:
+	(versioning): Use $(SED) instead of 'sed'.
+	(icedtea): Likewise.
+	(icedtea-debug): Likewise.
+	(clean-add-jamvm): Likewise.
+	(clean-add-jamvm-debug): Likewise.
+	(clean-add-cacao): Likewise.
+	(clean-add-cacao-debug): Likewise.
+	(clean-add-zero): Likewise.
+	(clean-add-zero-debug): Likewise.
+	(jtreg_processes): Likewise.
+	* acinclude.m4:
+	(IT_FIND_TOOLS): New macro to check for
+	multiple tools.
+	* configure.ac: Check for gmake, gfind, gpatch, gtar,
+	gsha256sum and gsed (GNU tools on *BSD). Use
+	IT_FIND_TOOLS for fastjar.
+
 2016-03-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:

--- a/Makefile.am	Fri Apr 01 05:29:22 2016 +0100
+++ b/Makefile.am	Fri Apr 01 06:19:20 2016 +0100
@@ -1609,7 +1609,7 @@
 	if test x"$(VERSION_SUFFIX)" != "x"; then \
 	  ver_suffix="-$(VERSION_SUFFIX)"; \
 	fi ; \
-	sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
+	$(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
 	  $(VERSION_SETTINGS_FILE);
 	mkdir -p stamps
 	touch $@
@@ -1824,13 +1824,13 @@
 	mkdir -p $(BUILD_SDK_DIR)/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
 	    > $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
 	    > $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
 	    > $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
@@ -1886,13 +1886,13 @@
 	mkdir -p $(BUILD_DEBUG_SDK_DIR)/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
 	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
 	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
-	  sed -e '/\/client\/libjvm.so/d' \
+	  $(SED) -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
 	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
@@ -2157,7 +2157,7 @@
 clean-add-jamvm:
 	rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm
 	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-jamvm.stamp
 
@@ -2175,7 +2175,7 @@
 clean-add-jamvm-debug:
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
 	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-jamvm-debug.stamp
 
@@ -2257,7 +2257,7 @@
 clean-add-cacao:
 	rm -rf $(BUILD_JRE_ARCH_DIR)/cacao
 	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-cacao.stamp
 
@@ -2279,7 +2279,7 @@
 clean-add-cacao-debug:
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao
 	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-cacao-debug.stamp
 
@@ -2347,8 +2347,8 @@
 	rm -rf $(BUILD_JRE_ARCH_DIR)/shark
 	rm -rf zerovm
 	if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
-	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-zero.stamp
 
@@ -2386,8 +2386,8 @@
 	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
 	rm -rf zerovm
 	if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \
-	  sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
-	  sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
+	  $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \
 	fi
 	rm -f stamps/add-zero-debug.stamp
 
@@ -2465,7 +2465,7 @@
 # FIXME: this might need some adjustment for other OS than Linux
 jtreg_processes = ps x -ww -o pid,ppid,args \
 	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,/scratch)/' \
-	| sed 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g'
+	| $(SED) 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g'
 jtreg_pids = ps x --no-headers -ww -o pid,ppid,args \
 	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
 

--- a/NEWS	Fri Apr 01 05:29:22 2016 +0100
+++ b/NEWS	Fri Apr 01 06:19:20 2016 +0100
@@ -159,6 +159,7 @@
   - PR2873: Fix make distcheck.
   - PR2880: Add missing test directory in make check.
   - PR2885: Location of 'stap' executable is hard-coded
+  - PR2906: Support prefixed variants of GNU tools used on *BSD systems
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck

--- a/acinclude.m4	Fri Apr 01 05:29:22 2016 +0100
+++ b/acinclude.m4	Fri Apr 01 06:19:20 2016 +0100
@@ -610,7 +610,15 @@
 AC_DEFUN([IT_FIND_TOOL],
 [AC_PATH_TOOL([$1],[$2])
  if test x"$$1" = x ; then
-   AC_MSG_ERROR([$2 program not found in PATH])
+   AC_MSG_ERROR([The following program was not found on the PATH: $2])
+ fi
+ AC_SUBST([$1])
+])
+
+AC_DEFUN([IT_FIND_TOOLS],
+[AC_PATH_PROGS([$1],[$2])
+ if test x"$$1" = x ; then
+   AC_MSG_ERROR([None of the following programs could be found on the PATH: $2])
  fi
  AC_SUBST([$1])
 ])

--- a/configure.ac	Fri Apr 01 05:29:22 2016 +0100
+++ b/configure.ac	Fri Apr 01 06:19:20 2016 +0100
@@ -22,24 +22,21 @@
 AC_PROG_CC
 AC_PROG_CXX
 
-IT_FIND_TOOL([MAKE], [make])
+IT_FIND_TOOLS([MAKE], [gmake make])
 IT_FIND_TOOL([GZIP], [gzip])
-IT_FIND_TOOL([FIND], [find])
-IT_FIND_TOOL([PATCH], [patch])
-IT_FIND_TOOL([TAR], [tar])
+IT_FIND_TOOLS([FIND], [gfind find])
+IT_FIND_TOOLS([PATCH], [gpatch patch])
+IT_FIND_TOOLS([TAR], [gtar tar])
 IT_FIND_TOOL([CHMOD], [chmod])
-IT_FIND_TOOL([SHA256SUM], [sha256sum])
+IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum])
 IT_FIND_TOOL([WGET], [wget])
 IT_FIND_TOOL([ZIP], [zip])
 IT_FIND_TOOL([UNZIP], [unzip])
 IT_FIND_TOOL([CPIO], [cpio])
 IT_FIND_TOOL([FILE], [file])
 IT_FIND_TOOL([READLINK], [readlink])
-AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
-if test "x$FASTJAR" = x; then
-	AC_MSG_ERROR([Can't find fastjar or jar])
-fi
-AC_SUBST([FASTJAR])
+IT_FIND_TOOLS([FASTJAR], [fastjar jar])
+IT_FIND_TOOLS([SED],[gsed sed])
 AC_CHECK_TOOL([LDD], [ldd])
 dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
 dnl check for it explicitly rather than using AC_PROG_AWK.