diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice-1.0/files/patch-product::util::makefile.mk b/editors/openoffice-1.0/files/patch-product::util::makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-1.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-1.1/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-1.1/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.1/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-3-devel/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-3-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice-3/files/patch-product+util+makefile.mk b/editors/openoffice-3/files/patch-product+util+makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-3/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-3/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice-3/files/patch-product::util::makefile.mk b/editors/openoffice-3/files/patch-product::util::makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-3/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-3/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice-devel/files/patch-product+util+makefile.mk b/editors/openoffice-devel/files/patch-product+util+makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-devel/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-devel/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice-devel/files/patch-product::util::makefile.mk b/editors/openoffice-devel/files/patch-product::util::makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice-devel/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-devel/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-2/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-2/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-2/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 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,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-3/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-3/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-3/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@: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 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice/files/patch-product+util+makefile.mk b/editors/openoffice/files/patch-product+util+makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice/files/patch-product+util+makefile.mk
+++ b/editors/openoffice/files/patch-product+util+makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
diff --git a/editors/openoffice/files/patch-product::util::makefile.mk b/editors/openoffice/files/patch-product::util::makefile.mk
index 0d2033b9a4b2..919c2b2e2fad 100644
--- a/editors/openoffice/files/patch-product::util::makefile.mk
+++ b/editors/openoffice/files/patch-product::util::makefile.mk
@@ -1,8 +1,8 @@
---- ../product/util/makefile.mk.orig	Sat Mar  2 22:13:11 2002
-+++ ../product/util/makefile.mk	Sat Mar  2 22:14:13 2002
-@@ -111,6 +111,15 @@
+--- ../product/util/makefile.mk.orig	Mon Dec 17 18:15:54 2001
++++ ../product/util/makefile.mk	Sun Mar 10 23:18:09 2002
+@@ -117,6 +117,15 @@
+ STLPORTLIBNAME=stlport_vc6.dll
  ADDITIONAL_DLLS= \
- 	$(DESTDIRDLL)$/stlport_vc6.dll \
  	$(DESTDIRDLL)$/w9xucwrp.dll
 +.ELIF "$(OS)"=="FREEBSD"
 +###########
@@ -15,8 +15,8 @@
 +BINDINGDLL=gcc2_uno
  .ENDIF
  
- .IF "$(STLPORTLIBNAME)" != ""
-@@ -360,8 +369,8 @@
+ STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME)
+@@ -373,8 +382,8 @@
  	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
  
  $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)
@@ -25,5 +25,23 @@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
 +	+ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db)
  
+ 
+ #---------------------------------------------------------
+@@ -385,7 +394,7 @@
+ 
+ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libstdc++.so.3.0.1 $@
++	+ln -fs libstdc++.so.3.0.1 $@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+@@ -393,7 +402,7 @@
+ 
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ 	-rm -f $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
+ #-------------------------------------------------------------
+ 
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
- 	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@