Copy stlport library to the right place. Fix build

17 files changed, 289 insertions, 102 deletions

diff --git a/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-1.1/files/patch-product::util::makefile.mk b/editors/openoffice-1.1/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-1.1/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.1/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-2.0-devel/files/patch-product::util::makefile.mk b/editors/openoffice-2.0-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-2.0-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-3-devel/files/patch-product::util::makefile.mk b/editors/openoffice-3-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-3-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-3/files/patch-product::util::makefile.mk b/editors/openoffice-3/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-3/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-3/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice-devel/files/patch-product::util::makefile.mk b/editors/openoffice-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-1.1-devel/files/patch-product::util::makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-1.1/files/patch-product::util::makefile.mk b/editors/openoffice.org-1.1/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-1.1/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk b/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk b/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2.0-devel/files/patch-product::util::makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2.0/files/patch-product::util::makefile.mk b/editors/openoffice.org-2.0/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-2.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-2/files/patch-product::util::makefile.mk b/editors/openoffice.org-2/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-2/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-3-RC/files/patch-product::util::makefile.mk b/editors/openoffice.org-3-RC/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-3-RC/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-3-devel/files/patch-product::util::makefile.mk b/editors/openoffice.org-3-devel/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-3-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-3/files/patch-product::util::makefile.mk b/editors/openoffice.org-3/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-3/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-3/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
diff --git a/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk
index 47058f96d8ca..1df961f90223 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk
@@ -1,6 +1,6 @@
 --- ../product/util/makefile.mk.orig	Wed Feb 27 12:32:19 2002
-+++ ../product/util/makefile.mk	Mon Mar 11 14:10:27 2002
-@@ -115,6 +115,15 @@
++++ ../product/util/makefile.mk	Tue Mar 12 14:08:34 2002
+@@ -115,13 +115,26 @@
  STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
  	$(DESTDIRDLL)$/w9xucwrp.dll
@@ -12,11 +12,22 @@
 +DESTDIRLIB=$(DESTDIR)$/freebsd$/lib
 +DESTDIRDLL=$(DESTDIRLIB)
 +STLPORTLIBNAME=libstlport_gcc.so
-+BINDINGDLL=gcc2_uno
++BINDINGDLL=$(COMNAME)_uno
  .ENDIF
  
  STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
-@@ -367,8 +376,8 @@
+ .IF "$(STLPORT4)" != ""
+ # in OOo build environment
+ .IF "($STLPORT4)" != "NO_STLPORT4"
++.IF "$(OS)" != "FREEBSD"
+ STLPORTOUT=$(SOLARVER)$/$(UPD)$/$(INPATH)$/bin$/$(STLPORTLIBNAME)
++.ELSE
++STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
++.ENDIF
+ .ELSE	
+ STLPORTOUT=$(STLPORT4)$/lib$/$(STLPORTLIBNAME)
+ .ENDIF
+@@ -367,8 +380,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -27,7 +38,7 @@
  
  
  #---------------------------------------------------------
-@@ -379,7 +388,7 @@
+@@ -379,7 +392,7 @@
  #
  #$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
  #	-rm -f $@
@@ -36,7 +47,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
-@@ -387,7 +396,7 @@
+@@ -387,7 +400,7 @@
  
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@