Index: lang/gcc/Makefile
===================================================================
--- lang/gcc/Makefile	(revision 305175)
+++ lang/gcc/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.6.3
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
@@ -51,6 +52,7 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
+LANGUAGES:=	c,c++,objc,fortran
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
@@ -59,7 +61,6 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-bootstrap \
 		--disable-nls \
-		--enable-languages=c,c++,objc,fortran \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
@@ -99,7 +100,12 @@ DISTFILES+=	${ECJ_JAR}:ecj
 EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-CONFIGURE_ARGS+=--enable-languages=c,c++,objc,fortran,java
+LANGUAGES:=	${LANGUAGES},java
+CONFIGURE_ARGS+=--enable-java-home \
+		--with-gcc-suffix=${SUFFIX} \
+		--with-java-home=${PREFIX}/gcj${SUFFIX}/jre \
+		--with-jvm-jar-dir=${PREFIX}/share/java/gcj${SUFFIX} \
+		--with-jvm-root-dir=${PREFIX}/gcj${SUFFIX}
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -127,7 +133,7 @@ MAN3=		ffi${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
+PLIST_SUB+=	JAVA="" JAVA_HOST=${ARCH}
 
 # Preps the source tree for the gcj build
 post-patch::
@@ -136,6 +142,7 @@ post-patch::
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
+CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
Index: lang/gcc/files/java-patch-hier
===================================================================
--- lang/gcc/files/java-patch-hier	(revision 305175)
+++ lang/gcc/files/java-patch-hier	(working copy)
@@ -1,13 +1,137 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in	(revision 117734)
-+++ libjava/Makefile.in	(working copy)
-@@ -712,7 +712,7 @@
- 	$(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- gcc/java/Make-lang.in.orig	2010-12-01 08:46:36.000000000 -0500
++++ gcc/java/Make-lang.in	2012-09-24 13:34:52.000000000 -0400
+@@ -333,7 +333,7 @@
+ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   java/jcf.h
+ 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+-	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
++	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/$(JAVA_INSTALL_NAME)/libgcj-$(version).jar"' \
+ 	  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+ 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
+ 
+--- libjava/Makefile.in.orig	2012-03-01 07:03:46.000000000 -0500
++++ libjava/Makefile.in	2012-09-24 12:24:27.000000000 -0400
+@@ -936,8 +936,8 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
  dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
+-jardir = $(datadir)/java
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
++jardir = $(datadir)/java/gcj$(gcc_suffix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
  @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+@@ -12528,11 +12528,11 @@
+ @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/classpath.security java.security; \
+ @CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
+-@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
++@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
+@@ -12548,7 +12548,7 @@
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libjvm.so \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
+@@ -12564,11 +12564,11 @@
+ @CREATE_JAVA_HOME_TRUE@	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	    -print-file-name=include/$$headername.h)); \
+ @CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $$DIRECTORY \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/$$headername.h \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \
+ @CREATE_JAVA_HOME_TRUE@	done; \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
+ 
+ maintainer-check: libgcj.la
+--- libjava/configure.orig	2012-03-01 07:03:46.000000000 -0500
++++ libjava/configure	2012-10-02 16:34:25.000000000 -0400
+@@ -22247,13 +22247,12 @@
+ 
+ else
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+-$as_echo_n "checking for sched_yield in -lrt... " >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield" >&5
++$as_echo_n "checking for sched_yield... " >&6; }
+ if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22290,8 +22289,6 @@
+ 
+ 	  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
+ 
+-	  THREADLIBS="$THREADLIBS -lrt"
+-	  THREADSPEC="$THREADSPEC -lrt"
+ else
+ 
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+@@ -22347,13 +22344,12 @@
+ done
+ 
+ 
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
++$as_echo_n "checking for clock_gettime... " >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22391,13 +22387,6 @@
+ 
+ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+ 
+-	 case "$THREADSPEC" in
+-	   *-lrt*) ;;
+-	   *)
+- 	     THREADSPEC="$THREADSPEC -lrt"
+-	     THREADLIBS="$THREADLIBS -lrt"
+-	     ;;
+-	 esac
+ fi
+ 
+ 
+@@ -24881,7 +24870,7 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_cpu=x86;;
+-      i486-* | i586-* | i686-*)
++      i386-* | i486-* | i586-* | i686-*)
+         host_cpu=i386;;
+       x86_64-*)
+         host_cpu=amd64;;
+@@ -24899,6 +24888,8 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_os=win32;;
++      *-freebsd*)
++        host_os=freebsd;;
+       *-linux*)
+         host_os=linux;;
+       *)
Index: lang/gcc/files/patch-jar-Updater.java
===================================================================
--- lang/gcc/files/patch-jar-Updater.java	(revision 0)
+++ lang/gcc/files/patch-jar-Updater.java	(working copy)
@@ -0,0 +1,27 @@
+--- libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java.orig	2011-01-11 14:46:05.000000000 -0500
++++ libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java	2012-09-24 11:54:13.000000000 -0400
+@@ -70,9 +70,13 @@
+     // Set this early so that createManifest can use it.
+     inputJar = new JarFile(parameters.archiveFile);
+ 
++    // Find the current directory.
++    File tmpDir = parameters.archiveFile.getParentFile();
++    if (tmpDir == null)
++      tmpDir = new File(".");
++
+     // Write all the new entries to a temporary file.
+-    File tmpFile = File.createTempFile("jarcopy", null,
+-                                       parameters.archiveFile.getParentFile());
++    File tmpFile = File.createTempFile("jarcopy", null, tmpDir);
+     OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
+     writeCommandLineEntries(parameters, os);
+ 
+@@ -91,7 +95,7 @@
+     if (!tmpFile.renameTo(parameters.archiveFile))
+       {
+           throw new IOException("Couldn't rename new JAR file " + tmpFile +
+-                                "to " + parameters.archiveFile);
++                                " to " + parameters.archiveFile);
+       }
+   }
+ 

