--- a/ChangeLog	Mon Jun 02 18:59:06 2014 +0100
+++ b/ChangeLog	Mon Jun 02 19:48:26 2014 +0100
@@ -1,3 +1,29 @@
+2014-06-02  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL:
+	Remove documentation of --with-project as
+	option is being removed.
+	* Makefile.am:
+	(OPENJDK_HG_URL): Removed.
+	(CVMI_HG_URL): Likewise.
+	(CLOSURES_HG_URL): Likewise.
+	(CACIOCAVALLO_HG_URL): Likewise.
+	(BSD_HG_URL): Likewise.
+	(NIO2_HG_URL): Likewise.
+	(REV_ARG): Added and set conditionally if
+	$(HGREV) is set.
+	(clean-local): Drop clean-hgforest.
+	(hgforest): Removed.
+	(clean-hgforest): Likewise.
+	(download-openjdk): Remove project conditionals.
+	Replace fclone usage with multiple clone calls.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_HG): Drop IT_WITH_PROJECT dependency
+	and simply to yes/no.
+	(IT_WITH_PROJECT): Removed.
+	* configure.ac: Drop IT_WITH_PROJECT.
+
 2014-06-02  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1807: Support Debian/Ubuntu 7 OpenJDK

--- a/INSTALL	Mon Jun 02 18:59:06 2014 +0100
+++ b/INSTALL	Mon Jun 02 19:48:26 2014 +0100
@@ -175,9 +175,6 @@
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
 * --with-llvm-config: Specify the location of the llvm-config binary.
 * --with-version-suffix: Appends the given text to the JDK version output.
-* --with-project: Build an OpenJDK project from the following: icedtea, jdk7, closures, cvmi, cacaiocavallo,
-  bsd, nio2.  The default is icedtea.  Use of others is at the user's risk and builds may fail.  This setting
-  affects which forest is checked out when --enable-hg is used and the set of patches applied.
 * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
 * --with-pax: The command used to PaX-mark built binaries.
 * --enable-Werror: Turn gcc & javac warnings into errors.

--- a/Makefile.am	Mon Jun 02 18:59:06 2014 +0100
+++ b/Makefile.am	Mon Jun 02 19:48:26 2014 +0100
@@ -32,12 +32,6 @@
 
 ICEDTEA_PREFIX = icedtea7-forest
 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
-OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk7/jdk7
-CVMI_HG_URL = http://hg.openjdk.java.net/cvmi/cvmi/
-CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
-CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
-BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
-NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
 
 OPENJDK_URL = $(ICEDTEA_HG_URL)
 CORBA_URL = $(ICEDTEA_HG_URL)/corba
@@ -172,6 +166,10 @@
   HOTSPOT_SRC_ZIP = hotspot.tar.gz
 endif
 
+if WITH_HGREV
+REV_ARG = -r $(HGREV)
+endif
+
 if ENABLE_PULSE_JAVA
 PULSE_JAVA_TARGET = stamps/pulse-java.stamp
 endif
@@ -790,7 +788,7 @@
  clean-icedtea clean-icedtea-boot clean-clone clean-clone-boot \
  clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
  clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \
+ clean-extract clean-generated clean-native-ecj clean-icedtea-stage2 \
  clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
  clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
  clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \
@@ -859,23 +857,6 @@
 # OpenJDK Source Preparation Targets
 # ==================================
 
-# Check for forest support
-
-stamps/hgforest.stamp:
-if USE_HG
-	if ! $(HG) fclone -h; \
-          then \
-          echo "No forest extension found. Please refer to" \
-            "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
-          exit 1; \
-        fi;
-endif
-	mkdir -p stamps 
-	touch $@
-
-clean-hgforest:
-	rm -f stamps/hgforest.stamp
-
 # Download OpenJDK sources.
 
 stamps/download.stamp: stamps/download-openjdk.stamp \
@@ -886,32 +867,14 @@
 clean-download: clean-download-openjdk clean-download-cacao clean-download-jamvm
 	rm -f stamps/download.stamp
 
-stamps/download-openjdk.stamp: stamps/hgforest.stamp
-if !OPENJDK_SRC_DIR_FOUND
-if USE_CLOSURES
-	$(HG) fclone $(CLOSURES_HG_URL) openjdk; 
-else
-if USE_CVMI
-	$(HG) fclone $(CVMI_HG_URL) openjdk; 
-else
-if USE_CACIOCAVALLO
-	$(HG) fclone $(CACIOCAVALLO_HG_URL) openjdk;
-else
-if USE_BSD
-	$(HG) fclone $(BSD_HG_URL) openjdk;
-else
-if USE_NIO2
-	hg fclone $(NIO2_HG_URL) openjdk;
-else
-if USE_JDK7
-	hg fclone $(OPENJDK_HG_URL) openjdk;
+stamps/download-openjdk.stamp:
+if OPENJDK_SRC_DIR_FOUND
 else
 if USE_HG
