1 files changed, 44 insertions, 59 deletions
diff --git a/editors/openoffice.org-2.0/files/patch-project-extentions b/editors/openoffice.org-2.0/files/patch-project-extentions
index ff52c1788dc8..3b66e952e4ea 100644
--- a/editors/openoffice.org-2.0/files/patch-project-extentions
+++ b/editors/openoffice.org-2.0/files/patch-project-extentions
@@ -1,75 +1,60 @@
-#iZ XXXXX
-not yet raised
+http://www.openoffice.org/issues/show_bug.cgi?id=40179
 
+o source/config/ldap/makefile.mk needs -lcompat since re_comp is defined here.
+o FreeBSD doesn't have -ldl
+o INC+= -DNP_LINUX is also requried for FreeBSD
+
+Index: source/config/ldap/makefile.mk
+===================================================================
+RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
+retrieving revision 1.4
+diff -u -r1.4 makefile.mk
+--- extensions/source/config/ldap/makefile.mk	15 Nov 2004 14:14:22 -0000	1.4
++++ extensions/source/config/ldap/makefile.mk	8 Jan 2005 02:48:29 -0000
+@@ -116,6 +116,9 @@
+         $(CPPULIB) \
+         $(SALHELPERLIB) \
+         $(SALLIB)
++.IF "$(OS)"=="FREEBSD"
++SHL1STDLIBS+=-lcompat
++.ENDIF
+ 
+ DEF1NAME=$(SHL1TARGET)
+ DEF1EXPORTFILE=exports.dxp    
+Index: source/nsplugin/source/makefile.mk
+===================================================================
 RCS file: /cvs/util/extensions/source/nsplugin/source/makefile.mk,v
-retrieving revision 1.3
-diff -u -r1.3 makefile.mk
---- extensions/source/nsplugin/source/makefile.mk	3 Sep 2004 11:41:22 -0000	1.3
-+++ extensions/source/nsplugin/source/makefile.mk	4 Oct 2004 15:42:46 -0000
-@@ -77,6 +77,9 @@
- .IF "$(GUI)"=="UNX"
- .IF "$(OS)"=="LINUX"
+retrieving revision 1.8
+diff -u -r1.8 makefile.mk
+--- extensions/source/nsplugin/source/makefile.mk	3 Jan 2005 09:04:51 -0000	1.8
++++ extensions/source/nsplugin/source/makefile.mk	8 Jan 2005 02:48:30 -0000
+@@ -78,7 +78,7 @@
+ 	@echo GTK disabled - nothing to build
+ 
+ .ELSE           # "$(ENABLE_GTK)"==""
+-.IF "$(OS)"=="LINUX"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
  INC+= -DNP_LINUX
-+CFLAGS+=`pkg-config --cflags gtk+-2.0`
-+.ELIF "$(OS)"=="FREEBSD"
-+CFLAGS+=`pkg-config --cflags gtk+-2.0`
  .ENDIF
- .ENDIF
- .IF "$(GUI)"=="WNT"
-@@ -93,8 +96,12 @@
+ PKGCONFIG_MODULES=gtk+-2.0
+@@ -99,8 +99,10 @@
  .IF "$(GUI)"=="UNX"
  SHL1OBJS+=$(SLO)$/npunix.obj
  SLOFILES+=$(SLO)$/npunix.obj
-+.IF "$(OS)"=="FREEBSD"
-+#SHL1STDLIBS+=
-+.ELSE
++.IF "$(OS)"!="FREEBSD"
  SHL1STDLIBS+= -ldl -lnsl
 -.ENDIF
-+.ENDIF # FREEBSD
-+.ENDIF # UNX
++.ENDIF #FREEBSD
++.ENDIF #UNX
  .IF "$(GUI)"=="WNT"
  SHL1OBJS+=$(SLO)$/npwin.obj
  SLOFILES+=$(SLO)$/npwin.obj
-@@ -123,6 +130,7 @@
+@@ -131,7 +133,7 @@
+ 
  .IF "$(GUI)"=="UNX"
- #APP1STDLIBS+= -lgdk-x11-2.0 -lgtk-x11-2.0
- .IF "$(OS)"=="LINUX"
-+.ELIF "$(OS)"=="FREEBSD"
+ APP1STDLIBS+=$(PKGCONFIG_LIBS:s/-lpangoxft-1.0//)
+-.IF "$(OS)"=="LINUX"
++.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
  .ELSE
  APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
  .ENDIF
-Index: extensions/source/nsplugin/source/so_env.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/nsplugin/source/so_env.cxx,v
-retrieving revision 1.2
-diff -u -r1.2 so_env.cxx
---- extensions/source/nsplugin/source/so_env.cxx	20 Aug 2004 10:08:00 -0000	1.2
-+++ extensions/source/nsplugin/source/so_env.cxx	4 Oct 2004 15:42:46 -0000
-@@ -62,7 +62,7 @@
- #ifdef UNIX
- #include <sys/types.h>
- #include <strings.h>
--#ifdef NP_LINUX
-+#if defined(NP_LINUX) || defined (FREEBSD)
- #include <stdarg.h>
- #else
- #include <sys/varargs.h>
-
-
-Index: extensions/source/config/ldap/makefile.mk
-===================================================================
-RCS file: /cvs/util/extensions/source/config/ldap/makefile.mk,v
-retrieving revision 1.2
-diff -u -r1.2 makefile.mk
---- extensions/source/config/ldap/makefile.mk	3 Aug 2004 14:39:30 -0000	1.2
-+++ extensions/source/config/ldap/makefile.mk	24 Oct 2004 04:05:13 -0000
-@@ -97,6 +97,9 @@
-         $(CPPUHELPERLIB) \
-         $(CPPULIB) \
-         $(SALLIB)
-+.IF "$(OS)"=="FREEBSD"
-+SHL1STDLIBS+=-lcompat
-+.ENDIF
- 
- DEF1NAME=$(SHL1TARGET)
- DEF1EXPORTFILE=exports.dxp