Property changes on: lang/gcc/files/patch-jar-Updater.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lang/gcc/pkg-plist
===================================================================
--- lang/gcc/pkg-plist	(revision 305175)
+++ lang/gcc/pkg-plist	(working copy)
@@ -43,10 +43,83 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/prin
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
+%%JAVA%%gcj%%SUFFIX%%/bin/appletviewer
+%%JAVA%%gcj%%SUFFIX%%/bin/jar
+%%JAVA%%gcj%%SUFFIX%%/bin/jarsigner
+%%JAVA%%gcj%%SUFFIX%%/bin/java
+%%JAVA%%gcj%%SUFFIX%%/bin/javadoc
+%%JAVA%%gcj%%SUFFIX%%/bin/javah
+%%JAVA%%gcj%%SUFFIX%%/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/bin/native2ascii
+%%JAVA%%gcj%%SUFFIX%%/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/bin/rmic
+%%JAVA%%gcj%%SUFFIX%%/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/bin/serialver
+%%JAVA%%gcj%%SUFFIX%%/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/include/jawt.h
+%%JAVA%%gcj%%SUFFIX%%/include/jni.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jawt_md.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jni_md.h
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/java
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/libjawt.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/rt.jar
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/security/java.security
+%%JAVA%%gcj%%SUFFIX%%/lib/tools.jar
 %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc
-%%JAVA%%share/java/ecj.jar
-%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/ecj.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl.jar
+%%JAVA%%@dirrm share/java/gcj%%SUFFIX%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/security
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include/freebsd
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include
+%%JAVA%%@dirrm gcj%%SUFFIX%%/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here
Index: lang/gcc46/Makefile
===================================================================
--- lang/gcc46/Makefile	(revision 305175)
+++ lang/gcc46/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.6.4.20120928
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -102,6 +103,11 @@ EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 LANGUAGES:=	${LANGUAGES},java
+CONFIGURE_ARGS+=--enable-java-home \
+		--with-gcc-suffix=${SUFFIX} \
+		--with-java-home=${PREFIX}/gcj${SUFFIX}/jre \
+		--with-jvm-jar-dir=${PREFIX}/share/java/gcj${SUFFIX} \
+		--with-jvm-root-dir=${PREFIX}/gcj${SUFFIX}
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -129,7 +135,7 @@ MAN3=		ffi${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
+PLIST_SUB+=	JAVA="" JAVA_HOST=${ARCH}
 
 # Preps the source tree for the gcj build
 post-patch::
Index: lang/gcc46/files/java-patch-hier
===================================================================
--- lang/gcc46/files/java-patch-hier	(revision 305175)
+++ lang/gcc46/files/java-patch-hier	(working copy)
@@ -1,13 +1,137 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in	(revision 117734)
-+++ libjava/Makefile.in	(working copy)
-@@ -712,7 +712,7 @@
- 	$(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- gcc/java/Make-lang.in.orig	2010-12-01 08:46:36.000000000 -0500
++++ gcc/java/Make-lang.in	2012-09-24 13:34:52.000000000 -0400
+@@ -333,7 +333,7 @@
+ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   java/jcf.h
+ 	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+-	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
++	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/$(JAVA_INSTALL_NAME)/libgcj-$(version).jar"' \
+ 	  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+ 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
+ 
+--- libjava/Makefile.in.orig	2012-08-31 18:36:12.000000000 -0400
++++ libjava/Makefile.in	2012-09-24 12:22:26.000000000 -0400
+@@ -936,8 +936,8 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
  dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
+-jardir = $(datadir)/java
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
++jardir = $(datadir)/java/gcj$(gcc_suffix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
  @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+@@ -12528,11 +12528,11 @@
+ @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/classpath.security java.security; \
+ @CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
+-@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
++@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
+@@ -12548,7 +12548,7 @@
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libjvm.so \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
+@@ -12564,11 +12564,11 @@
+ @CREATE_JAVA_HOME_TRUE@	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	    -print-file-name=include/$$headername.h)); \
+ @CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $$DIRECTORY \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/$$headername.h \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \
+ @CREATE_JAVA_HOME_TRUE@	done; \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
+ 
+ maintainer-check: libgcj.la
+--- libjava/configure.orig	2012-09-28 18:37:05.000000000 -0400
++++ libjava/configure	2012-10-02 16:32:46.000000000 -0400
+@@ -22242,13 +22242,12 @@
+ 
+ else
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+-$as_echo_n "checking for sched_yield in -lrt... " >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield" >&5
++$as_echo_n "checking for sched_yield... " >&6; }
+ if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22285,8 +22284,6 @@
+ 
+ 	  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
+ 
+-	  THREADLIBS="$THREADLIBS -lrt"
+-	  THREADSPEC="$THREADSPEC -lrt"
+ else
+ 
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+@@ -22342,13 +22339,12 @@
+ done
+ 
+ 
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
++$as_echo_n "checking for clock_gettime... " >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22386,13 +22382,6 @@
+ 
+ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+ 
+-	 case "$THREADSPEC" in
+-	   *-lrt*) ;;
+-	   *)
+- 	     THREADSPEC="$THREADSPEC -lrt"
+-	     THREADLIBS="$THREADLIBS -lrt"
+-	     ;;
+-	 esac
+ fi
+ 
+ 
+@@ -24876,7 +24865,7 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_cpu=x86;;
+-      i486-* | i586-* | i686-*)
++      i386-* | i486-* | i586-* | i686-*)
+         host_cpu=i386;;
+       x86_64-*)
+         host_cpu=amd64;;
+@@ -24894,6 +24883,8 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_os=win32;;
++      *-freebsd*)
++        host_os=freebsd;;
+       *-linux*)
+         host_os=linux;;
+       *)
Index: lang/gcc46/files/patch-jar-Updater.java
===================================================================
--- lang/gcc46/files/patch-jar-Updater.java	(revision 0)
+++ lang/gcc46/files/patch-jar-Updater.java	(working copy)
@@ -0,0 +1,27 @@
+--- libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java.orig	2011-01-11 14:46:05.000000000 -0500
++++ libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java	2012-09-24 11:59:19.000000000 -0400
+@@ -70,9 +70,13 @@
+     // Set this early so that createManifest can use it.
+     inputJar = new JarFile(parameters.archiveFile);
+ 
++    // Find the current directory.
++    File tmpDir = parameters.archiveFile.getParentFile();
++    if (tmpDir == null)
++      tmpDir = new File(".");
++
+     // Write all the new entries to a temporary file.
+-    File tmpFile = File.createTempFile("jarcopy", null,
+-                                       parameters.archiveFile.getParentFile());
++    File tmpFile = File.createTempFile("jarcopy", null, tmpDir);
+     OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
+     writeCommandLineEntries(parameters, os);
+ 
+@@ -91,7 +95,7 @@
+     if (!tmpFile.renameTo(parameters.archiveFile))
+       {
+           throw new IOException("Couldn't rename new JAR file " + tmpFile +
+-                                "to " + parameters.archiveFile);
++                                " to " + parameters.archiveFile);
+       }
+   }
+ 