-if WITH_HGREV
-	$(HG) fclone -r $(HGREV) $(ICEDTEA_HG_URL) openjdk;
-else
-	$(HG) fclone $(ICEDTEA_HG_URL) openjdk;
-endif
+	$(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL) openjdk;
+	for repos in corba jaxp jaxws langtools hotspot jdk ; do \
+	  $(HG) clone $(REV_ARG) $(ICEDTEA_HG_URL)/$${repos} openjdk/$${repos}; \
+	done
 else
 if USE_ALT_OPENJDK_SRC_ZIP
 	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
@@ -1049,12 +1012,6 @@
 	fi
 endif
 endif
-endif
-endif
-endif
-endif
-endif
-endif
 	mkdir -p stamps
 	touch $@
 

--- a/NEWS	Mon Jun 02 18:59:06 2014 +0100
+++ b/NEWS	Mon Jun 02 19:48:26 2014 +0100
@@ -185,6 +185,7 @@
   - PR1763: ppc64 JIT doesn't support class data sharing
   - PR1765: Boot JDK on ppc64le uses differently named arch directory to final build
   - PR1807: Support Debian/Ubuntu 7 OpenJDK Install as Boot JDK
+  - PR1365: Replace hgforest support
 
 New in release 2.5.0 (2014-XX-XX):
 

--- a/acinclude.m4	Mon Jun 02 18:59:06 2014 +0100
+++ b/acinclude.m4	Mon Jun 02 19:48:26 2014 +0100
@@ -859,10 +859,9 @@
 
 AC_DEFUN([IT_ENABLE_HG],
 [
-  AC_REQUIRE([IT_WITH_PROJECT])
   AC_MSG_CHECKING(whether to retrieve the source code from Mercurial)
   AC_ARG_ENABLE([hg],
-                [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=depends on project]])],
+                [AS_HELP_STRING(--enable-hg,download source code from Mercurial [[default=no]])],
   [
     case "${enableval}" in
       no)
@@ -874,14 +873,7 @@
     esac
   ],
   [
-    case "${project}" in
-      icedtea)
-        enable_hg=no
-        ;;
-      *)
-        enable_hg=yes
-        ;;
-    esac
+    enable_hg=no
   ])
   AC_MSG_RESULT([${enable_hg}])
   AM_CONDITIONAL([USE_HG], test x"${enable_hg}" = "xyes")
@@ -915,37 +907,6 @@
   AC_SUBST(VERSION_SUFFIX, $version_suffix)
 ])
 
-AC_DEFUN([IT_WITH_PROJECT],
-[
-  AC_MSG_CHECKING(which OpenJDK project is being used)
-  AC_ARG_WITH([project],
-              [AS_HELP_STRING(--with-project=PROJECT,choose the OpenJDK project to use: icedtea jdk7 closures cvmi caciocavallo bsd nio2 [[PROJECT=icedtea]])],
-  [
-    case "${withval}" in
-      yes)
-	project=icedtea
-        ;;
-      no)
-	AC_MSG_ERROR([argument passed to --with-project should be a supported OpenJDK project (see help)])
-	;;
-      *)
-        project=${withval}
-        ;;
-    esac
-  ],
-  [
-    project=icedtea
-  ])
-  AC_MSG_RESULT([${project}])
-  AC_SUBST(PROJECT_NAME, $project)
-  AM_CONDITIONAL([USE_CLOSURES], test x"${project}" = "xclosures")
-  AM_CONDITIONAL([USE_CVMI], test x"${project}" = "xcvmi")
-  AM_CONDITIONAL([USE_CACIOCAVALLO], test x"${project}" = "xcaciocavallo")
-  AM_CONDITIONAL([USE_BSD], test x"${project}" = "xbsd")
-  AM_CONDITIONAL([USE_NIO2], test x"${project}" = "xnio2")
-  AM_CONDITIONAL([USE_JDK7], test x"${project}" = "xjdk7")
-])
-
 AC_DEFUN_ONCE([IT_WITH_GCJ],
 [
   AC_MSG_CHECKING([whether to compile ecj natively])

--- a/configure.ac	Mon Jun 02 18:59:06 2014 +0100
+++ b/configure.ac	Mon Jun 02 19:48:26 2014 +0100
@@ -180,7 +180,6 @@
 IT_ENABLE_ARM32JIT
 
 IT_WITH_VERSION_SUFFIX
-IT_WITH_PROJECT
 IT_ENABLE_HG
 IT_WITH_TZDATA_DIR