Seeking approval for ports commit in editors/openoffice.org-2.0

[Bartosz Fabianowski]

The patch doesn't apply as is. I have attached a modified version that 
will apply against 2.0.2rc2. The only significant change is that 
according to the original patch, in file "scp2/source/ooo/file_ooo.scp", 
there should be a line that reads:

STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)

In the 2.0.2rc2 source, there is the following line instead:

STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)

This definitely seems to be the corresponding line, so I guess changing 
the patch to look for that line instead makes sense. But to be honest, I 
don't really know what I'm doing here ;). I have started the compile now 
and will know by tomorrow whether this worked or not.

- Bartosz


-------------- next part --------------
--- extensions/source/plugin/base/makefile.mk.orig	Sun Feb 26 05:46:20 2006
+++ extensions/source/plugin/base/makefile.mk	Sun Feb 26 05:47:42 2006
@@ -48,6 +48,8 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
 CDEFS+=-DOJI
 .ENDIF
 
+.IF "$(WITH_MOZILLA)" != "NO"
+
 SLOFILES=		\
 				$(SLO)$/plctrl.obj		\
 				$(SLO)$/service.obj		\
@@ -59,6 +61,8 @@ SLOFILES=		\
 				$(SLO)$/plcom.obj		\
 				$(SLO)$/multiplx.obj    \
 				$(SLO)$/plmodel.obj
+
+.ENDIF # $(WITH_MOZILLA) != "NO"
 
 # --- Targets ------------------------------------------------------
 
--- extensions/source/plugin/unx/makefile.mk.orig	Sun Feb 26 05:48:06 2006
+++ extensions/source/plugin/unx/makefile.mk	Sun Feb 26 05:48:47 2006
@@ -49,6 +49,8 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
 CDEFS+=-DOJI
 .ENDIF
 
+.IF "$(WITH_MOZILLA)" != "NO"
+
 SLOFILES=\
 	$(SLO)$/nppapi.obj		\
 	$(SLO)$/sysplug.obj		\
@@ -80,6 +82,7 @@ APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ld
 
 APP1DEF=	$(MISC)$/$(TARGET).def
 
+.ENDIF # $(WITH_MOZILLA) != "NO"
 
 # --- Targets ------------------------------------------------------
 
--- extensions/source/plugin/util/makefile.mk.orig	Sun Feb 26 05:49:04 2006
+++ extensions/source/plugin/util/makefile.mk	Sun Feb 26 05:49:53 2006
@@ -43,6 +43,9 @@ TARGETTYPE=GUI
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
+
+.IF "$(WITH_MOZILLA)" != "NO"
+
 LIB1TARGET = $(SLB)$/plall.lib
 LIB1FILES  = \
 	$(SLB)$/plbase.lib	\
@@ -96,6 +99,8 @@ SHL1STDLIBS+= -lX11
 .ENDIF
 
 SHL1STDLIBS+=$(SHL1OWNLIBS)
+
+.ENDIF # $(WITH_MOZILLA) != "NO"
 
 # --- Targets ------------------------------------------------------
 
--- extensions/source/plugin/win/makefile.mk.orig	Sun Feb 26 05:51:19 2006
+++ extensions/source/plugin/win/makefile.mk	Sun Feb 26 05:52:25 2006
@@ -53,6 +53,8 @@ CDEFS+=-DOJI
 
 # --- Types -------------------------------------
 
+.IF "$(WITH_MOZILLA)" != "NO"
+
 #UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)
 #INCPRE+=$(UNOUCROUT)
 
@@ -61,7 +63,9 @@ CDEFS+=-DOJI
 SLOFILES =	$(SLO)$/winmgr.obj	\
 			$(SLO)$/sysplug.obj
 
+.ENDIF # $(WITH_MOZILLA) != "NO"
 .ENDIF
+
 # ------------------------------------------------------------------
 
 
--- scp2/source/ooo/file_library_ooo.scp.orig	Sun Feb 26 05:55:38 2006
+++ scp2/source/ooo/file_library_ooo.scp	Sun Feb 26 05:56:56 2006
@@ -1474,7 +1474,9 @@ File gid_File_Lib_DeploymentGui
     PACKED_UNO_LIB_FILE_BODY_PATCH;
 End
 
+#ifndef WITHOUT_MOZILLA
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
+#endif
 
 STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Preload, preload)
 
--- scp2/source/ooo/file_ooo.scp.orig	Sun Feb 26 05:57:42 2006
+++ scp2/source/ooo/file_ooo.scp	Sun Feb 26 05:59:51 2006
@@ -163,6 +163,8 @@ File gid_File_Bin_MsiPkgchk
 End
 #endif
 
+#ifndef WITHOUT_MOZILLA
+
 #if !defined(UNX) || defined(ENABLE_GTK)
 File gid_File_Lib_Npsoplugin
         BIN_FILE_BODY;
@@ -184,6 +186,7 @@ File gid_File_Exe_Nsplugin
   #endif
 End
 #endif
+#endif
 
 File gid_File_Bin_Uno
     BIN_FILE_BODY;
@@ -291,7 +294,7 @@ File gid_File_Rdb_Gengal
     Name = "gengal.rdb";
 End
 
-#ifdef UNX
+#if !defined(WITHOUT_MOZILLA) && defined(UNX)
 
 File gid_File_Bin_Pluginapp
     BIN_FILE_BODY;