From 128e6227454c41a6c484863fef7f7f075afdf5eb Mon Sep 17 00:00:00 2001
From: René Engelhard <rene@openoffice.org>
Date: Sun, 2 Dec 2007 22:48:10 +0000
Subject: initial hyphen module

---
 hyphen/makefile.mk | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 hyphen/makefile.mk

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
new file mode 100644
index 000000000000..179b64bf61e4
--- /dev/null
+++ b/hyphen/makefile.mk
@@ -0,0 +1,73 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: rene $ $Date: 2007-12-02 23:48:10 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=hyphen
+TARGET=hyphen
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=hyphen-2.3
+
+#PATCH_FILE_NAME=hunspell-1.1.12.patch
+
+.IF "$(GUI)"=="UNX"
+#CONFIGURE_DIR=$(BUILD_DIR)
+
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+BUILD_ACTION=make
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+BUILD_ACTION=cd src/hunspell && dmake
+.ENDIF # "$(GUI)"=="WNT"
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
-- 
cgit 


From 9c4f6472dd4b1642ff3ce20ec1ae0430f850c660 Mon Sep 17 00:00:00 2001
From: René Engelhard <rene@openoffice.org>
Date: Fri, 4 Jan 2008 19:32:41 +0000
Subject: new patch file

---
 hyphen/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 179b64bf61e4..3e7f45159507 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: rene $ $Date: 2007-12-02 23:48:10 $
+#   last change: $Author: rene $ $Date: 2008-01-04 20:32:41 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -46,7 +46,7 @@ TARGET=hyphen
 
 TARFILE_NAME=hyphen-2.3
 
-#PATCH_FILE_NAME=hunspell-1.1.12.patch
+PATCH_FILE_NAME=hyphen-2.3.patch
 
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_DIR=$(BUILD_DIR)
-- 
cgit 


From d3c19b7e05560b153435374bd7f9310a266ba11a Mon Sep 17 00:00:00 2001
From: René Engelhard <rene@openoffice.org>
Date: Mon, 18 Feb 2008 08:42:59 +0000
Subject: (windows) build fixes

---
 hyphen/makefile.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 3e7f45159507..859ddadf9883 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: rene $ $Date: 2008-01-04 20:32:41 $
+#   last change: $Author: rene $ $Date: 2008-02-18 09:42:59 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -46,10 +46,12 @@ TARGET=hyphen
 
 TARFILE_NAME=hyphen-2.3
 
+ADDITIONAL_FILES += makefile.mk
+
 PATCH_FILE_NAME=hyphen-2.3.patch
 
 .IF "$(GUI)"=="UNX"
-#CONFIGURE_DIR=$(BUILD_DIR)
+CONFIGURE_DIR=$(BUILD_DIR)
 
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=configure
@@ -61,7 +63,7 @@ BUILD_ACTION=make
 
 
 .IF "$(GUI)"=="WNT"
-BUILD_ACTION=cd src/hunspell && dmake
+BUILD_ACTION=dmake
 .ENDIF # "$(GUI)"=="WNT"
 
 
-- 
cgit 


From 06cc978028abcabc8be548628bd9ee24e58b2dc4 Mon Sep 17 00:00:00 2001
From: René Engelhard <rene@openoffice.org>
Date: Tue, 19 Feb 2008 10:33:31 +0000
Subject: update to hyphen 2.3.1

---
 hyphen/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 859ddadf9883..6b8d264f1823 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rene $ $Date: 2008-02-18 09:42:59 $
+#   last change: $Author: rene $ $Date: 2008-02-19 11:33:31 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -44,7 +44,7 @@ TARGET=hyphen
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hyphen-2.3
+TARFILE_NAME=hyphen-2.3.1
 
 ADDITIONAL_FILES += makefile.mk
 
-- 
cgit 


From 57afdd313a6ff7b94213638d622628bee28e4258 Mon Sep 17 00:00:00 2001
From: René Engelhard <rene@openoffice.org>
Date: Tue, 22 Apr 2008 13:42:58 +0000
Subject: new file header...

---
 hyphen/makefile.mk | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 6b8d264f1823..b722accbbe07 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -1,35 +1,31 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.4 $
+# $RCSfile: makefile.mk,v $
 #
-#   last change: $Author: rene $ $Date: 2008-02-19 11:33:31 $
+# $Revision: 1.5 $
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# This file is part of OpenOffice.org.
 #
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
 #
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library is distributed in the hope that it will be useful,
-#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#     Lesser General Public License for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
-- 
cgit 


From 132b3dfddbcbf8d8dc99ef8dd4a87a7c8af68e53 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 15 May 2008 08:31:08 +0000
Subject: #i89468#

