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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-1.0/files/patch-product::util::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-product::util::makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-1.1/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-3-devel/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice-3/files/patch-product+util+makefile.mk b/editors/openoffice-3/files/patch-product+util+makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-3/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-3/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice-devel/files/patch-product+util+makefile.mk b/editors/openoffice-devel/files/patch-product+util+makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice-devel/files/patch-product+util+makefile.mk
+++ b/editors/openoffice-devel/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice.org-2/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 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,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice.org-3/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
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 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice/files/patch-product+util+makefile.mk b/editors/openoffice/files/patch-product+util+makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice/files/patch-product+util+makefile.mk
+++ b/editors/openoffice/files/patch-product+util+makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)
diff --git a/editors/openoffice/files/patch-product::util::makefile.mk b/editors/openoffice/files/patch-product::util::makefile.mk
index 2dc8e918f479..cee4a53a6659 100644
--- a/editors/openoffice/files/patch-product::util::makefile.mk
+++ b/editors/openoffice/files/patch-product::util::makefile.mk
@@ -1,5 +1,5 @@
---- ../product/util/makefile.mk.orig	Sun Jun  2 22:47:14 2002
-+++ ../product/util/makefile.mk	Sun Jun  2 23:32:44 2002
+--- ../product/util/makefile.mk.orig	Sat Apr  6 12:01:11 2002
++++ ../product/util/makefile.mk	Mon Jun  3 00:00:57 2002
 @@ -108,12 +108,20 @@
  STLPORTLIBNAME=libstlport_gcc.so
  BINDINGDLL=$(COMNAME)_uno
@@ -35,7 +35,7 @@
  .ELIF "$(OS)"=="NETBSD"
  ###########
  # NETBSD
-@@ -447,6 +448,20 @@
+@@ -438,13 +439,27 @@
  
  #---------------------------------------------------------
  # special targets for linux gcc3 
@@ -56,12 +56,24 @@
  $(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
  	-rm -f $@
  	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-@@ -462,6 +477,8 @@
+ 
+ $(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 $@
+@@ -452,7 +467,11 @@
+ 
  $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
  	-rm -f $@
- 	+ln -fs libgcc_s.so.1 $@
+-	+ln -s libgcc_s.so.1 $@
++	+ln -fs libgcc_s.so.1 $@
++
 +.ENDIF
 +.ENDIF
++
  #-------------------------------------------------------------
  
  $(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)