From a31c45a0b4b17f5d096eed1898c2707ee051cbfc Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Tue, 2 Apr 2002 23:48:28 +0000
Subject: Upgrade to build 641d. More work is necessary to make the build
 compile. There are still at least two different gcc bugs in our compiler, one
 issue has already been found by Alexander Kabaev <ak03@gte.com>. He's working
 on fixing the other.

---
 .../files/patch-sablot+Sablot-0.52.patch           | 32 ++++++++--------------
 1 file changed, 11 insertions(+), 21 deletions(-)

(limited to 'editors/openoffice.org-vcltesttool/files/patch-sablot+Sablot-0.52.patch')

diff --git a/editors/openoffice.org-vcltesttool/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-vcltesttool/files/patch-sablot+Sablot-0.52.patch
index 3b44b26ac6c7..61f12e5bfe7c 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-sablot+Sablot-0.52.patch
+++ b/editors/openoffice.org-vcltesttool/files/patch-sablot+Sablot-0.52.patch
@@ -1,35 +1,25 @@
---- ../sablot/Sablot-0.52.patch.orig	Mon Oct 29 19:18:40 2001
-+++ ../sablot/Sablot-0.52.patch	Tue Mar  5 18:16:07 2002
+--- ../sablot/Sablot-0.52.patch.orig	Mon Mar 18 16:03:02 2002
++++ ../sablot/Sablot-0.52.patch	Wed Apr  3 00:52:54 2002
 @@ -3,7 +3,7 @@
  ***************
  *** 1 ****
  ! dummy
----- 1,147 ----
-+--- 1,157 ----
+---- 1,151 ----
++--- 1,156 ----
  ! #*************************************************************************
  ! #
  ! #   $RCSfile: makefile.mk,v $
-@@ -85,12 +85,22 @@
- ! CFLAGS+=     -DHAVE_IEEEFP_H
- ! .ENDIF
- ! 
--! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX"
-+! .IF "$(OS)"=="LINUX" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
- ! CFLAGS+=      -DHAVE_UNISTD_H
+@@ -90,8 +90,13 @@
  ! .ENDIF
  ! 
  ! .IF "$(GUI)"=="UNX"
-+!
-+! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
++! .IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+ ! .IF "$(OS)"=="NETBSD"
+ ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
++! .ENDIF
 +! .IF "$(OS)"=="FREEBSD"
-+! CFLAGS+=	-DHAVE_SYS_TIME_H
-+! .ELSE
-+! CFLAGS+=	-DHAVE_SYS_TIMEB_H
++! CFLAGS+=     -DHAVE_SYS_TIME_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
 +! .ENDIF
-+! CFLAGS+=     -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE
-+! .ELSE
+ ! .ELSE
  ! CFLAGS+=     -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE
-+! .ENDIF
  ! .ENDIF
- ! 
- ! CFLAGS+=	-I$(SOLARINCDIR)$/external$/expat
-- 
cgit v1.2.3