From 1c1cfed19ddbd6c3e0f763d4ad2c779dc6ea3f44 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Sun, 3 Mar 2002 00:56:13 +0000
Subject: Another 7 patches from Carlos

---
 .../files/patch-sal+workben+makefile.mk              | 20 ++++++++++++++++++++
 .../files/patch-sal::workben::makefile.mk            | 20 ++++++++++++++++++++
 .../files/patch-salhelper+source+makefile.mk         | 11 +++++++++++
 .../files/patch-salhelper::source::makefile.mk       | 11 +++++++++++
 .../files/patch-sax::util::makefile.mk               | 12 ++++++++++++
 .../files/patch-sc::util::makefile.mk                | 12 ++++++++++++
 .../files/patch-sch::util::makefile.mk               | 12 ++++++++++++
 .../files/patch-sd::util::makefile.mk                | 12 ++++++++++++
 .../files/patch-setup2+mow+source+loader+loader.c    | 17 +++++++++++++++++
 .../files/patch-setup2+mow+source+loader+makefile.mk | 11 +++++++++++
 .../patch-setup2::mow::source::loader::loader.c      | 17 +++++++++++++++++
 .../patch-setup2::mow::source::loader::makefile.mk   | 11 +++++++++++
 .../files/patch-xmlhelp::util::makefile.mk           | 12 ++++++++++++
 13 files changed, 178 insertions(+)
 create mode 100644 editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-sax::util::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-sc::util::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-sch::util::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-sd::util::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
 create mode 100644 editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c
 create mode 100644 editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-xmlhelp::util::makefile.mk

(limited to 'editors/openoffice-3-devel')

