aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice-3
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-03-07 00:41:21 +0800
committermbr <mbr@FreeBSD.org>2002-03-07 00:41:21 +0800
commit3538db61ba8346231ad598494074c3cc63583a82 (patch)
treedc78ca02a1358bad4bf88c42da8f75e2bb760e6b /editors/openoffice-3
parentea36ca1ddf90cfa9caf0617814a0d628cae69080 (diff)
downloadfreebsd-ports-gnome-3538db61ba8346231ad598494074c3cc63583a82.tar.gz
freebsd-ports-gnome-3538db61ba8346231ad598494074c3cc63583a82.tar.zst
freebsd-ports-gnome-3538db61ba8346231ad598494074c3cc63583a82.zip
Reorder the SHL1STDLIBS librarys
Diffstat (limited to 'editors/openoffice-3')
-rw-r--r--editors/openoffice-3/files/patch-bridges+source+prot_uno+makefile.mk13
-rw-r--r--editors/openoffice-3/files/patch-bridges::source::prot_uno::makefile.mk13
-rw-r--r--editors/openoffice-3/files/patch-comphelper+util+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-comphelper::util::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-eventattacher+source+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-eventattacher::source::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-javaunohelper::source::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-shell::source::cmdmail::makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-shell::source::proxysettings::makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-shell::source::unix::exec::makefile.mk16
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::corereflection::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::defaultregistry::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::implementationregistration::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::inspect::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::invocation::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::invocation_adapterfactory::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::javaloader::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::javavm::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::loader::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::namingservice::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::proxy_factory::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::registry_tdprovider::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::servicemanager::makefile.mk14
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::tdmanager::makefile.mk15
-rw-r--r--editors/openoffice-3/files/patch-stoc::source::typeconv::makefile.mk14
44 files changed, 638 insertions, 0 deletions
diff --git a/editors/openoffice-3/files/patch-bridges+source+prot_uno+makefile.mk b/editors/openoffice-3/files/patch-bridges+source+prot_uno+makefile.mk
new file mode 100644
index 000000000000..595ea6cb5ac9
--- /dev/null
+++ b/editors/openoffice-3/files/patch-bridges+source+prot_uno+makefile.mk
@@ -0,0 +1,13 @@
+--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
++++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
+@@ -88,8 +88,8 @@
+ SHL1VERSIONMAP=..$/bridge_exports.map
+
+ SHL1STDLIBS= \
+- $(CPPULIB) \
+- $(SALLIB)
++ $(SALLIB) \
++ $(CPPULIB)
+
+ DEF1NAME=$(SHL1TARGET)
+
diff --git a/editors/openoffice-3/files/patch-bridges::source::prot_uno::makefile.mk b/editors/openoffice-3/files/patch-bridges::source::prot_uno::makefile.mk
new file mode 100644
index 000000000000..595ea6cb5ac9
--- /dev/null
+++ b/editors/openoffice-3/files/patch-bridges::source::prot_uno::makefile.mk
@@ -0,0 +1,13 @@
+--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
++++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
+@@ -88,8 +88,8 @@
+ SHL1VERSIONMAP=..$/bridge_exports.map
+
+ SHL1STDLIBS= \
+- $(CPPULIB) \
+- $(SALLIB)
++ $(SALLIB) \
++ $(CPPULIB)
+
+ DEF1NAME=$(SHL1TARGET)
+
diff --git a/editors/openoffice-3/files/patch-comphelper+util+makefile.mk b/editors/openoffice-3/files/patch-comphelper+util+makefile.mk
new file mode 100644
index 000000000000..9bca1b144e8f
--- /dev/null
+++ b/editors/openoffice-3/files/patch-comphelper+util+makefile.mk
@@ -0,0 +1,15 @@
+--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
++++ ../comphelper/util/makefile.mk
+@@ -85,11 +85,11 @@
+
+ SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
+ SHL1STDLIBS=\
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(VOSLIB) \
+ $(OSLLIB) \
+- $(SALLIB) \
+ $(CPPRTLLIB)
+
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-comphelper::util::makefile.mk b/editors/openoffice-3/files/patch-comphelper::util::makefile.mk
new file mode 100644
index 000000000000..9bca1b144e8f
--- /dev/null
+++ b/editors/openoffice-3/files/patch-comphelper::util::makefile.mk
@@ -0,0 +1,15 @@
+--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
++++ ../comphelper/util/makefile.mk
+@@ -85,11 +85,11 @@
+
+ SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
+ SHL1STDLIBS=\
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+ $(VOSLIB) \
+ $(OSLLIB) \
+- $(SALLIB) \
+ $(CPPRTLLIB)
+
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk b/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk
new file mode 100644
index 000000000000..b09408500c2d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-eventattacher+source+makefile.mk
@@ -0,0 +1,15 @@
+--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
++++ ../eventattacher/source/makefile.mk
+@@ -110,10 +110,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+- $(VOSLIB) \
+- $(SALLIB)
++ $(VOSLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-eventattacher::source::makefile.mk b/editors/openoffice-3/files/patch-eventattacher::source::makefile.mk
new file mode 100644
index 000000000000..b09408500c2d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-eventattacher::source::makefile.mk
@@ -0,0 +1,15 @@
+--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
++++ ../eventattacher/source/makefile.mk
+@@ -110,10 +110,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+- $(VOSLIB) \
+- $(SALLIB)
++ $(VOSLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk b/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk
new file mode 100644
index 000000000000..7f2cd2f1d220
--- /dev/null
+++ b/editors/openoffice-3/files/patch-javaunohelper+source+makefile.mk
@@ -0,0 +1,14 @@
+--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
++++ ../javaunohelper/source/makefile.mk
+@@ -110,9 +110,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-javaunohelper::source::makefile.mk b/editors/openoffice-3/files/patch-javaunohelper::source::makefile.mk
new file mode 100644
index 000000000000..7f2cd2f1d220
--- /dev/null
+++ b/editors/openoffice-3/files/patch-javaunohelper::source::makefile.mk
@@ -0,0 +1,14 @@
+--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
++++ ../javaunohelper/source/makefile.mk
+@@ -110,9 +110,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk b/editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk
new file mode 100644
index 000000000000..0476285c802e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell+source+cmdmail+makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/cmdmail/makefile.mk
+@@ -81,9 +81,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk b/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk
new file mode 100644
index 000000000000..e83cf7c9d7a1
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell+source+proxysettings+makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/proxysettings/makefile.mk
+@@ -85,9 +85,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk b/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk
new file mode 100644
index 000000000000..0b7712ee35f8
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell+source+unix+exec+makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/unix/exec/makefile.mk
+@@ -79,9 +79,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-shell::source::cmdmail::makefile.mk b/editors/openoffice-3/files/patch-shell::source::cmdmail::makefile.mk
new file mode 100644
index 000000000000..0476285c802e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell::source::cmdmail::makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/cmdmail/makefile.mk
+@@ -81,9 +81,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-shell::source::proxysettings::makefile.mk b/editors/openoffice-3/files/patch-shell::source::proxysettings::makefile.mk
new file mode 100644
index 000000000000..e83cf7c9d7a1
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell::source::proxysettings::makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/proxysettings/makefile.mk
+@@ -85,9 +85,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-shell::source::unix::exec::makefile.mk b/editors/openoffice-3/files/patch-shell::source::unix::exec::makefile.mk
new file mode 100644
index 000000000000..0b7712ee35f8
--- /dev/null
+++ b/editors/openoffice-3/files/patch-shell::source::unix::exec::makefile.mk
@@ -0,0 +1,16 @@
+--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
++++ ../shell/source/unix/exec/makefile.mk
+@@ -79,9 +79,10 @@
+
+ SHL1TARGET=$(TARGET)
+
+-SHL1STDLIBS=$(CPPULIB)\
+- $(CPPUHELPERLIB)\
+- $(SALLIB)
++SHL1STDLIBS=\
++ $(SALLIB)\
++ $(CPPULIB)\
++ $(CPPUHELPERLIB)
+
+ SHL1LIBS=
+
diff --git a/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk
new file mode 100644
index 000000000000..4b319b08d401
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+corereflection+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/corereflection/makefile.mk
+@@ -87,9 +87,9 @@
+ SHL1TARGET= $(TARGET)
+ SHL1VERSIONMAP= $(TARGET).map
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk
new file mode 100644
index 000000000000..4cae0476415a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+defaultregistry+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/defaultregistry/makefile.mk
+@@ -84,9 +84,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP= $(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk
new file mode 100644
index 000000000000..0051043b7ecb
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+implementationregistration+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/implementationregistration/makefile.mk
+@@ -85,9 +85,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk
new file mode 100644
index 000000000000..c7cd85253c11
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+inspect+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/inspect/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk
new file mode 100644
index 000000000000..9ac2072a5612
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+invocation+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/invocation/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
new file mode 100644
index 000000000000..8853ad39a90e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+invocation_adapterfactory+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/invocation_adapterfactory/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP= $(TARGET).map
+
diff --git a/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk
new file mode 100644
index 000000000000..af0fb9af619c
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+javaloader+makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/javaloader/makefile.mk
+@@ -83,9 +83,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS=\
++ $(SALLIB) \
+ $(CPPUHELPERLIB) \
+- $(CPPULIB) \
+- $(SALLIB)
++ $(CPPULIB)
++
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk
new file mode 100644
index 000000000000..f97af0ea270d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+javavm+makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/javavm/makefile.mk
+@@ -91,10 +91,10 @@
+ SHL1TARGET= $(TARGET)
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+- $(UNOLIB) \
+- $(SALLIB)
++ $(UNOLIB)
+
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS += advapi32.lib
diff --git a/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk
new file mode 100644
index 000000000000..5a08ee5937b6
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+loader+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/loader/makefile.mk
+@@ -83,9 +83,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk
new file mode 100644
index 000000000000..e573081bc21d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+namingservice+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/namingservice/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+
diff --git a/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk
new file mode 100644
index 000000000000..9110b2f50cd1
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+proxy_factory+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/proxy_factory/makefile.mk
+@@ -85,9 +85,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB=i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
new file mode 100644
index 000000000000..9d974d1c0d10
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+registry_tdprovider+makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/registry_tdprovider/makefile.mk
+@@ -88,10 +88,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+- $(SALHELPERLIB) \
+- $(SALLIB)
++ $(SALHELPERLIB)
+
+ SHL1DEPN=
+ SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk
new file mode 100644
index 000000000000..746776d54759
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+servicemanager+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/servicemanager/makefile.mk
+@@ -84,9 +84,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk
new file mode 100644
index 000000000000..76403fdde841
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+tdmanager+makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/tdmanager/makefile.mk
+@@ -83,9 +83,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
++
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk b/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk
new file mode 100644
index 000000000000..dc647f89a166
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc+source+typeconv+makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/typeconv/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1VERSIONMAP= $(TARGET).map
diff --git a/editors/openoffice-3/files/patch-stoc::source::corereflection::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::corereflection::makefile.mk
new file mode 100644
index 000000000000..4b319b08d401
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::corereflection::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/corereflection/makefile.mk
+@@ -87,9 +87,9 @@
+ SHL1TARGET= $(TARGET)
+ SHL1VERSIONMAP= $(TARGET).map
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::defaultregistry::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::defaultregistry::makefile.mk
new file mode 100644
index 000000000000..4cae0476415a
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::defaultregistry::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/defaultregistry/makefile.mk
+@@ -84,9 +84,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP= $(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc::source::implementationregistration::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::implementationregistration::makefile.mk
new file mode 100644
index 000000000000..0051043b7ecb
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::implementationregistration::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/implementationregistration/makefile.mk
+@@ -85,9 +85,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::inspect::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::inspect::makefile.mk
new file mode 100644
index 000000000000..c7cd85253c11
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::inspect::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/inspect/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::invocation::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::invocation::makefile.mk
new file mode 100644
index 000000000000..9ac2072a5612
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::invocation::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/invocation/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc::source::invocation_adapterfactory::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::invocation_adapterfactory::makefile.mk
new file mode 100644
index 000000000000..8853ad39a90e
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::invocation_adapterfactory::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/invocation_adapterfactory/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP= $(TARGET).map
+
diff --git a/editors/openoffice-3/files/patch-stoc::source::javaloader::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::javaloader::makefile.mk
new file mode 100644
index 000000000000..af0fb9af619c
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::javaloader::makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/javaloader/makefile.mk
+@@ -83,9 +83,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS=\
++ $(SALLIB) \
+ $(CPPUHELPERLIB) \
+- $(CPPULIB) \
+- $(SALLIB)
++ $(CPPULIB)
++
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::javavm::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::javavm::makefile.mk
new file mode 100644
index 000000000000..f97af0ea270d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::javavm::makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/javavm/makefile.mk
+@@ -91,10 +91,10 @@
+ SHL1TARGET= $(TARGET)
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+- $(UNOLIB) \
+- $(SALLIB)
++ $(UNOLIB)
+
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS += advapi32.lib
diff --git a/editors/openoffice-3/files/patch-stoc::source::loader::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::loader::makefile.mk
new file mode 100644
index 000000000000..5a08ee5937b6
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::loader::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/loader/makefile.mk
+@@ -83,9 +83,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc::source::namingservice::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::namingservice::makefile.mk
new file mode 100644
index 000000000000..e573081bc21d
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::namingservice::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/namingservice/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1VERSIONMAP=$(TARGET).map
+
diff --git a/editors/openoffice-3/files/patch-stoc::source::proxy_factory::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::proxy_factory::makefile.mk
new file mode 100644
index 000000000000..9110b2f50cd1
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::proxy_factory::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/proxy_factory/makefile.mk
+@@ -85,9 +85,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB=i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::registry_tdprovider::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::registry_tdprovider::makefile.mk
new file mode 100644
index 000000000000..9d974d1c0d10
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::registry_tdprovider::makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
++++ ../stoc/source/registry_tdprovider/makefile.mk
+@@ -88,10 +88,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+ $(CPPUHELPERLIB) \
+- $(SALHELPERLIB) \
+- $(SALLIB)
++ $(SALHELPERLIB)
+
+ SHL1DEPN=
+ SHL1VERSIONMAP=$(TARGET).map
diff --git a/editors/openoffice-3/files/patch-stoc::source::servicemanager::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::servicemanager::makefile.mk
new file mode 100644
index 000000000000..746776d54759
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::servicemanager::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/servicemanager/makefile.mk
+@@ -84,9 +84,9 @@
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1IMPLIB= i$(TARGET)
diff --git a/editors/openoffice-3/files/patch-stoc::source::tdmanager::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::tdmanager::makefile.mk
new file mode 100644
index 000000000000..76403fdde841
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::tdmanager::makefile.mk
@@ -0,0 +1,15 @@
+--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/tdmanager/makefile.mk
+@@ -83,9 +83,10 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
++
+ SHL1VERSIONMAP=$(TARGET).map
+
+ SHL1DEPN=
diff --git a/editors/openoffice-3/files/patch-stoc::source::typeconv::makefile.mk b/editors/openoffice-3/files/patch-stoc::source::typeconv::makefile.mk
new file mode 100644
index 000000000000..dc647f89a166
--- /dev/null
+++ b/editors/openoffice-3/files/patch-stoc::source::typeconv::makefile.mk
@@ -0,0 +1,14 @@
+--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
++++ ../stoc/source/typeconv/makefile.mk
+@@ -82,9 +82,9 @@
+ SHL1TARGET= $(TARGET)
+
+ SHL1STDLIBS= \
++ $(SALLIB) \
+ $(CPPULIB) \
+- $(CPPUHELPERLIB) \
+- $(SALLIB)
++ $(CPPUHELPERLIB)
+
+ SHL1DEPN=
+ SHL1VERSIONMAP= $(TARGET).map