diff -Naur ooo-build.orig/distro-configs/Frugalware64.conf.in ooo-build/distro-configs/Frugalware64.conf.in
--- ooo-build.orig/distro-configs/Frugalware64.conf.in	2005-12-20 13:06:57.000000000 +0100
+++ ooo-build/distro-configs/Frugalware64.conf.in	2006-04-20 16:42:38.000000000 +0200
@@ -1,8 +1,6 @@
 --with-gcc-speedup=ccache
 --with-icons=gnome
 --with-ccache-allowed
---with-java-home=$JAVA_HOME
---with-javac
 --with-firefox
 --with-system-curl
 --with-system-expat
@@ -15,7 +13,8 @@
 --with-system-cairo
 --with-system-freetype
 --with-system-sane-headers
---without-java
+--with-system-xalan
+--with-java=gij
 --enable-libart
 --enable-libsn
 --enable-kde
diff -Naur ooo-build.orig/distro-configs/Frugalware.conf.in ooo-build/distro-configs/Frugalware.conf.in
--- ooo-build.orig/distro-configs/Frugalware.conf.in	2005-12-20 13:06:57.000000000 +0100
+++ ooo-build/distro-configs/Frugalware.conf.in	2006-04-22 02:02:58.000000000 +0200
@@ -11,10 +11,9 @@
 --with-system-hunspell
 --with-system-odbc-headers
 --with-system-sane-headers
---with-java-home=$JAVA_HOME
---with-javac
 --with-firefox
---without-java
+--with-system-xalan
+--with-java=gij
 --enable-libart
 --enable-libsn
 --enable-fontconfig
diff -Naur ooo-build.orig/patches/src680/apply ooo-build/patches/src680/apply
--- ooo-build.orig/patches/src680/apply	2006-04-14 16:17:10.000000000 +0200
+++ ooo-build/patches/src680/apply	2006-04-22 02:05:50.000000000 +0200
@@ -59,7 +59,7 @@
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase, 64bit
 # Frugalware Linux
-FrugalwareBase: LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian
+FrugalwareBase: LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, NovellOnly, NovellOnlyUnix, NotDebian GCJExperimental, SystemJavaBits, SystemJavaBitsWorkaround
 Frugalware: FrugalwareBase, FrugalwareOnly
 Frugalware64: FrugalwareBase, 64bit, Frugalware64Only
 QiLinux: QiLinuxOnly, LinuxCommon, GlobalDesktopFiles, FilePickers
@@ -600,12 +600,18 @@
 frugalware.diff, pmladek
 xmlhelp-port-to-db-4.4.diff, i#58474, hmth
 store-drop-gcc-libs-on-linking.diff, i#63780, hmth
+buildfix-link-libxau.diff, i#64134, vmiklos
+gcc401-stlport45-include.diff
+#frugalware-system-xalan.diff
 
 
 [ Frugalware64Only ]
 frugalware64.diff, pmladek
 xmlhelp-port-to-db-4.4.diff, i#58474, hmth
 store-drop-gcc-libs-on-linking.diff, i#63780, hmth
+buildfix-link-libxau.diff, i#64134, vmiklos
+gcc401-stlport45-include.diff
+#frugalware-system-xalan.diff
 
 
 # ( mmp@oo.o deals with defaults apparently )
diff -Naur ooo-build.orig/patches/src680/buildfix-link-libxau.diff ooo-build/patches/src680/buildfix-link-libxau.diff
--- ooo-build.orig/patches/src680/buildfix-link-libxau.diff	1970-01-01 01:00:00.000000000 +0100
+++ ooo-build/patches/src680/buildfix-link-libxau.diff	2006-04-18 12:40:23.000000000 +0200
@@ -0,0 +1,16 @@
+Index: vcl/util/makefile.mk
+===================================================================
+RCS file: /cvs/gsl/vcl/util/makefile.mk,v
+retrieving revision 1.75
+diff -u -r1.75 makefile.mk
+--- vcl/util/makefile.mk	13 Oct 2005 09:37:37 -0000	1.75
++++ vcl/util/makefile.mk	1 Nov 2005 15:14:00 -0000
+@@ -318,7 +318,7 @@
+ SHL2STDLIBS+=$(LIBSN_LIBS)
+ .ENDIF
+ 
+-SHL2STDLIBS += -lXext -lSM -lICE -lX11
++SHL2STDLIBS += -lXext -lSM -lICE -lX11 -lXau
+ .IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
+ # needed by salprnpsp.cxx
+ SHL2STDLIBS+= -ldl
diff -Naur ooo-build.orig/patches/src680/frugalware-system-xalan.diff ooo-build/patches/src680/frugalware-system-xalan.diff
--- ooo-build.orig/patches/src680/frugalware-system-xalan.diff	1970-01-01 01:00:00.000000000 +0100
+++ ooo-build/patches/src680/frugalware-system-xalan.diff	2006-04-21 02:02:38.000000000 +0200
@@ -0,0 +1,11 @@
+--- filter/source/xsltfilter/makefile.mk.orig	2005-12-28 21:28:18.000000000 +0100
++++ filter/source/xsltfilter/makefile.mk	2005-12-28 22:13:41.000000000 +0100
+@@ -73,7 +73,7 @@
+ JARFILES 		= ridl.jar unoil.jar jurt.jar juh.jar
+ 
+ .IF "$(SYSTEM_XALAN)" == "YES"
+-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)
++XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XALAN_JAR)$(PATH_SEPERATOR)/usr/share/java/serializer.jar
+ .ELSE
+ JARFILES += xalan.jar
+ .ENDIF