---
 hyphen/makefile.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b722accbbe07..70ef187034fc 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.6 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -50,10 +50,19 @@ PATCH_FILE_NAME=hyphen-2.3.patch
 CONFIGURE_DIR=$(BUILD_DIR)
 
 #relative to CONFIGURE_DIR
+# still needed also in system-hyphen case as it creates the makefile
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS= --disable-shared --with-pic
 
+.IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
+BUILD_ACTION=make hyph_en_US.dic
+.ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
+@all:
+    echo "Nothing to do here."
+.ELSE
 BUILD_ACTION=make
+OUT2INC += hyphen.h 
+.ENDIF
 
 .ENDIF # "$(GUI)"=="UNX"
 
-- 
cgit 


From dc0678a84bb09581c182191bc665377d13cea3f3 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Mon, 19 May 2008 07:17:44 +0000
Subject: #i89468# deliver hyphen.h for windows too

---
 hyphen/makefile.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 70ef187034fc..bf5f1b15dbba 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.6 $
+# $Revision: 1.7 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -69,6 +69,7 @@ OUT2INC += hyphen.h
 
 .IF "$(GUI)"=="WNT"
 BUILD_ACTION=dmake
+OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="WNT"
 
 
-- 
cgit 


From 2bd6f51cc98c00c370cbf7eb9428f8212809d9b5 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Fri, 6 Jun 2008 15:59:22 +0000
Subject: INTEGRATION: CWS mingwport13 (1.5.2); FILE MERGED 2008/05/30 11:08:16
 vg 1.5.2.3: #i88772# mingw port catch-up fixes 2008/05/23 11:24:32 vg
 1.5.2.2: #i88772# mingw port catch-up fixes 2008/05/16 15:15:31 vg 1.5.2.1:
 #i88772# MinGW port catch-up fixes

---
 hyphen/makefile.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index bf5f1b15dbba..b328652b62db 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.8 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -68,7 +68,15 @@ OUT2INC += hyphen.h
 
 
 .IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+
+BUILD_ACTION=make
+
+.ELSE
 BUILD_ACTION=dmake
+.ENDIF # "$(COM)"=="GCC"
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="WNT"
 
-- 
cgit 


From 98fd1403b90e6ec977dbca4fa4f220dbe8d3fe95 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Thu, 26 Jun 2008 06:00:11 +0000
Subject: #i10000#  Build breaks in central environment.

---
 hyphen/makefile.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b328652b62db..e5748b71ae5c 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.8 $
+# $Revision: 1.9 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -54,6 +54,12 @@ CONFIGURE_DIR=$(BUILD_DIR)
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS= --disable-shared --with-pic
 
+.IF "$(SYSBASE)"!=""
+.IF "$(EXTRA_CFLAGS)"!=""
+CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ENDIF # "$(SYSBASE)"!=""
+
 .IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
 BUILD_ACTION=make hyph_en_US.dic
 .ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
-- 
cgit 


From 7b83d6549854eeaad0a0fe964f4b359e1e3d2c7a Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Wed, 27 Aug 2008 12:54:37 +0000
Subject: INTEGRATION: CWS sb91 (1.9.4); FILE MERGED 2008/07/11 09:09:01 sb
 1.9.4.1: #i91567# adapt to unxsolu4

---
 hyphen/makefile.mk | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index e5748b71ae5c..ad3436a6eeef 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.9 $
+# $Revision: 1.10 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -54,12 +54,21 @@ CONFIGURE_DIR=$(BUILD_DIR)
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS= --disable-shared --with-pic
 
+.IF "$(COM)"=="C52" && "$(CPU)"=="U"
+LCL_CONFIGURE_CFLAGS+=-m64
+.ENDIF
+
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
-CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
+LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
+CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
 
+.IF "$(LCL_CONFIGURE_CFLAGS)"!=""
+CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
+.ENDIF
+
 .IF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" == "YES"
 BUILD_ACTION=make hyph_en_US.dic
 .ELIF "$(SYSTEM_HYPH)" == "YES" && "$(WITH_MYSPELL_DICTS)" != "YES"
-- 
cgit 


