Enough with that...

peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess

reverting the whole mess for now...
to be resubmited when a bit less borked...

This reverts commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a.
This reverts commit faef2e51d0c7b74334a11400b205daf382805780.
This reverts commit 057ce1fe2911f51be97199bf95e175db8aebfa42.
This reverts commit a7d34af344900233ba08aee2a56a3daf85ab2421.
This reverts commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad.
This reverts commit 433b43bcd2dbd146a9d6342fab0704d653c50d29.
This reverts commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8.

11 files changed, 180 insertions, 156 deletions

diff --git a/lpsolve/ExternalPackage_lpsolve.mk b/lpsolve/ExternalPackage_lpsolve.mk
deleted file mode 100644
index 7fcf0c233ec8..000000000000
--- a/lpsolve/ExternalPackage_lpsolve.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
-$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
-
-ifeq ($(GUI),WNT)
-ifeq ($(COM),GCC)
-ifneq ($(GUI_FOR_BUILD),WNT)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a))
-endif # $(GUI_FOR_BUILD)
-else # $(COM)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib))
-endif # $(COM)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,bin,lpsolve55/lpsolve55.dll))
-else # $(GUI)
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dylib))
-else # $(OS)
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
-else # DISABLE_DYNLOADING
-$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.so))
-endif # $(DISABLE_DYNLOADING)
-endif # $(OS)
-endif # $(GUI)
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
deleted file mode 100644
index 97f3428927e3..000000000000
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
-
-$(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve))
-
-$(eval $(call gb_ExternalProject_use_package,lpsolve,hunspell))
-
-$(eval $(call gb_ExternalProject_register_targets,lpsolve,\
-	build \
-))
-
-ifeq ($(GUI),WNT)
-ifeq ($(COM),GCC)
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& $(if $(filter WNT,$(GUI_FOR_BUILD)), \
-	$(if $(filter YES,$(MINGW_SHARED_GCCLIB)) lpsolve_LDFLAGS="-shared-libgcc") \
-	$(if $(filter YES,$(MINGW_SHARED_GXXLIB)) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
-	cmd /c cgcc.bat, sh ccc) \
-	&& touch $@
-else # $(COM)!=GCC
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& LIB="$(ILIB)" cmd /c cvc6.bat \
-	&& touch $@
-endif # $(COM)
-else # $(GUI)!=WNT
-$(call gb_ExternalProject_get_state_target,lpsolve,build):
-	cd $(EXTERNAL_WORKDIR)/lpsolve55 \
-	&& sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
-	$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
-	$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc,ccc))) \
-	&& touch $@
-endif # $(GUI)
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Makefile b/lpsolve/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/lpsolve/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/Module_lpsolve.mk b/lpsolve/Module_lpsolve.mk
deleted file mode 100644
index 420053467f6d..000000000000
--- a/lpsolve/Module_lpsolve.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,lpsolve))
-
-ifeq ($(SYSTEM_LPSOLVE),NO)
-ifneq ($(OS),IOS)
-$(eval $(call gb_Module_add_targets,lpsolve,\
-	UnpackedTarball_lpsolve \
-	ExternalPackage_lpsolve \
-	ExternalProject_lpsolve \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
deleted file mode 100644
index fc376b345b7d..000000000000
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,lpsolve))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,lpsolve,$(LPSOLVE_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
-
-ifeq ($(GUI_FOR_BUILD),WNT)
-
-$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve_5.5-windows.patch \
-))
-
-else
-
-$(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
-	lpsolve/lp_solve-aix.patch \
-	lpsolve/lp_solve-fixed-warn.patch \
-	lpsolve/lp_solve_5.5.patch \
-))
-
-$(eval $(call gb_UnpackedTarball_add_file,lpsolve,\
-	lpsolve/lpsolve55/ccc.static,lpsolve/ccc.static))
-
-endif
-# vim: set noet sw=4 ts=4:
-
-
diff --git a/lpsolve/ccc.static b/lpsolve/ccc.static
deleted file mode 100644
index 3f9bba8b670c..000000000000
--- a/lpsolve/ccc.static
+++ /dev/null
@@ -1,11 +0,0 @@
-+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'
-+obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
-+
-+opts='-O3'
-+
-+def=
-+
-+$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
-+ls -l
-+$AR -r liblpsolve55.a $obj
-+rm $obj
diff --git a/lpsolve/lp_solve_5.5-windows.patch b/lpsolve/lp_solve_5.5-windows.patch
index 28f7c71de5e0..1a76c32f4bbd 100644
--- a/lpsolve/lp_solve_5.5-windows.patch
+++ b/lpsolve/lp_solve_5.5-windows.patch
@@ -43,10 +43,9 @@
 @@ -14,15 +14,4 @@
  set c=cl
  
