Now buildable with GNU GCJ for openoffice.org-2.0.

Preparation of GCJ compilation for openoffice.org-2.0-devel

22 files changed, 209 insertions, 143 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6a49cbc15565..5bbd4d9b563d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -83,9 +83,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@@ -176,8 +178,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 625bbba1eea9..7cd35078b44b 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,13 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
-#XXX currently broken
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 6a49cbc15565..5bbd4d9b563d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -83,9 +83,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@@ -176,8 +178,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index 625bbba1eea9..7cd35078b44b 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,13 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
-#XXX currently broken
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 6a49cbc15565..5bbd4d9b563d 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -83,9 +83,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@@ -176,8 +178,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-2.0-devel/files/Makefile.knobs b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
index 625bbba1eea9..7cd35078b44b 100644
--- a/editors/openoffice.org-2.0-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0-devel/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,13 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
-#XXX currently broken
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-2.0/files/Makefile.knobs b/editors/openoffice.org-2.0/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice.org-2.0/files/Makefile.knobs
+++ b/editors/openoffice.org-2.0/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6a49cbc15565..5bbd4d9b563d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -83,9 +83,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@@ -176,8 +178,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 625bbba1eea9..7cd35078b44b 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,13 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
-#XXX currently broken
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 072aa4baf065..33dcf07cfd96 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -80,10 +80,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-BROKEN=	"Still work in progress"
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
 .endif
@@ -176,8 +177,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 11c71d6d6909..7cd35078b44b 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,12 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6a49cbc15565..5bbd4d9b563d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -83,9 +83,11 @@ PKGNAMESUFFIX?=         -${LANG_SUFFIX}
 .endif
 
 .if defined(WITH_GNUGCJ)
-#BUILD_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
-#BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
-#RUN_DEPENDS+=	gcj41:${PORTSDIR}/lang/gcc41-with_gcj
+#this wired part must be rewritten
+GCCVER=4.1.1
+BUILD_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
+BUILD_DEPENDS+=	gjdoc:${PORTSDIR}/java/gjdoc
+RUN_DEPENDS+=	${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/lib-gnu-java-awt-peer-gtk.so:${PORTSDIR}/lang/gcc41-withgcjawt
 BROKEN=	"Still work in progress"	
 .else
 BUILD_DEPENDS+=	gcc-ooo:${PORTSDIR}/lang/gcc-ooo
@@ -176,8 +178,14 @@ pre-everything::
 post-extract:
 .if defined(WITH_GNUGCJ)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${ANT_DISTFILE} | ${BZIP2_CMD} -d | ${TAR} xf -
-# #iXXXXX# xmerge doesn't support gjdoc
-	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKSRC}/solenv/bin/javadoc
+	@${RM} -Rf ${WRKDIR}/gnugcj
+	@${MKDIR} ${WRKDIR}/gnugcj/bin
+	@${MKDIR} ${WRKDIR}/gnugcj/lib
+	@${LN} -s ${LOCALBASE}/bin/gcj41 ${WRKDIR}/gnugcj/bin/gcj
+	@${LN} -s ${LOCALBASE}/bin/gij41 ${WRKDIR}/gnugcj/bin/gij
+	@${LN} -s ${LOCALBASE}/bin/gjdoc ${WRKDIR}/gnugcj/bin/javadoc  # #iXXXXX# xmerge doesn't support gjdoc
+	@${LN} -s ${LOCALBASE}/bin/fastjar41 ${WRKDIR}/gnugcj/bin/fastjar
+	@${LN} -s ${PREFIX}/lib/gcc/${MACHINE_ARCH}-portbld-freebsd${OSREL}/${GCCVER}/libgcj.so ${WRKDIR}/gnugcj/lib
 .endif
 .if defined(WITH_GPC)
 	@cd ${WRKDIR} ; ${CAT} ${DISTDIR}/${DIST_SUBDIR}/gpc231.tar.Z | ${TAR} xfz -
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index 625bbba1eea9..7cd35078b44b 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -6,7 +6,7 @@
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home=${LOCALBASE}/ant
 .endif
 .if !defined(WITHOUT_JAVA) && defined(WITH_GNUGCJ)
-CONFIGURE_ARGS+=	--with-jdk-home="${LOCALBASE}" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
+CONFIGURE_ARGS+=	--with-jdk-home="${WRKDIR}/gnugcj" --with-java=gij --with-ant-home="${WRKDIR}/apache-ant-${ANT_VERSION}"
 .endif
 .if defined(WITHOUT_JAVA)
 CONFIGURE_ARGS+=	--without-java
@@ -98,13 +98,11 @@ pre-fetch:
 #	@${ECHO} "You can compile OOo without Java support with"
 #	@${ECHO} "make -DWITHOUT_JAVA"
 #.endif
-#XXX currently broken
-#.if !defined(WITH_GNUGCJ)
-#	@${ECHO}
-#	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
-#	@${ECHO} "make -DWITH_GNUGCJ"
-#.endif
-#XXX currently broken
+.if !defined(WITH_GNUGCJ)
+	@${ECHO}
+	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
+	@${ECHO} "make -DWITH_GNUGCJ"
+.endif
 .if !defined(WITH_CUPS)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with CUPS support with"