From e3ee495f2b9b5e70f00bb54ea983a77ac0e28550 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 9 Dec 2008 08:43:20 +0000
Subject: CWS-TOOLING: integrate CWS os2port04 2008-11-27 13:22:38 +0100 ydario
  r264480 : #i96439#: fix build for unix platforms. 2008-11-26 18:32:42 +0100
 ydario  r264433 : #i96439#: os2 systemshell code (dummy code). 2008-11-26
 16:33:48 +0100 ydario  r264421 : #i96439#: vcl fix for pdf export of truetype
 fonts. 2008-11-26 15:04:44 +0100 ydario  r264399 : #i96439#: build macros fix
 scripts, gcc specific flags. 2008-11-26 15:00:15 +0100 ydario  r264398 :
 #i96439#: vcl source code updates. 2008-11-26 13:21:37 +0100 ydario  r264378
 : #i96439#: os2 build system fixes. 2008-11-26 13:20:27 +0100 ydario  r264377
 : #i96439#: configuration and build macros updates. 2008-11-26 13:16:35 +0100
 ydario  r264375 : #i96439#: new launcher code, build system updates.
 2008-11-26 13:12:49 +0100 ydario  r264373 : #i96439#: use OSL endian macro.
 2008-11-26 12:54:50 +0100 ydario  r264371 : #i96439#: os2 build system fixes.
 2008-11-26 12:30:46 +0100 ydario  r264367 : #i96439#: os2 build system fixes.
 2008-11-26 12:09:33 +0100 ydario  r264365 : #i96439#: _Export is a reserved
 keyword under gcc for os2. 2008-11-26 12:08:12 +0100 ydario  r264364 :
 #i96439#: new libpath handling. 2008-11-26 11:57:51 +0100 ydario  r264363 :
 #i96439#: use C call, generates proper stabs; fix rtti names.

---
 hyphen/makefile.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index ad3436a6eeef..62f3b4f4a376 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -95,6 +95,10 @@ BUILD_ACTION=dmake
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="WNT"
 
+.IF "$(GUI)"=="OS2"
+BUILD_ACTION=dmake
+OUT2INC += hyphen.h
+.ENDIF # "$(GUI)"=="OS2"
 
 # --- Targets ------------------------------------------------------
 
-- 
cgit 


From 177eb5d1cde50cdbf06a3175b5b78bcc9c2a5718 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 19 Feb 2009 07:29:28 +0000
Subject: CWS-TOOLING: integrate CWS ause099 2009-01-29 12:30:57 +0100 hjs 
 r267116 : #i98365# fix unsetting g+s bit 2009-01-23 14:21:19 +0100 hjs 
 r266819 : #i40246# - cleanup 2009-01-23 14:14:07 +0100 hjs  r266818 :
 #i40246# - fix quoting of final echo line 2009-01-23 12:42:33 +0100 hjs 
 r266807 : #i98365# leave higher bits alone 2009-01-23 11:23:42 +0100 rt 
 r266799 : Header 2009-01-22 19:14:25 +0100 hjs  r266753 : #i98365# remove
 unwanted file attributes from archives 2009-01-22 16:22:18 +0100 hjs  r266737
 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:54
 +0100 hjs  r266736 : #i98365# remove unwanted file attributes from archives
 2009-01-22 16:20:24 +0100 hjs  r266735 : #i98365# remove unwanted file
 attributes from archives 2009-01-22 16:08:33 +0100 hjs  r266734 : #i40246#
 renamed variable 2009-01-22 16:05:26 +0100 hjs  r266733 : #i40246# renamed
 variable 2009-01-20 17:46:54 +0100 hjs  r266610 : #i98290# cleanup 2009-01-19
 19:32:19 +0100 hjs  r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428
 (milestone: DEV300:m39) 2008-12-08 21:00:09 +0100 hjs  r265049 : CWS-TOOLING:
 rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37) 2008-11-27
 18:25:18 +0100 hjs  r264513 : #i40246# - support multiple patches per archive
 2008-11-17 19:00:12 +0100 hjs  r263738 : CWS-TOOLING: rebase CWS ause099 to
 trunk@263288 (milestone: DEV300:m35)

---
 hyphen/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 62f3b4f4a376..770f3d5e8592 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -44,7 +44,7 @@ TARFILE_NAME=hyphen-2.3.1
 
 ADDITIONAL_FILES += makefile.mk
 
-PATCH_FILE_NAME=hyphen-2.3.patch
+PATCH_FILES=hyphen-2.3.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
-- 
cgit 