Property changes on: lang/gcc46/files/patch-jar-Updater.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lang/gcc46/pkg-plist
===================================================================
--- lang/gcc46/pkg-plist	(revision 305175)
+++ lang/gcc46/pkg-plist	(working copy)
@@ -43,10 +43,83 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/prin
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
+%%JAVA%%gcj%%SUFFIX%%/bin/appletviewer
+%%JAVA%%gcj%%SUFFIX%%/bin/jar
+%%JAVA%%gcj%%SUFFIX%%/bin/jarsigner
+%%JAVA%%gcj%%SUFFIX%%/bin/java
+%%JAVA%%gcj%%SUFFIX%%/bin/javadoc
+%%JAVA%%gcj%%SUFFIX%%/bin/javah
+%%JAVA%%gcj%%SUFFIX%%/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/bin/native2ascii
+%%JAVA%%gcj%%SUFFIX%%/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/bin/rmic
+%%JAVA%%gcj%%SUFFIX%%/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/bin/serialver
+%%JAVA%%gcj%%SUFFIX%%/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/include/jawt.h
+%%JAVA%%gcj%%SUFFIX%%/include/jni.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jawt_md.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jni_md.h
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/java
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/libjawt.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/rt.jar
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/security/java.security
+%%JAVA%%gcj%%SUFFIX%%/lib/tools.jar
 %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc
-%%JAVA%%share/java/ecj.jar
-%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/ecj.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl.jar
+%%JAVA%%@dirrm share/java/gcj%%SUFFIX%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/security
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include/freebsd
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include
+%%JAVA%%@dirrm gcj%%SUFFIX%%/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here
Index: lang/gcc47/Makefile
===================================================================
--- lang/gcc47/Makefile	(revision 305175)
+++ lang/gcc47/Makefile	(working copy)
@@ -3,10 +3,11 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.7.3.20120929
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -97,9 +98,19 @@ INFO+=		gcc${SUFFIX}/libquadmath	\
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
+ECJ_JAR=	ecj-4.5.jar
+MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
+MASTER_SITE_SUBDIR+=	java/:ecj
+DISTFILES+=	${ECJ_JAR}:ecj
+EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 LANGUAGES:=	${LANGUAGES},java
+CONFIGURE_ARGS+=--enable-java-home \
+		--with-gcc-suffix=${SUFFIX} \
+		--with-java-home=${PREFIX}/gcj${SUFFIX}/jre \
+		--with-jvm-jar-dir=${PREFIX}/share/java/gcj${SUFFIX} \
+		--with-jvm-root-dir=${PREFIX}/gcj${SUFFIX}
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -127,7 +138,11 @@ MAN3=		ffi${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
+PLIST_SUB+=	JAVA="" JAVA_HOST=${ARCH}
+
+# Preps the source tree for the gcj build
+post-patch::
+	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
Index: lang/gcc47/distinfo
===================================================================
--- lang/gcc47/distinfo	(revision 305175)
+++ lang/gcc47/distinfo	(working copy)
@@ -1,2 +1,4 @@
 SHA256 (gcc-4.7-20120929.tar.bz2) = bd816447e81c422564ad2d98cd6255552f0f3ca1d335b43b2c2858f0d0f91efd
 SIZE (gcc-4.7-20120929.tar.bz2) = 78873496
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676
Index: lang/gcc47/files/java-patch-hier
===================================================================
--- lang/gcc47/files/java-patch-hier	(revision 305175)
+++ lang/gcc47/files/java-patch-hier	(working copy)
@@ -1,13 +1,137 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in	(revision 117734)
-+++ libjava/Makefile.in	(working copy)
-@@ -712,7 +712,7 @@
- 	$(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- gcc/java/Make-lang.in.orig	2011-11-02 06:49:46.000000000 -0400
++++ gcc/java/Make-lang.in	2012-09-24 13:27:38.000000000 -0400
+@@ -330,7 +330,7 @@
+ 
+ # jcf-path.o needs a -D.
+ CFLAGS-java/jcf-path.o += \
+-	-DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
++	-DLIBGCJ_ZIP_FILE='"$(datadir)/java/$(JAVA_INSTALL_NAME)/libgcj-$(version).jar"' \
+ 	-DDEFAULT_TARGET_VERSION=\"$(version)\"
+ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   java/jcf.h
+--- libjava/Makefile.in.orig	2012-09-08 18:39:28.000000000 -0400
++++ libjava/Makefile.in	2012-09-24 12:18:38.000000000 -0400
+@@ -937,8 +937,8 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
  dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
+-jardir = $(datadir)/java
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
++jardir = $(datadir)/java/gcj$(gcc_suffix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
  @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+@@ -12529,11 +12529,11 @@
+ @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/classpath.security java.security; \
+ @CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
+-@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
++@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
+@@ -12549,7 +12549,7 @@
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libjvm.so \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
+@@ -12565,11 +12565,11 @@
+ @CREATE_JAVA_HOME_TRUE@	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	    -print-file-name=include/$$headername.h)); \
+ @CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $$DIRECTORY \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/$$headername.h \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \
+ @CREATE_JAVA_HOME_TRUE@	done; \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
+ 
+ maintainer-check: libgcj.la
+--- libjava/configure.orig	2012-09-29 18:44:45.000000000 -0400
++++ libjava/configure	2012-10-02 16:30:39.000000000 -0400
+@@ -22258,13 +22258,12 @@
+ 
+ else
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+-$as_echo_n "checking for sched_yield in -lrt... " >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield" >&5
++$as_echo_n "checking for sched_yield... " >&6; }
+ if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22301,8 +22300,6 @@
+ 
+ 	  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
+ 
+-	  THREADLIBS="$THREADLIBS -lrt"
+-	  THREADSPEC="$THREADSPEC -lrt"
+ else
+ 
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+@@ -22358,13 +22355,12 @@
+ done
+ 
+ 
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
++$as_echo_n "checking for clock_gettime... " >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22402,13 +22398,6 @@
+ 
+ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+ 
+-	 case "$THREADSPEC" in
+-	   *-lrt*) ;;
+-	   *)
+- 	     THREADSPEC="$THREADSPEC -lrt"
+-	     THREADLIBS="$THREADLIBS -lrt"
+-	     ;;
+-	 esac
+ fi
+ 
+ 
+@@ -24893,7 +24882,7 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_cpu=x86;;
+-      i486-* | i586-* | i686-*)
++      i386-* | i486-* | i586-* | i686-*)
+         host_cpu=i386;;
+       x86_64-*)
+         host_cpu=amd64;;
+@@ -24911,6 +24900,8 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_os=win32;;
++      *-freebsd*)
++        host_os=freebsd;;
+       *-linux*)
+         host_os=linux;;
+       *)
Index: lang/gcc47/files/patch-jar-Updater.java
===================================================================
--- lang/gcc47/files/patch-jar-Updater.java	(revision 0)
+++ lang/gcc47/files/patch-jar-Updater.java	(working copy)
@@ -0,0 +1,27 @@
+--- libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java.orig	2011-01-11 14:46:05.000000000 -0500
++++ libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java	2012-09-24 12:00:46.000000000 -0400
+@@ -70,9 +70,13 @@
+     // Set this early so that createManifest can use it.
+     inputJar = new JarFile(parameters.archiveFile);
+ 
++    // Find the current directory.
++    File tmpDir = parameters.archiveFile.getParentFile();
++    if (tmpDir == null)
++      tmpDir = new File(".");
++
+     // Write all the new entries to a temporary file.
+-    File tmpFile = File.createTempFile("jarcopy", null,
+-                                       parameters.archiveFile.getParentFile());
++    File tmpFile = File.createTempFile("jarcopy", null, tmpDir);
+     OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
+     writeCommandLineEntries(parameters, os);
+ 
+@@ -91,7 +95,7 @@
+     if (!tmpFile.renameTo(parameters.archiveFile))
+       {
+           throw new IOException("Couldn't rename new JAR file " + tmpFile +
+-                                "to " + parameters.archiveFile);
++                                " to " + parameters.archiveFile);
+       }
+   }
+ 