--rc lpsolve.rc
-+rc %SOLARINC% lpsolve.rc
+ rc lpsolve.rc
 -%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -o lpsolve55.dll
-+%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd %SOLARINC% /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
++%c% -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd /LD /MD /O1 /Zp8 /Gz -D_WINDLL -D_USRDLL -DWIN32 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine %src% lpsolve.res ..\lp_solve.def -Felpsolve55.dll
 -rem /link /LINK50COMPAT
 -
 -if exist a.obj del a.obj
diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index cea61168913d..8b5702be8cae 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -98,3 +98,53 @@
  fi
  
  rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.solaris.orig	Sun May 22 11:19:48 2011
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.solaris	Sun May 22 11:19:48 2011
+@@ -1 +1,31 @@
+-dummy
++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
++
++if [ "$CPU" = "U" -o "$CPU" = "X" ]
++then
++  extra_cflags=-m64
++  extra_linkflags=-m64
++fi
++
++def=
++so=
++if [ "$PLATFORM" = "SCO_UNIX" ]
++then def='-dy -K PIC -DNOLONGLONG'
++     dl=-lc
++else dl=-ldl
++     so=y
++fi
++
++opts='-xO3'
++
++$c $extra_cflags -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
++  $c $extra_cflags -K PIC -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
++  $c $extra_linkflags -G -Bsymbolic -h liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $SOLARLIB -lc -lm -ldl
++fi
++
++rm *.o 2>/dev/null
+--- misc/build/lp_solve_5.5/lpsolve55/ccc.static
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.static
+@@ -1,1 +1,11 @@
+-dummy
++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'
++obj=`echo $src|sed -e 's/\.c/.o/g' -e 's!\([^ ]*/\)*!!g'`
++
++opts='-O3'
++
++def=
++
++$CC -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine -c $src
++ls -l
++$AR -r liblpsolve55.a $obj
++rm $obj
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
new file mode 100644
index 000000000000..b2f12aabfdd5
--- /dev/null
+++ b/lpsolve/makefile.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# 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.
+#
+# 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).
+#
+# 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.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=lpsolve
+TARGET=lpsolve
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(OS)" != "IOS"
+
+TARFILE_NAME=lp_solve_5.5
+TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
+
+.IF "$(GUI_FOR_BUILD)"=="WNT"
+PATCH_FILES=lp_solve_5.5-windows.patch
+.ELSE
+PATCH_FILES=\
+    lp_solve_5.5.patch \
+    lp_solve-aix.patch \
+    lp_solve-fixed-warn.patch
+ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.static
+.ENDIF
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+CONFIGURE_FLAGS=
+
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
+CONFIGURE_FLAGS+=--enable-static --disable-shared
+.ENDIF
+
+BUILD_DIR=lpsolve55
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+lpsolve_LDFLAGS=-shared-libgcc
+.ENDIF
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
+.ENDIF
+.IF "$(GUI_FOR_BUILD)"=="WNT"
+BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) cmd /c cgcc.bat
+.ELSE
+BUILD_ACTION=sh ccc
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
+.ENDIF
+.ELSE
+BUILD_ACTION=cmd /c cvc6.bat
+OUT2LIB=$(BUILD_DIR)$/lpsolve55.lib
+.ENDIF
+OUT2BIN=$(BUILD_DIR)$/lpsolve55.dll
+.ELSE
+.IF "$(OS)"=="MACOSX"
+.EXPORT: EXTRA_CDEFS EXTRA_LINKFLAGS verbose
+BUILD_ACTION=sh ccc.osx
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
+.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
+BUILD_ACTION=sh ccc.static
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
+.ELSE
+.IF "$(COMNAME)"=="sunpro5"
+BUILD_ACTION=sh ccc.solaris
+.ELIF "$(OS)$(COM)"=="AIXGCC"
+BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh ccc.aix.gcc
+.ELSE
+BUILD_ACTION=sh ccc
+.ENDIF
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.so
+.ENDIF
+.ENDIF
+
+OUT2INC=lp_lib.h lp_types.h lp_utils.h lp_Hash.h lp_matrix.h lp_mipbb.h lp_SOS.h
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :	set_ext.mk
+
+.ENDIF
+
+.INCLUDE :	target.mk
+
+.IF "$(OS)" != "IOS"
+
+.INCLUDE :	tg_ext.mk
+
+.ENDIF
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index e69de29bb2d1..bf8d87c4eef0 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -0,0 +1,11 @@
+mkdir: %_DEST%\inc\lpsolve
+
+..\%__SRC%\inc\lp_*.h %_DEST%\inc\lpsolve\*
+..\%__SRC%\lib\liblpsolve55.so %_DEST%\lib\liblpsolve55.so
+..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
+..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
+..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a
+..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
+..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
+
diff --git a/lpsolve/prj/dmake b/lpsolve/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/lpsolve/prj/dmake