From 414b6e019b959f64f637d9295edf971bff404054 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Wed, 4 Mar 2009 09:51:42 +0000
Subject: CWS-TOOLING: integrate CWS hunspell4thesaurus 2009-02-02 16:45:01
 +0100 hjs  r267278 : #i98415# - kick touch here - go for the root cause
 elsewhere 2009-02-02 12:09:15 +0100 hjs  r267257 : #i98415# - fix parameters
 of touch 2009-01-23 23:13:00 +0100 mba  r266855 : fixed warning 2009-01-23
 18:59:55 +0100 mba  r266848 : #i98415#: touch copied files 2009-01-21
 09:58:05 +0100 nemeth  r266633 : CWS-TOOLING: rebase CWS hunspell4thesaurus
 to trunk@266428 (milestone: DEV300:m39) 2009-01-21 09:04:48 +0100 nemeth 
 r266629 : Issue: #19563 Submitted by: nemeth Reviewed by: nemeth Patch:
 handle bad dictionary items for back compatibility (affix separator without
 affix flags) 2009-01-20 20:04:10 +0100 nemeth  r266622 : Issue: #19563
 Submitted by: nemeth Reviewed by:nemeth Add two small fixes for SF.net
 Hunspell Bug ID 2487684 2519814 2008-12-10 00:21:41 +0100 nemeth  r265141 :
 CWS-TOOLING: rebase CWS hunspell4thesaurus to trunk@264807 (milestone:
 DEV300:m37) 2008-12-09 16:12:56 +0100 nemeth  r265113 : #i19563#: fixed
 stemming, and #i90028#: fixed and improved hyphenation 2008-11-26 23:09:05
 +0100 nemeth  r264438 : #i90028#: CWS hunspell4thesaurus: Windows fixes of
 the Hunspell patch. 2008-11-26 22:51:03 +0100 nemeth  r264436 : CWS-TOOLING:
 rebase CWS hunspell4thesaurus to trunk@264325 (milestone: DEV300:m36)
 2008-11-22 09:02:20 +0100 nemeth  r264182 : CWS-TOOLING: rebase CWS
 hunspell4thesaurus to trunk@263288 (milestone: DEV300:m35) 2008-11-22
 08:23:10 +0100 nemeth  r264181 : CWS-TOOLING: rebase CWS hunspell4thesaurus
 to trunk@263288 (milestone: DEV300:m35) 2008-11-21 22:15:21 +0100 nemeth 
 r264176 : #i90028#: migrate CWS hunspell4thesaurus to SVN.

---
 hyphen/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 770f3d5e8592..6ba6f1064c5a 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.10 $
+# $Revision: 1.8.2.3 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,11 +40,11 @@ TARGET=hyphen
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hyphen-2.3.1
+TARFILE_NAME=hyphen-2.4
 
 ADDITIONAL_FILES += makefile.mk
 
-PATCH_FILES=hyphen-2.3.patch
+PATCH_FILES=hyphen-2.4.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
-- 
cgit 


From 408c5595e34788cbe1e4701c594acd13e77cc4a0 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 16 Sep 2009 14:49:32 +0000
Subject: CWS-TOOLING: integrate CWS cloph13 2009-09-01  #i104566# also use
 syslibroot/isysroot for external components 2009-08-28  #i104568# clean up
 duplicated definitions of OBJCXXFLAGS 2009-08-28  #i104567# add
 ccache-detection to configure (to skip to objcxx-flags) 2009-08-28  #i104566#
 use Mac OS X 10.4-SDK to ensure backwards compatibility use
 MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot
 /Developer/..." arguments for OOo's cpp

---
 hyphen/makefile.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 6ba6f1064c5a..ab1c4d7dfffa 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -63,7 +63,9 @@ LCL_CONFIGURE_CFLAGS+=-m64
 LCL_CONFIGURE_CFLAGS+=$(EXTRA_CFLAGS)
 CONFIGURE_FLAGS+=CXXFLAGS="$(EXTRA_CFLAGS)"
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(SYSBASE)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
 
 .IF "$(LCL_CONFIGURE_CFLAGS)"!=""
 CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
-- 
cgit 


From b29bb2dbee8137ef5ff240588cf2269edc9428fd Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Fri, 15 Jan 2010 14:55:12 +0100
Subject: ause110: #i106731# remove tarballs from scm and find them in download
 cache dir

---
 hyphen/makefile.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index ab1c4d7dfffa..6a29b60b14b0 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -41,6 +41,7 @@ TARGET=hyphen
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=hyphen-2.4
+TARFILE_MD5=d0b5af6e408b8d2958f3d83b5244f5e8
 
 ADDITIONAL_FILES += makefile.mk
 
-- 
cgit 


From aac3a82b827c04ce885e07e9fea8226aaf11b5c7 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 12 Feb 2010 15:01:35 +0100
Subject: changefileheader2: #i109125#: change source file copyright notice
 from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile,
 Revision)

---
 hyphen/makefile.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index ab1c4d7dfffa..dea814e50447 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8.2.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
-- 
cgit 


