From owner-svn-ports-head@FreeBSD.ORG  Wed May 15 00:17:58 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 025FFE06;
 Wed, 15 May 2013 00:17:58 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E81A290F;
 Wed, 15 May 2013 00:17:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4F0HvmH063063;
 Wed, 15 May 2013 00:17:57 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4F0HvN2063062;
 Wed, 15 May 2013 00:17:57 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305150017.r4F0HvN2063062@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 15 May 2013 00:17:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318210 - head/java/openjdk6/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 May 2013 00:17:58 -0000

Author: jkim
Date: Wed May 15 00:17:57 2013
New Revision: 318210
URL: http://svnweb.freebsd.org/changeset/ports/318210

Log:
  Use bootstrap Java instead of newly built binary to execute RMIC.

Modified:
  head/java/openjdk6/files/patch-set

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Wed May 15 00:17:20 2013	(r318209)
+++ head/java/openjdk6/files/patch-set	Wed May 15 00:17:57 2013	(r318210)
@@ -8877,6 +8877,26 @@
    OTHER_LDLIBS  += $(LIBCXX)
  # setup the list of libraries to link in...
  ifeq ($(PLATFORM), linux)
+--- jdk/make/com/sun/jmx/Makefile
++++ jdk/make/com/sun/jmx/Makefile
+@@ -102,16 +102,7 @@
+ # when available, we need to run with latest rmic version available. rmic 
+ # launch tool not built at this stage but we can invoke via rmi class.
+ 
+-RMIC_JAVA = $(OUTPUTDIR)/bin/java
+-# need to treat 64bit solaris differently
+-ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64)
+-RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java
+-endif
+-ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9)
+-RMIC_JAVA = $(OUTPUTDIR)/bin/sparcv9/java
+-endif
+-
+-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
++RMIC = $(BOOT_JAVA_CMD) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+ 
+ $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
+ 	$(prep-target)
 --- jdk/make/com/sun/security/auth/module/Makefile
 +++ jdk/make/com/sun/security/auth/module/Makefile
 @@ -70,7 +70,7 @@