Property changes on: lang/gcc47/files/patch-jar-Updater.java
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: lang/gcc47/pkg-plist
===================================================================
--- lang/gcc47/pkg-plist	(revision 305175)
+++ lang/gcc47/pkg-plist	(working copy)
@@ -49,9 +49,83 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/prin
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
+%%JAVA%%gcj%%SUFFIX%%/bin/appletviewer
+%%JAVA%%gcj%%SUFFIX%%/bin/jar
+%%JAVA%%gcj%%SUFFIX%%/bin/jarsigner
+%%JAVA%%gcj%%SUFFIX%%/bin/java
+%%JAVA%%gcj%%SUFFIX%%/bin/javadoc
+%%JAVA%%gcj%%SUFFIX%%/bin/javah
+%%JAVA%%gcj%%SUFFIX%%/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/bin/native2ascii
+%%JAVA%%gcj%%SUFFIX%%/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/bin/rmic
+%%JAVA%%gcj%%SUFFIX%%/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/bin/serialver
+%%JAVA%%gcj%%SUFFIX%%/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/include/jawt.h
+%%JAVA%%gcj%%SUFFIX%%/include/jni.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jawt_md.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jni_md.h
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/java
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/libjawt.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/rt.jar
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/security/java.security
+%%JAVA%%gcj%%SUFFIX%%/lib/tools.jar
 %%JAVA%%libdata/pkgconfig/libgcj-4.7.pc
