summaryrefslogtreecommitdiff
path: root/misc/openoffice3/patches/patch-de
diff options
context:
space:
mode:
Diffstat (limited to 'misc/openoffice3/patches/patch-de')
-rw-r--r--misc/openoffice3/patches/patch-de29
1 files changed, 13 insertions, 16 deletions
diff --git a/misc/openoffice3/patches/patch-de b/misc/openoffice3/patches/patch-de
index f112e26a506..c007a59447a 100644
--- a/misc/openoffice3/patches/patch-de
+++ b/misc/openoffice3/patches/patch-de
@@ -1,14 +1,12 @@
-$NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $
+$NetBSD: patch-de,v 1.2 2009/05/09 18:43:41 hira Exp $
---- lpsolve/lp_solve_5.5.patch.orig 2008-06-16 23:19:46.000000000 +0900
-+++ lpsolve/lp_solve_5.5.patch 2008-06-27 18:23:09.000000000 +0900
-@@ -1,12 +1,33 @@
----- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005
--+++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008
+--- lpsolve/lp_solve_5.5.patch.orig 2009-05-09 15:08:35.000000000 +0900
++++ lpsolve/lp_solve_5.5.patch 2009-05-09 22:42:55.000000000 +0900
+@@ -1,12 +1,32 @@
+ --- misc/lp_solve_5.5/lpsolve55/ccc Sat Jun 11 21:27:18 2005
+ +++ misc/build/lp_solve_5.5/lpsolve55/ccc Wed May 21 17:19:56 2008
-@@ -1,5 +1,5 @@
-+--- misc/lp_solve_5.5/lpsolve55/ccc 2005-06-12 04:27:18.000000000 +0900
-++++ misc/build/lp_solve_5.5/lpsolve55/ccc 2008-06-27 18:21:52.000000000 +0900
-+@@ -1,12 +1,16 @@
++@@ -1,12 +1,15 @@
src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
-c=cc
+c=$CC
@@ -19,15 +17,14 @@ $NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $
+ then def='-dy -K PIC -DNOLONGLONG'
+ dl=-lc
+-else dl=-ldl
-++else
-++ if [ x"$OS" = x"NETBSD" -o x"$OS" = x"FREEBSD" ]
+++else if [ x"$OS" = x"NETBSD" -o x"$OS" = x"FREEBSD" ]
++ then dl=-lc
++ else dl=-ldl
++ fi
+ so=y
+ fi
+
-+@@ -19,7 +23,7 @@
++@@ -19,7 +22,7 @@
+ if [ "$so" != "" ]
+ then
+ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
@@ -36,10 +33,10 @@ $NetBSD: patch-de,v 1.1.1.1 2008/10/14 11:02:25 hira Exp $
+ fi
+
+ rm *.o 2>/dev/null
- --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005
- +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008
- @@ -3,6 +3,10 @@
-@@ -72,3 +93,53 @@
+ --- misc/lp_solve_5.5/lpsolve55/ccc.os2 2008-11-26 12:49:36.000000000 +0100
+ +++ misc/build/lp_solve_5.5/lpsolve55/ccc.os2 2008-09-25 17:27:48.000000000 +0200
+ @@ -1 +1,13 @@
+@@ -89,3 +109,53 @@
+fi
+
+rm *.o 2>/dev/null