diff --git a/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
new file mode 100644
index 000000000000..321952be1163
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
@@ -0,0 +1,20 @@
+--- ../sal/workben/makefile.mk.orig	Sun Mar  3 01:27:32 2002
++++ ../sal/workben/makefile.mk	Sun Mar  3 01:27:54 2002
+@@ -325,7 +325,7 @@
+ # tgetpwnam
+ #
+ .IF "$(TESTAPP)" == "tgetpwnam"
+-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ 
+ CXXFILES=	tgetpwnam.cxx
+ OBJFILES=	$(OBJ)$/tgetpwnam.obj
+@@ -335,7 +335,7 @@
+ APP5STDLIBS=$(SALLIB)
+ APP5DEPN=	$(SLB)$/sal.lib
+ 
+-.ENDIF # (sco | netbsd)
++.ENDIF # (sco | netbsd || freebsd)
+ .ENDIF # tgetpwname
+ 
+ # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
new file mode 100644
index 000000000000..321952be1163
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
@@ -0,0 +1,20 @@
+--- ../sal/workben/makefile.mk.orig	Sun Mar  3 01:27:32 2002
++++ ../sal/workben/makefile.mk	Sun Mar  3 01:27:54 2002
+@@ -325,7 +325,7 @@
+ # tgetpwnam
+ #
+ .IF "$(TESTAPP)" == "tgetpwnam"
+-.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ 
+ CXXFILES=	tgetpwnam.cxx
+ OBJFILES=	$(OBJ)$/tgetpwnam.obj
+@@ -335,7 +335,7 @@
+ APP5STDLIBS=$(SALLIB)
+ APP5DEPN=	$(SLB)$/sal.lib
+ 
+-.ENDIF # (sco | netbsd)
++.ENDIF # (sco | netbsd || freebsd)
+ .ENDIF # tgetpwname
+ 
+ # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk
new file mode 100644
index 000000000000..e4a32035d6d5
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-salhelper+source+makefile.mk
@@ -0,0 +1,11 @@
+--- ../salhelper/source/makefile.mk	Sun Mar  3 01:30:52 2002
++++ ../salhelper/source/makefile.mk	Sun Mar  3 01:30:59 2002
+@@ -109,6 +109,8 @@
+ SHL1VERSIONMAP=soli.map
+ .ELIF "$(OS)$(CPU)"=="LINUXI"
+ SHL1VERSIONMAP=lngi.map
++.ELIF "$(OS)$(CPU)"=="FREEBSDI"
++SHL1VERSIONMAP=fbsdi.map
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk b/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk
new file mode 100644
index 000000000000..e4a32035d6d5
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-salhelper::source::makefile.mk
@@ -0,0 +1,11 @@
+--- ../salhelper/source/makefile.mk	Sun Mar  3 01:30:52 2002
++++ ../salhelper/source/makefile.mk	Sun Mar  3 01:30:59 2002
+@@ -109,6 +109,8 @@
+ SHL1VERSIONMAP=soli.map
+ .ELIF "$(OS)$(CPU)"=="LINUXI"
+ SHL1VERSIONMAP=lngi.map
++.ELIF "$(OS)$(CPU)"=="FREEBSDI"
++SHL1VERSIONMAP=fbsdi.map
+ .ENDIF
+ 
+ 
diff --git a/editors/openoffice-3-devel/files/patch-sax::util::makefile.mk b/editors/openoffice-3-devel/files/patch-sax::util::makefile.mk
new file mode 100644
index 000000000000..e6f307ea4a03
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sax::util::makefile.mk
@@ -0,0 +1,12 @@
+--- ../sax/util/makefile.mk.old	Sun Mar  3 01:33:10 2002
++++ ../sax/util/makefile.mk	Sun Mar  3 01:33:03 2002
+@@ -82,7 +82,9 @@
+ 			$(EXPAT3RDLIB)
+ 
+ SHL1LIBS=		$(SLB)$/expatwrap.lib 
++.IF "$(OS)"!="FREEBSD"
+ SHL1VERSIONMAP=		$(SOLARENV)$/src$/component.map
++.ENDIF
+ SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+ DEF1NAME=		$(SHL1TARGET)
+ 
diff --git a/editors/openoffice-3-devel/files/patch-sc::util::makefile.mk b/editors/openoffice-3-devel/files/patch-sc::util::makefile.mk
new file mode 100644
index 000000000000..d075b7901044
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sc::util::makefile.mk
@@ -0,0 +1,12 @@
+--- ../sc/util/makefile.mk.orig	Sun Mar  3 01:35:09 2002
++++ ../sc/util/makefile.mk	Sun Mar  3 01:34:53 2002
+@@ -105,7 +105,9 @@
+ # --- StarClac DLL
+ 
+ SHL1TARGET= sc$(UPD)$(DLLPOSTFIX)
++.IF "$(OS)"!="FREEBSD"
+ SHL1VERSIONMAP= sc.map
++.ENDIF
+ SHL1IMPLIB= sci
+ 
+ SHL1STDLIBS=        \
diff --git a/editors/openoffice-3-devel/files/patch-sch::util::makefile.mk b/editors/openoffice-3-devel/files/patch-sch::util::makefile.mk
new file mode 100644
index 000000000000..33ee8a8172f1
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sch::util::makefile.mk
@@ -0,0 +1,12 @@
+--- ../sch/util/makefile.mk.orig	Sun Mar  3 01:37:53 2002
++++ ../sch/util/makefile.mk	Sun Mar  3 01:38:16 2002
+@@ -111,7 +111,9 @@
+ 
+ 
+ SHL1TARGET= sch$(UPD)$(DLLPOSTFIX)
++.IF "$(OS)"!="FREEBSD"
+ SHL1VERSIONMAP= sch.map
++.ENDIF
+ .IF "$(GUI)" == "WNT" || "$(GUI)" == "WIN"
+ SHL1RES=	$(RCTARGET)
+ .ENDIF
diff --git a/editors/openoffice-3-devel/files/patch-sd::util::makefile.mk b/editors/openoffice-3-devel/files/patch-sd::util::makefile.mk
new file mode 100644
index 000000000000..51f4b7f461a8
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-sd::util::makefile.mk
@@ -0,0 +1,12 @@
+--- ../sd/util/makefile.mk.orig	Sun Mar  3 01:39:39 2002
++++ ../sd/util/makefile.mk	Sun Mar  3 01:40:09 2002
+@@ -108,7 +108,9 @@
+ # --- StarDraw DLL
+ 
+ SHL1TARGET= sd$(UPD)$(DLLPOSTFIX)
++.IF "$(OS)"!="FREEBSD"
+ SHL1VERSIONMAP= sd.map
++.ENDIF
+ SHL1IMPLIB= sdi
+ SHL1STDLIBS=        \
+ 	$(SCHLIB) \
diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
new file mode 100644
index 000000000000..572d8ebcc690
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+loader.c
@@ -0,0 +1,17 @@
+--- ../setup2/mow/source/loader/loader.c.orig	Sun Mar  3 01:41:47 2002
++++ ../setup2/mow/source/loader/loader.c	Sun Mar  3 01:42:19 2002
+@@ -603,6 +603,14 @@
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
+ "    ;;\n" \
++"  FreeBSD)\n" \
++"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
++"    export LD_LIBRARY_PATH\n" \
++"    ;;\n" \
++"  NetBSD)\n" \
++"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
++"    export LD_LIBRARY_PATH\n" \
++"    ;;\n" \
+ "      *)\n" \
+ "    ;;\n" \
+ "esac\n" \
diff --git a/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
new file mode 100644
index 000000000000..007c0f69b6f9
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-setup2+mow+source+loader+makefile.mk
@@ -0,0 +1,11 @@
+--- ../setup2/mow/source/loader/makefile.mk.orig	Sun Mar  3 01:45:18 2002
++++ ../setup2/mow/source/loader/makefile.mk	Sun Mar  3 01:45:22 2002
+@@ -85,7 +85,7 @@
+ APP1NOSAL=TRUE
+ APP1TARGET= $(TARGET)
+ APP1OBJS=  $(OBJFILES)
+-APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
++APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
+ 
+ .ENDIF			# "$(OS)"=="MACOSX"
+ 
diff --git a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c
new file mode 100644
index 000000000000..572d8ebcc690
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::loader.c
@@ -0,0 +1,17 @@
+--- ../setup2/mow/source/loader/loader.c.orig	Sun Mar  3 01:41:47 2002
++++ ../setup2/mow/source/loader/loader.c	Sun Mar  3 01:42:19 2002
+@@ -603,6 +603,14 @@
+ "    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
+ "    export LD_LIBRARY_PATH\n" \
+ "    ;;\n" \
++"  FreeBSD)\n" \
++"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
++"    export LD_LIBRARY_PATH\n" \
++"    ;;\n" \
++"  NetBSD)\n" \
++"    LD_LIBRARY_PATH=.:./lib:$LD_LIBRARY_PATH\n" \
++"    export LD_LIBRARY_PATH\n" \
++"    ;;\n" \
+ "      *)\n" \
+ "    ;;\n" \
+ "esac\n" \
diff --git a/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk
new file mode 100644
index 000000000000..007c0f69b6f9
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-setup2::mow::source::loader::makefile.mk
@@ -0,0 +1,11 @@
+--- ../setup2/mow/source/loader/makefile.mk.orig	Sun Mar  3 01:45:18 2002
++++ ../setup2/mow/source/loader/makefile.mk	Sun Mar  3 01:45:22 2002
+@@ -85,7 +85,7 @@
+ APP1NOSAL=TRUE
+ APP1TARGET= $(TARGET)
+ APP1OBJS=  $(OBJFILES)
+-APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB)
++APP1STDLIBS= $(SVUNZIPLIB) $(LOADERLIB) -lX11
+ 
+ .ENDIF			# "$(OS)"=="MACOSX"
+ 
diff --git a/editors/openoffice-3-devel/files/patch-xmlhelp::util::makefile.mk b/editors/openoffice-3-devel/files/patch-xmlhelp::util::makefile.mk
new file mode 100644
index 000000000000..4f7d0984c32d
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-xmlhelp::util::makefile.mk
@@ -0,0 +1,12 @@
+--- ../xmlhelp/util/makefile.mk.orig	Sun Mar  3 01:49:15 2002
++++ ../xmlhelp/util/makefile.mk	Sun Mar  3 01:49:19 2002
+@@ -94,7 +94,9 @@
+ SHL1TARGET=$(TARGET)$(UCP_VERSION)
+ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+ SHL1IMPLIB=i$(TARGET)
++.IF "$(OS)"!="FREEBSD"
+ SHL1VERSIONMAP=exports.map
++.ENDIF
+ 
+ # Add additional libs here.
+ SHL1STDLIBS=                     \
-- 
cgit v1.2.3