-%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/ecj.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl.jar
+%%JAVA%%@dirrm share/java/gcj%%SUFFIX%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/security
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include/freebsd
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include
+%%JAVA%%@dirrm gcj%%SUFFIX%%/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here
Index: lang/gcc48/Makefile
===================================================================
--- lang/gcc48/Makefile	(revision 305175)
+++ lang/gcc48/Makefile	(working copy)
@@ -3,10 +3,11 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.8.0.20120930
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.8
@@ -97,9 +98,19 @@ INFO+=		gcc${SUFFIX}/libquadmath	\
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
+ECJ_JAR=	ecj-4.5.jar
+MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
+MASTER_SITE_SUBDIR+=	java/:ecj
+DISTFILES+=	${ECJ_JAR}:ecj
+EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 LANGUAGES:=	${LANGUAGES},java
+CONFIGURE_ARGS+=--enable-java-home \
+		--with-gcc-suffix=${SUFFIX} \
+		--with-java-home=${PREFIX}/gcj${SUFFIX}/jre \
+		--with-jvm-jar-dir=${PREFIX}/share/java/gcj${SUFFIX} \
+		--with-jvm-root-dir=${PREFIX}/gcj${SUFFIX}
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -127,7 +138,11 @@ MAN3=		ffi${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
-PLIST_SUB+=	JAVA=""
+PLIST_SUB+=	JAVA="" JAVA_HOST=${ARCH}
+
+# Preps the source tree for the gcj build
+post-patch::
+	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
Index: lang/gcc48/distinfo
===================================================================
--- lang/gcc48/distinfo	(revision 305175)
+++ lang/gcc48/distinfo	(working copy)
@@ -1,2 +1,4 @@
 SHA256 (gcc-4.8-20120930.tar.bz2) = a5fe63ac539933edc9912394a6755f53d914e53ca63f0cc0eea6aa9753838189
 SIZE (gcc-4.8-20120930.tar.bz2) = 79806276
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676
Index: lang/gcc48/files/java-patch-hier
===================================================================
--- lang/gcc48/files/java-patch-hier	(revision 305175)
+++ lang/gcc48/files/java-patch-hier	(working copy)
@@ -1,13 +1,137 @@
-Index: libjava/Makefile.in
-===================================================================
---- libjava/Makefile.in	(revision 117734)
-+++ libjava/Makefile.in	(working copy)
-@@ -712,7 +712,7 @@
- 	$(am__append_2) $(am__append_3)
- toolexecmainlib_DATA = libgcj.spec
+--- gcc/java/Make-lang.in.orig	2012-07-16 07:32:42.000000000 -0400
++++ gcc/java/Make-lang.in	2012-09-24 13:19:58.000000000 -0400
+@@ -330,7 +330,7 @@
+ 
+ # jcf-path.o needs a -D.
+ CFLAGS-java/jcf-path.o += \
+-	-DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
++	-DLIBGCJ_ZIP_FILE='"$(datadir)/java/$(JAVA_INSTALL_NAME)/libgcj-$(version).jar"' \
+ 	-DDEFAULT_TARGET_VERSION=\"$(version)\"
+ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
+   java/jcf.h
+--- libjava/Makefile.in.orig	2012-09-02 18:42:24.000000000 -0400
++++ libjava/Makefile.in	2012-09-24 12:11:17.000000000 -0400
+@@ -938,8 +938,8 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
  dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
+-jardir = $(datadir)/java
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
++jardir = $(datadir)/java/gcj$(gcc_suffix)
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
  @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
+@@ -12539,11 +12539,11 @@
+ @CREATE_JAVA_HOME_TRUE@	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/classpath.security java.security; \
+ @CREATE_JAVA_HOME_TRUE@	cd $$working_dir; \
+-@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \
++@CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS); \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
+ @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
+@@ -12559,7 +12559,7 @@
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libjvm.so \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;	\
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)); \
+ @CREATE_JAVA_HOME_TRUE@	ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
+@@ -12575,11 +12575,11 @@
+ @CREATE_JAVA_HOME_TRUE@	  DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
+ @CREATE_JAVA_HOME_TRUE@	    -print-file-name=include/$$headername.h)); \
+ @CREATE_JAVA_HOME_TRUE@	  RELATIVE=$$(relative $$DIRECTORY \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)); \
+ @CREATE_JAVA_HOME_TRUE@	  ln -sf $$RELATIVE/$$headername.h \
+-@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
++@CREATE_JAVA_HOME_TRUE@	    $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)/$$headername.h; \
+ @CREATE_JAVA_HOME_TRUE@	done; \
+-@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
++@CREATE_JAVA_HOME_TRUE@	RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+ @CREATE_JAVA_HOME_TRUE@	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
+ 
+ maintainer-check: libgcj.la
+--- libjava/configure.orig	2012-09-30 18:38:09.000000000 -0400
++++ libjava/configure	2012-10-02 16:19:02.000000000 -0400
+@@ -22250,13 +22250,12 @@
+ 
+ else
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lrt" >&5
+-$as_echo_n "checking for sched_yield in -lrt... " >&6; }
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield" >&5
++$as_echo_n "checking for sched_yield... " >&6; }
+ if test "${ac_cv_lib_rt_sched_yield+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22293,8 +22292,6 @@
+ 
+ 	  $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h
+ 
+-	  THREADLIBS="$THREADLIBS -lrt"
+-	  THREADSPEC="$THREADSPEC -lrt"
+ else
+ 
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5
+@@ -22350,13 +22347,12 @@
+ done
+ 
+ 
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
+-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
++$as_echo_n "checking for clock_gettime... " >&6; }
+ if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+ if test x$gcc_no_link = xyes; then
+   as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+ fi
+@@ -22394,13 +22390,6 @@
+ 
+ $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+ 
+-	 case "$THREADSPEC" in
+-	   *-lrt*) ;;
+-	   *)
+- 	     THREADSPEC="$THREADSPEC -lrt"
+-	     THREADLIBS="$THREADLIBS -lrt"
+-	     ;;
+-	 esac
+ fi
+ 
+ 
+@@ -24881,7 +24870,7 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_cpu=x86;;
+-      i486-* | i586-* | i686-*)
++      i386-* | i486-* | i586-* | i686-*)
+         host_cpu=i386;;
+       x86_64-*)
+         host_cpu=amd64;;
+@@ -24899,6 +24888,8 @@
+     case ${host} in
+       *-mingw* | *-cygwin*)
+         host_os=win32;;
++      *-freebsd*)
++        host_os=freebsd;;
+       *-linux*)
+         host_os=linux;;
+       *)
Index: lang/gcc48/files/patch-jar-Updater.java
===================================================================
--- lang/gcc48/files/patch-jar-Updater.java	(revision 0)
+++ lang/gcc48/files/patch-jar-Updater.java	(working copy)
@@ -0,0 +1,27 @@
+--- libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java.orig	2011-01-11 14:46:05.000000000 -0500
++++ libjava/classpath/tools/gnu/classpath/tools/jar/Updater.java	2012-09-24 12:02:14.000000000 -0400
+@@ -70,9 +70,13 @@
+     // Set this early so that createManifest can use it.
+     inputJar = new JarFile(parameters.archiveFile);
+ 
++    // Find the current directory.
++    File tmpDir = parameters.archiveFile.getParentFile();
++    if (tmpDir == null)
++      tmpDir = new File(".");
++
+     // Write all the new entries to a temporary file.
+-    File tmpFile = File.createTempFile("jarcopy", null,
+-                                       parameters.archiveFile.getParentFile());
++    File tmpFile = File.createTempFile("jarcopy", null, tmpDir);
+     OutputStream os = new BufferedOutputStream(new FileOutputStream(tmpFile));
+     writeCommandLineEntries(parameters, os);
+ 
+@@ -91,7 +95,7 @@
+     if (!tmpFile.renameTo(parameters.archiveFile))
+       {
+           throw new IOException("Couldn't rename new JAR file " + tmpFile +
+-                                "to " + parameters.archiveFile);
++                                " to " + parameters.archiveFile);
+       }
+   }
+ 

