sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to 641c source, add gcc2_freebsd_intel and gcc3_freebsd_intel cpp_uno

Browse source 
source
This commit is contained in:
Martin Blapp 2002-03-04 21:46:59 +00:00
parent b231dbc4f0
commit 53c240bb36
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=55536
420 changed files with 102700 additions and 2760 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editors/openoffice-1.0/files/patch-bridges+prj+build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1608
editors/openoffice-1.0/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-1.0/files/patch-bridges::prj::build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1719
editors/openoffice-1.0/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

1608
editors/openoffice-1.0/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

16
editors/openoffice-1.0/files/patch-connectivity+source+drivers+mozab+makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

16
editors/openoffice-1.0/files/patch-connectivity::source::drivers::mozab::makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

14
editors/openoffice-1.0/files/patch-cppuhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

14
editors/openoffice-1.0/files/patch-cppuhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

41
editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

41
editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

27
editors/openoffice-1.0/files/patch-sal+osl+unx+nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.0/files/patch-sal+osl+unx+pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.0/files/patch-sal+osl+unx+socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

27
editors/openoffice-1.0/files/patch-sal::osl::unx::nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.0/files/patch-sal::osl::unx::pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.0/files/patch-sal::osl::unx::socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

16
editors/openoffice-1.0/files/patch-salhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

16
editors/openoffice-1.0/files/patch-salhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

12
editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

12
editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

18
editors/openoffice-1.1-devel/files/patch-bridges+prj+build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1608
editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-1.1-devel/files/patch-bridges::prj::build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1719
editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

1608
editors/openoffice-1.1-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

16
editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

16
editors/openoffice-1.1-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

14
editors/openoffice-1.1-devel/files/patch-cppuhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

14
editors/openoffice-1.1-devel/files/patch-cppuhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

41
editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

41
editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

27
editors/openoffice-1.1-devel/files/patch-sal+osl+unx+nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.1-devel/files/patch-sal+osl+unx+pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

27
editors/openoffice-1.1-devel/files/patch-sal::osl::unx::nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.1-devel/files/patch-sal::osl::unx::pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.1-devel/files/patch-sal::osl::unx::socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

16
editors/openoffice-1.1-devel/files/patch-salhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

16
editors/openoffice-1.1-devel/files/patch-salhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

12
editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

12
editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

18
editors/openoffice-1.1/files/patch-bridges+prj+build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1608
editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-1.1/files/patch-bridges::prj::build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1719
editors/openoffice-1.1/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

1608
editors/openoffice-1.1/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

16
editors/openoffice-1.1/files/patch-connectivity+source+drivers+mozab+makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

16
editors/openoffice-1.1/files/patch-connectivity::source::drivers::mozab::makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

14
editors/openoffice-1.1/files/patch-cppuhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

14
editors/openoffice-1.1/files/patch-cppuhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

41
editors/openoffice-1.1/files/patch-sablot+Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

41
editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

27
editors/openoffice-1.1/files/patch-sal+osl+unx+nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.1/files/patch-sal+osl+unx+pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

27
editors/openoffice-1.1/files/patch-sal::osl::unx::nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-1.1/files/patch-sal::osl::unx::pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-1.1/files/patch-sal::osl::unx::socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

16
editors/openoffice-1.1/files/patch-salhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

16
editors/openoffice-1.1/files/patch-salhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

12
editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

12
editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

18
editors/openoffice-2.0-devel/files/patch-bridges+prj+build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1608
editors/openoffice-2.0-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-2.0-devel/files/patch-bridges::prj::build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1719
editors/openoffice-2.0-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

1608
editors/openoffice-2.0-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

16
editors/openoffice-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

16
editors/openoffice-2.0-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

14
editors/openoffice-2.0-devel/files/patch-cppuhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

14
editors/openoffice-2.0-devel/files/patch-cppuhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

41
editors/openoffice-2.0-devel/files/patch-sablot+Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

41
editors/openoffice-2.0-devel/files/patch-sablot::Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

27
editors/openoffice-2.0-devel/files/patch-sal+osl+unx+nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-2.0-devel/files/patch-sal+osl+unx+pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

27
editors/openoffice-2.0-devel/files/patch-sal::osl::unx::nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-2.0-devel/files/patch-sal::osl::unx::pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-2.0-devel/files/patch-sal::osl::unx::socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

16
editors/openoffice-2.0-devel/files/patch-salhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

