diff options
40 files changed, 360 insertions, 160 deletions
diff --git a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-1.0/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-1.0/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-1.1-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-1.1-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-1.1/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-1.1/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.1/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-1.1/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-1.1/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-2.0-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-2.0-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-2.0-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-2.0-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-2.0-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-2.0-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-2.0-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-2.0-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-3-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-3-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-3-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-3-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-3/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-3/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-3/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-3/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-3/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-3/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-3/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-3/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-1.0/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.0/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-1.0/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.0/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-1.0/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.1-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.1-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-1.1-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.1-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-1.1-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-1.1-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.1/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-1.1/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.1/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-1.1/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-1.1/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-1.1/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-1.1/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-1.1/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-2-RC/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2-RC/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2-RC/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2-RC/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-2-RC/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-2-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-2-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2.0-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2.0-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-2.0-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2.0-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2.0-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-2.0-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2.0/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2.0/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2.0/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-2.0/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2.0/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2.0/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2.0/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-2.0/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-2/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-2/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-2/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-2/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-2/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-2/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-3-RC/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-3-RC/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3-RC/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-3-RC/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3-devel/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-3-devel/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3-devel/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-3-devel/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3-devel/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-3-devel/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3-devel/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-3-devel/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice.org-3/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice.org-3/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice.org-3/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice.org-3/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice.org-3/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice.org-3/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF 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 c121e1997e32..3cb4e0b0640f 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 @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF 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 c121e1997e32..3cb4e0b0640f 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 @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice/files/patch-sablot+Sablot-0.52.patch b/editors/openoffice/files/patch-sablot+Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice/files/patch-sablot+Sablot-0.52.patch +++ b/editors/openoffice/files/patch-sablot+Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF diff --git a/editors/openoffice/files/patch-sablot::Sablot-0.52.patch b/editors/openoffice/files/patch-sablot::Sablot-0.52.patch index c121e1997e32..3cb4e0b0640f 100644 --- a/editors/openoffice/files/patch-sablot::Sablot-0.52.patch +++ b/editors/openoffice/files/patch-sablot::Sablot-0.52.patch @@ -4,8 +4,8 @@ *************** *** 1 **** ! dummy ----- 1,147 ---- -+--- 1,151 ---- +---- 1,157 ---- ++--- 1,157 ---- ! #************************************************************************* ! # ! # $RCSfile: makefile.mk,v $ @@ -19,9 +19,14 @@ ! .ENDIF ! ! .IF "$(GUI)"=="UNX" -+ ++! +! .IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" -+! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE ++! .IF "$(OS)"=="FREEBSD" ++! CFLAGS+= -DHAVE_SYS_TIME_H ++! .ELSE ++! CFLAGS+= -DHAVE_SYS_TIMEB_H ++! .ENDIF ++! CFLAGS+= -DHAVE_GETTIMEOFDAY -DHAVE_ISNAN -DHAVE_FINITE +! .ELSE ! CFLAGS+= -DHAVE_SYS_TIMEB_H -DHAVE_FTIME -DHAVE_ISNAN -DHAVE_FINITE +! .ENDIF |