Property changes on: lang/gcc48/files/patch-jar-Updater.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lang/gcc48/pkg-plist
===================================================================
--- lang/gcc48/pkg-plist	(revision 305175)
+++ lang/gcc48/pkg-plist	(working copy)
@@ -49,9 +49,83 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/prin
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
+%%JAVA%%gcj%%SUFFIX%%/bin/appletviewer
+%%JAVA%%gcj%%SUFFIX%%/bin/jar
+%%JAVA%%gcj%%SUFFIX%%/bin/jarsigner
+%%JAVA%%gcj%%SUFFIX%%/bin/java
+%%JAVA%%gcj%%SUFFIX%%/bin/javadoc
+%%JAVA%%gcj%%SUFFIX%%/bin/javah
+%%JAVA%%gcj%%SUFFIX%%/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/bin/native2ascii
+%%JAVA%%gcj%%SUFFIX%%/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/bin/rmic
+%%JAVA%%gcj%%SUFFIX%%/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/bin/serialver
+%%JAVA%%gcj%%SUFFIX%%/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/include/jawt.h
+%%JAVA%%gcj%%SUFFIX%%/include/jni.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jawt_md.h
+%%JAVA%%gcj%%SUFFIX%%/include/freebsd/jni_md.h
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/java
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/keytool
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/orbd
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmid
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/rmiregistry
+%%JAVA%%gcj%%SUFFIX%%/jre/bin/tnameserv
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/libjawt.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server/libjvm.so
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/rt.jar
+%%JAVA%%gcj%%SUFFIX%%/jre/lib/security/java.security
+%%JAVA%%gcj%%SUFFIX%%/lib/tools.jar
 %%JAVA%%libdata/pkgconfig/libgcj-4.8.pc
-%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
-%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/ecj.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jaas.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jce.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jdbc-stdext.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-cos.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-dns.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-ldap.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi-rmi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jndi.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/jsse.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/libgcj-tools-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl-1.5.0.jar
+%%JAVA%%share/java/gcj%%SUFFIX%%/sasl.jar
+%%JAVA%%@dirrm share/java/gcj%%SUFFIX%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/security
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/server
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%/client
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib/%%JAVA_HOST%%
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/lib
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%/jre
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include/freebsd
+%%JAVA%%@dirrm gcj%%SUFFIX%%/include
+%%JAVA%%@dirrm gcj%%SUFFIX%%/bin
+%%JAVA%%@dirrm gcj%%SUFFIX%%
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
 @comment Insert PLIST.lib here