16
editors/openoffice-2.0-devel/files/patch-salhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../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"
--- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001
+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002
@@ -109,6 +109,10 @@
SHL1VERSIONMAP=lngi.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
+SHL1VERSIONMAP=fbsdi.map
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF

12
editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

12
editors/openoffice-2.0-devel/files/patch-solenv::inc::tg_ext.mk
View file

@ -1,14 +1,14 @@
--- ../solenv/inc/tg_ext.mk.orig Sun Mar 3 19:47:04 2002
+++ ../solenv/inc/tg_ext.mk Sun Mar 3 19:47:08 2002
--- ../solenv/inc/tg_ext.mk.orig Wed Nov 14 13:59:42 2001
+++ ../solenv/inc/tg_ext.mk Mon Mar 4 17:30:39 2002
@@ -148,7 +148,11 @@
.IF "$(BSCLIENT)"=="TRUE"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
.ELSE # "$(BSCLIENT)"!=""
+.IF "$(OS)"=="FREEBSD"
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ELSE
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ +cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF
+.ELSE
+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+.ENDIF # "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
.ENDIF # "$(BSCLIENT)"!=""
.ENDIF # "$(GUI)"=="WNT"
.ENDIF # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"==""

18
editors/openoffice-3-devel/files/patch-bridges+prj+build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1608
editors/openoffice-3-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

18
editors/openoffice-3-devel/files/patch-bridges::prj::build.lst
View file

@ -1,10 +1,10 @@
--- ../bridges/prj/build.lst Sat Mar 2 18:13:42 2002
+++ ../bridges/prj/build.lst Sat Mar 2 18:13:46 2002
@@ -7,7 +7,6 @@
br bridges\source\remote\context nmake - all br_rcon br_unotypes NULL
br bridges\source\cpp_uno\msvc_win32_intel nmake - w br_msci br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_intel nmake - u br_gccli br_unotypes NULL
-br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
br bridges\source\cpp_uno\gcc2_linux_powerpc nmake - u br_gcclp br_unotypes NULL
br bridges\source\cpp_uno\gcc2_macosx_powerpc nmake - u br_gccmacoxp br_unotypes NULL
--- ../bridges/prj/build.lst.orig Tue Oct 30 17:28:35 2001
+++ ../bridges/prj/build.lst Mon Mar 4 21:43:05 2002
@@ -13,5 +13,7 @@
br bridges\source\cpp_uno\cc50_solaris_sparc nmake - u br_cc50sols br_unotypes NULL
br bridges\source\cpp_uno\cc50_solaris_intel nmake - u br_cc50soli br_unotypes NULL
br bridges\source\cpp_uno\gcc2_solaris_sparc nmake - u br_gccsols br_unotypes NULL
+br bridges\source\cpp_uno\gcc2_freebsd_intel nmake - u br_gccfi br_unotypes NULL
+br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_unotypes NULL
br bridges\source\prot_uno nmake - all br_pruno br_unotypes NULL
br bridges\source\java_uno nmake - all br_java_uno br_rcon NULL

1719
editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc2_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

1608
editors/openoffice-3-devel/files/patch-bridges::source::cpp_uno::gcc3_freebsd_intel Normal file
View file

File diff suppressed because it is too large Load diff

16
editors/openoffice-3-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

16
editors/openoffice-3-devel/files/patch-connectivity::source::drivers::mozab::makefile.mk
View file

@ -1,5 +1,5 @@
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Sat Mar 2 20:56:52 2002
+++ ../connectivity/source/drivers/mozab/makefile.mk Sat Mar 2 20:57:22 2002
--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Dec 3 17:20:59 2001
+++ ../connectivity/source/drivers/mozab/makefile.mk Sun Mar 3 17:26:52 2002
@@ -107,7 +107,9 @@
# --- MOZAB BASE Library -----------------------------------
@ -7,6 +7,16 @@
+.IF "$(OS)"!="FREEBSD"
SHL1VERSIONMAP= $(TARGET).map
+.ENDIF
SHL1TARGET= $(MOZAB_TARGET)$(MOZAB_MAJOR)
SHL1TARGET= $(TARGET)$(MOZAB_MAJOR)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
@@ -158,7 +160,9 @@
# --- MOZAB BASE Library -----------------------------------
+.IF "$(OS)"!="FREEBSD"
SHL2VERSIONMAP= $(TARGET2).map
+.ENDIF
SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
SHL2STDLIBS=\

