diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-07 15:44:08 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-07 15:44:08 +0000 |
commit | 715b153f257091390c3c212dae2e0d7cc6b371be (patch) | |
tree | db11d59e0a1a2ae9eef4e3bff6c239f74448dd26 /editors | |
parent | Add include path $STLPORT_inc_stlport for FreeBSD too and remove a second (diff) |
Add missing SHL1STDLIBS reordering
Notes
Notes:
svn path=/head/; revision=55681
Diffstat (limited to 'editors')
40 files changed, 520 insertions, 80 deletions
diff --git a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-1.1/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-1.1/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-1.1/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-1.1/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-2.0-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-2.0-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-2.0-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-2.0-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-3/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-3/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-3/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-3/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-3/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.0/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-1.0/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.0/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-1.0/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-1.1-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-1.1/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-1.1/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-1.1/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-1.1/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-1.1/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2-RC/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2-RC/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2-RC/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-2-RC/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-2-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-2.0/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2.0/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2.0/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2.0/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-2.0/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-2/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-2/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-2/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-2/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-2/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3-RC/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-3-RC/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3-RC/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-3-devel/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3-devel/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-3-devel/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3-devel/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-3-devel/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-3/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-3/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-3/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-3/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-3/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice.org-vcltesttool/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice/files/patch-cppuhelper+source+makefile.mk b/editors/openoffice/files/patch-cppuhelper+source+makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice/files/patch-cppuhelper+source+makefile.mk +++ b/editors/openoffice/files/patch-cppuhelper+source+makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" diff --git a/editors/openoffice/files/patch-cppuhelper::source::makefile.mk b/editors/openoffice/files/patch-cppuhelper::source::makefile.mk index a4aa24adde41..59b78a3fd844 100644 --- a/editors/openoffice/files/patch-cppuhelper::source::makefile.mk +++ b/editors/openoffice/files/patch-cppuhelper::source::makefile.mk @@ -1,5 +1,16 @@ ---- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001 -+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002 +--- ../cppuhelper/source/makefile.mk.orig Thu Mar 7 16:37:48 2002 ++++ ../cppuhelper/source/makefile.mk Thu Mar 7 16:37:55 2002 +@@ -149,8 +149,8 @@ + SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID) + + SHL1STDLIBS= \ +- $(CPPULIB) \ +- $(SALLIB) ++ $(SALLIB) \ ++ $(CPPULIB) + + SHL1DEPN= + SHL1IMPLIB=i$(TARGET) @@ -173,6 +173,10 @@ SHL1VERSIONMAP=gcc2_linux_intel.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" |