From 63bcbbb963042de300b6a0b9247b364e35242f84 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Wed, 3 Mar 2010 21:09:50 +0100
Subject: sb118: run make check for hyphen (as hunspell does already anyway)

---
 hyphen/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index dea814e50447..cd6e9afebe1d 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -73,7 +73,7 @@ BUILD_ACTION=make hyph_en_US.dic
 @all:
     echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make
+BUILD_ACTION=make && make check
 OUT2INC += hyphen.h 
 .ENDIF
 
-- 
cgit 


From 39565fee52df09b79977bb2c14e4bdc84b722d52 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Tue, 20 Jul 2010 12:46:55 +0200
Subject: #i107097# - pass MAXPROCESS to GNU make in external modules

---
 hyphen/makefile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index f1aa3806a17c..b733398c3c8d 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic
 @all:
     echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 OUT2INC += hyphen.h 
 .ENDIF
 
-- 
cgit 


From 6d45ebb928b2e8df70502ca5cede6695ccb5bcc1 Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" <tl@openoffice.org>
Date: Fri, 3 Dec 2010 09:55:02 +0100
Subject: cws tl84: #i109543# updating hyphen library to v2.7.1

---
 hyphen/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b733398c3c8d..b77343772e3a 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -36,12 +36,12 @@ TARGET=hyphen
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hyphen-2.4
-TARFILE_MD5=d0b5af6e408b8d2958f3d83b5244f5e8
+TARFILE_NAME=hyphen-2.7.1
+TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
 
 ADDITIONAL_FILES += makefile.mk
 
-PATCH_FILES=hyphen-2.4.patch
+PATCH_FILES=hyphen-2.7.1.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
-- 
cgit 


From 97286ac1ff22bfb7dca87d4f74a4f92c03e1d265 Mon Sep 17 00:00:00 2001
From: "Thomas Lange [tl]" <tl@openoffice.org>
Date: Tue, 18 Jan 2011 16:42:10 +0100
Subject: cws tl84: #i109543# patch to fix hyphenation for Linux

---
 hyphen/makefile.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index b77343772e3a..94c1592df21e 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -41,7 +41,9 @@ TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf
 
 ADDITIONAL_FILES += makefile.mk
 
-PATCH_FILES=hyphen-2.7.1.patch
+PATCH_FILES= \
+    hyphen-2.7.1.patch \
+    hyphen-2.7.1-read-charset.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
-- 
cgit 


From 4acf86448e93427822fb59b1fddf80709bc149c1 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Sat, 14 May 2011 01:47:28 +0300
Subject: Cross-compilation support and iOS in particular

---
 hyphen/makefile.mk | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 94c1592df21e..529020f94e67 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -51,7 +51,11 @@ CONFIGURE_DIR=$(BUILD_DIR)
 #relative to CONFIGURE_DIR
 # still needed also in system-hyphen case as it creates the makefile
 CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS=--disable-shared
+
+.IF "$(OS)"!="IOS"
+CONFIGURE_FLAGS+= --with-pic
+.ENDIF
 
 .IF "$(COM)"=="C52" && "$(CPU)"=="U"
 LCL_CONFIGURE_CFLAGS+=-m64
@@ -82,7 +86,6 @@ OUT2INC += hyphen.h
 
 .ENDIF # "$(GUI)"=="UNX"
 
-
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_ACTION=configure
@@ -101,6 +104,10 @@ BUILD_ACTION=dmake
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="OS2"
 
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
-- 
cgit 


From f05f8318294f07957863b166ca316b8df1bcbd4e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Sat, 21 May 2011 16:34:45 +0300
Subject: Drop OS2

---
 hyphen/makefile.mk | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 529020f94e67..d7169e4ee343 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -99,11 +99,6 @@ BUILD_ACTION=dmake
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="WNT"
 
-.IF "$(GUI)"=="OS2"
-BUILD_ACTION=dmake
-OUT2INC += hyphen.h
-.ENDIF # "$(GUI)"=="OS2"
-
 .IF "$(CROSS_COMPILING)"!=""
 CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
 .ENDIF
-- 
cgit 


From 47ef127cb4f217c00bd7b382008be6e7444af93e Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Mon, 6 Jun 2011 08:57:32 +0300
Subject: Always compare CROSS_COMPILING explicitly to "YES"

---
 hyphen/makefile.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'hyphen/makefile.mk')

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index d7169e4ee343..80f5bbd74cac 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -99,8 +99,8 @@ BUILD_ACTION=dmake
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="WNT"
 
-.IF "$(CROSS_COMPILING)"!=""
-CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
 # --- Targets ------------------------------------------------------
-- 
cgit