14
editors/openoffice-3-devel/files/patch-cppuhelper+source+makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

14
editors/openoffice-3-devel/files/patch-cppuhelper::source::makefile.mk
View file

@ -1,11 +1,13 @@
--- ../cppuhelper/source/makefile.mk.orig Sat Mar 2 21:08:19 2002
+++ ../cppuhelper/source/makefile.mk Sat Mar 2 21:08:08 2002
@@ -174,6 +174,8 @@
SHL1VERSIONMAP=cc5_solaris_sparc.map
.ELIF "$(OS)$(CPU)$(COM)"=="LINUXIGCC"
--- ../cppuhelper/source/makefile.mk.orig Wed Nov 14 14:17:37 2001
+++ ../cppuhelper/source/makefile.mk Sun Mar 3 17:40:47 2002
@@ -173,6 +173,10 @@
SHL1VERSIONMAP=gcc2_linux_intel.map
+.ELIF "$(OS)$(CPU)"=="FREEBSDI"
.ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3"
SHL1VERSIONMAP=gcc3_linux_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2"
+#SHL1VERSIONMAP=gcc2_freebsd_intel.map
+.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3"
+#SHL1VERSIONMAP=gcc3_freebsd_intel.map
.ENDIF
# --- Targets ------------------------------------------------------

41
editors/openoffice-3-devel/files/patch-sablot+Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

41
editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch
View file

@ -1,11 +1,30 @@
--- ../sablot/Sablot-0.52.patch.orig Sat Mar 2 22:30:15 2002
+++ ../sablot/Sablot-0.52.patch Sat Mar 2 22:30:42 2002
@@ -85,7 +85,7 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="IRIX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" || "$(OS)"=="IRIX"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
--- ../sablot/Sablot-0.52.patch.orig Mon Mar 4 22:04:27 2002
+++ ../sablot/Sablot-0.52.patch Mon Mar 4 22:05:40 2002
@@ -3,7 +3,7 @@
***************
*** 1 ****
! dummy
---- 1,147 ----
+--- 1,151 ----
! #*************************************************************************
! #
! # $RCSfile: makefile.mk,v $
@@ -85,12 +85,17 @@
! CFLAGS+= -DHAVE_IEEEFP_H
! .ENDIF
!
-! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
! CFLAGS+= -DHAVE_UNISTD_H
! .ENDIF
!
! .IF "$(GUI)"=="UNX"
+
+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
+! .ELSE
! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
+! .ENDIF
! .ENDIF
!
! CFLAGS+= -I$(SOLARINCDIR)$/external$/expat

27
editors/openoffice-3-devel/files/patch-sal+osl+unx+nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-3-devel/files/patch-sal+osl+unx+pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

11
editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c Normal file
View file

@ -0,0 +1,11 @@
--- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
-#if defined(LINUX) || defined (IRIX)
+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD)
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */

27
editors/openoffice-3-devel/files/patch-sal::osl::unx::nlsupport.c
View file

@ -68,33 +68,6 @@
/*
* This implementation of osl_getTextEncodingFromLocale maps
@@ -829,7 +833,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_ALL=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBSD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv( "LC_ALL", locale_buf, 1);
#else
setenv( "LC_ALL", locale_buf );
@@ -841,7 +845,7 @@
snprintf(env_buf, sizeof(env_buf), "LC_CTYPE=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LC_CTYPE", locale_buf );
@@ -853,7 +857,7 @@
snprintf(env_buf, sizeof(env_buf), "LANG=%s", locale_buf);
env_buf[sizeof(env_buf)] = '\0';
putenv(env_buf);
-#elif defined( FREEBAD ) || defined( NETBSD )
+#elif defined( FREEBSD )
setenv("LC_CTYPE", locale_buf, 1 );
#else
setenv( "LANG", locale_buf );
@@ -864,6 +868,6 @@
return 0;
}

14
editors/openoffice-3-devel/files/patch-sal::osl::unx::pipe.c Normal file
View file

@ -0,0 +1,14 @@
--- ../sal/osl/unx/pipe.c.orig Tue May 29 07:38:32 2001
+++ ../sal/osl/unx/pipe.c
@@ -264,7 +264,11 @@
addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, name);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
len = sizeof(addr.sun_family) + strlen(addr.sun_path);
+#endif
if ( Options & osl_Pipe_CREATE )
{

Some files were not shown because too many files have changed in this diff Show more