Forgot to add a patch for lpsolve.

4 files changed, 272 insertions, 0 deletions

diff --git a/editors/openoffice-3-devel/files/patch-i85972 b/editors/openoffice-3-devel/files/patch-i85972
new file mode 100644
index 000000000000..6b47bcd9a479
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! 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'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -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
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -lcompat
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+ 
diff --git a/editors/openoffice.org-2-devel/files/patch-i85972 b/editors/openoffice.org-2-devel/files/patch-i85972
new file mode 100644
index 000000000000..6b47bcd9a479
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! 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'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -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
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -lcompat
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+ 
diff --git a/editors/openoffice.org-3-devel/files/patch-i85972 b/editors/openoffice.org-3-devel/files/patch-i85972
new file mode 100644
index 000000000000..6b47bcd9a479
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! 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'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -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
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -lcompat
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+ 
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i85972 b/editors/openoffice.org-vcltesttool/files/patch-i85972
new file mode 100644
index 000000000000..6b47bcd9a479
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i85972
@@ -0,0 +1,68 @@
+Index: lpsolve/lp_solve_5.5.patch
+===================================================================
+RCS file: /cvs/external/lpsolve/lp_solve_5.5.patch,v
+retrieving revision 1.2
+diff -u -r1.2 lp_solve_5.5.patch
+--- lpsolve/lp_solve_5.5.patch	20 Dec 2007 15:58:45 -0000	1.2
++++ lpsolve/lp_solve_5.5.patch	9 Feb 2008 07:19:59 -0000
+@@ -29,3 +29,27 @@
+ ! fi
+ ! 
+ ! rm *.o 2>/dev/null
++*** misc/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:38:12 2007
++--- misc/build/lp_solve_5.5/lpsolve55/ccc.freebsd	Fri Nov 23 21:58:29 2007
++***************
++*** 1 ****
++! dummy
++--- 1,18 ----
++! 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'
++! 
++! def=
++! so=yes
++! 
++! opts='-O3'
++!
++! $CC -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++! ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++! ranlib liblpsolve55.a
++! 
++! if [ "$so" != "" ]
++! then
++!   $CC -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
++!   $CC -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -lcompat
++! fi
++! 
++! rm *.o 2>/dev/null
+Index: lpsolve/makefile.mk
+===================================================================
+RCS file: /cvs/external/lpsolve/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- lpsolve/makefile.mk	21 Dec 2007 09:32:37 -0000	1.3
++++ lpsolve/makefile.mk	9 Feb 2008 07:20:00 -0000
+@@ -50,7 +50,7 @@
+ PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+ .ELSE
+ PATCH_FILE_NAME=lp_solve_5.5.patch
+-ADDITIONAL_FILES=lpsolve55$/ccc.solaris
++ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.freebsd
+ .ENDIF
+ 
+ CONFIGURE_DIR=
+@@ -70,11 +70,16 @@
+ .IF "$(COMNAME)"=="sunpro5"
+ BUILD_ACTION=sh ccc.solaris
+ .ELSE
++.IF "$(OS)"=="FREEBSD"
++BUILD_ACTION=sh ccc.freebsd
++OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
++.ELSE
+ BUILD_ACTION=sh ccc
+ .ENDIF
+ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+ .ENDIF
+ .ENDIF
++.ENDIF
+ 
+ OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+