8 files changed, 118 insertions, 97 deletions

diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 57c8b7731e48..c124263f97a2 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -6,36 +6,33 @@
 #
 
 PORTNAME=	lp_solve
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	5.5
 CATEGORIES=	math
-MASTER_SITES=	ftp://ftp.es.ele.tue.nl/pub/lp_solve/old_versions_which_you_probably_dont_want/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_LOCAL} # http://groups.yahoo.com/group/lp_solve/
+MASTER_SITE_SUBDIR=	maho
+DISTNAME=	${PORTNAME}_${PORTVERSION}_source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linear Programming Solver
 
 USE_BISON=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-MAN1=		lp_solve.1
+pre-build:
+	@${REINPLACE_CMD} -e 's:%%CFLAGS%%:${CFLAGS}:g' -e 's:%%CC%%:${CC}:g' ${WRKSRC}/lp_solve/ccc ${WRKSRC}/demo/ccc ${WRKSRC}/lpsolve55/ccc
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%CC%%,${CC},g ; \
-	s,%%CFLAGS%%,${CFLAGS},g'  ${WRKSRC}/Makefile
+do-build:
+	cd ${WRKSRC}/lp_solve  ; ${SH} -x ccc
+	cd ${WRKSRC}/demo      ; ${SH} -x ccc
+	cd ${WRKSRC}/lpsolve55 ; ${SH} -x ccc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lp_solve ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/lp2mps ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/mps2lp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/lp_solve.1 ${PREFIX}/man/man1
-.ifndef NOPORTDOCS
-	${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/HARTMUT_DOCUMENTATION ${DOCSDIR}
-	${CP} ${WRKSRC}/MPS.description ${DOCSDIR}
-	${CP} ${WRKSRC}/*.pdf ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/lp_solve ${PREFIX}/bin
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/demo ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/lp_examples/* ${EXAMPLESDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
+	${MKDIR} ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_lib.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.so ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/math/lp_solve/distinfo b/math/lp_solve/distinfo
index 2031dfda4a63..ee83015d4422 100644
--- a/math/lp_solve/distinfo
+++ b/math/lp_solve/distinfo
@@ -1,3 +1,3 @@
-MD5 (lp_solve_4.0.tar.gz) = 58892f708d7f78664bce80c1ebc250f9
-SHA256 (lp_solve_4.0.tar.gz) = 02b4c0fca00d0cf2a9c27956ec8e5112679047fc9edab64ee34572419374bcf5
-SIZE (lp_solve_4.0.tar.gz) = 305823
+MD5 (lp_solve_5.5_source.tar.gz) = 49059c7590be526ae7e7cf4a255f53ef
+SHA256 (lp_solve_5.5_source.tar.gz) = 489c0001985470b865020088bbab69108174d20cd02740d53d40331d10e0da71
+SIZE (lp_solve_5.5_source.tar.gz) = 738681
diff --git a/math/lp_solve/files/patch-Makefile b/math/lp_solve/files/patch-Makefile
deleted file mode 100644
index 9031d6a50604..000000000000
--- a/math/lp_solve/files/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	Thu Jan  9 16:56:51 2003
-+++ Makefile	Wed Jul 23 10:11:37 2003
-@@ -1,4 +1,4 @@
--CC= gcc
-+CC= %%CC%%
- 
- #should be OK in most situations:
- #CFLAGS= -O
-@@ -9,7 +9,7 @@
- #CFLAGS= -g -Aa -D_POSIX_SOURCE -DCHECK +FP VZOUiD
- 
- # nice for gcc
--CFLAGS= -O3 -Wall -pedantic -ansi
-+CFLAGS= %%CFLAGS%% -DCHECK
- #CFLAGS= -g -Wall -pedantic -ansi
- 
- # Option -DCHECK checks for numerical problems during rounding of numbers.
-@@ -39,7 +39,7 @@
- #ANSI math lib
- #MATHLIB= -lM
- #non-ANSI math lib, should also work
--MATHLIB= -lm
-+MATHLIB= -lm -lcompat
- 
- LPKSRC.c= lpkit.c solve.c debug.c read.c readmps.c hash.c presolve.c
- LEXFILE.l= lex.l
diff --git a/math/lp_solve/files/patch-demo+ccc b/math/lp_solve/files/patch-demo+ccc
new file mode 100644
index 000000000000..9953b6a68108
--- /dev/null
+++ b/math/lp_solve/files/patch-demo+ccc
@@ -0,0 +1,27 @@
+--- demo/ccc.orig	Fri Jun 24 03:52:04 2005
++++ demo/ccc	Sat Sep  2 16:31:30 2006
+@@ -1,15 +1,16 @@
+ src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.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%%
+ 
+ math=-lm
++libcompat=-lcompat
+ 
+ def=
+-if [ "$PLATFORM" = "SCO_UNIX" ]
+-then def='-dy -K PIC -DNOLONGLONG'
+-     dl=-lc
+-else dl=-ldl
+-fi
++#if [ "$PLATFORM" = "SCO_UNIX" ]
++#then def='-dy -K PIC -DNOLONGLONG'
++#     dl=-lc
++#else dl=-ldl
++#fi
+ 
+-opts='-O3'
++opts='%%CFLAGS%%'
+ 
+-$c -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 demo.c $src -o demo $math $dl
++$c -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 demo.c $src -o demo $math $dl $libcompat
diff --git a/math/lp_solve/files/patch-lp_solve+ccc b/math/lp_solve/files/patch-lp_solve+ccc
new file mode 100644
index 000000000000..5ec78329e8a0
--- /dev/null
+++ b/math/lp_solve/files/patch-lp_solve+ccc
@@ -0,0 +1,31 @@
+--- lp_solve/ccc.org	Sat Sep  2 16:09:53 2006
++++ lp_solve/ccc	Sat Sep  2 16:10:37 2006
+@@ -1,17 +1,19 @@
+ src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.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_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
+-c=cc
++c=%%CC%%
+ 
+ math=-lm
+ 
+-opts='-O3'
++opts='%%CFLAGS%%'
++libcompat=-lcompat
+ 
+ def=
+-if [ "$PLATFORM" = "SCO_UNIX" ]
+-then opts='-O0'
+-     def='-dy -K PIC -DLLONG=long'
+-     dl=-ldl
+-else dl=-ldl
+-fi
++#if [ "$PLATFORM" = "SCO_UNIX" ]
++#then opts='-O0'
++#     def='-dy -K PIC -DLLONG=long'
++#     dl=-ldl
++#else dl=-ldl
++#fi
+ 
+ 
+-$c -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 $src -o lp_solve $math $dl
++$c -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 $src -o lp_solve $math $dl $libcompat
++
diff --git a/math/lp_solve/files/patch-lpkit.h b/math/lp_solve/files/patch-lpkit.h
deleted file mode 100644
index c3f1673e9b70..000000000000
--- a/math/lp_solve/files/patch-lpkit.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lpkit.h.orig	Sat Jun  7 14:25:47 2003
-+++ lpkit.h	Sat Jun  7 14:30:27 2003
-@@ -260,6 +260,7 @@
- #define MAX_WARN_COUNT 20
- 
- #ifdef CHECK
-+extern int	Warn_count;
- #define my_round(val, eps) { \
-     REAL absv; \
-         absv = ((val) < 0 ? -(val) : (val)); \
diff --git a/math/lp_solve/files/patch-lpsolve55+ccc b/math/lp_solve/files/patch-lpsolve55+ccc
new file mode 100644
index 000000000000..b692a898c702
--- /dev/null
+++ b/math/lp_solve/files/patch-lpsolve55+ccc
@@ -0,0 +1,37 @@
+--- lpsolve55/ccc.orig	Sun Jun 12 04:27:18 2005
++++ lpsolve55/ccc	Sat Sep  2 16:23:56 2006
+@@ -1,16 +1,16 @@
+ 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%%
+ 
+ def=
+ so=
+-if [ "$PLATFORM" = "SCO_UNIX" ]
+-then def='-dy -K PIC -DNOLONGLONG'
+-     dl=-lc
+-else dl=-ldl
+-     so=y
+-fi
+-
+-opts='-O3'
++#if [ "$PLATFORM" = "SCO_UNIX" ]
++#then def='-dy -K PIC -DNOLONGLONG'
++#     dl=-lc
++#else dl=-ldl
++#     so=y
++#fi
++so=y
++opts='%%CFLAGS%%'
+ 
+ $c -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'`
+@@ -19,7 +19,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
+-  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
+ fi
+ 
+ rm *.o 2>/dev/null
diff --git a/math/lp_solve/pkg-plist b/math/lp_solve/pkg-plist
index 779a60709fd8..ca721bf8be8f 100644
--- a/math/lp_solve/pkg-plist
+++ b/math/lp_solve/pkg-plist
@@ -1,41 +1,6 @@
-bin/lp2mps
 bin/lp_solve
-bin/mps2lp
-%%PORTDOCS%%%%DOCSDIR%%/HARTMUT_DOCUMENTATION
-%%PORTDOCS%%%%DOCSDIR%%/MPS.description
-%%PORTDOCS%%%%DOCSDIR%%/SOSInterpolation.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+include/lpsolve/lp_lib.h
+lib/liblpsolve55.a
+lib/liblpsolve55.so
 %%PORTDOCS%%%%EXAMPLESDIR%%/demo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo_lag.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/demo_lag.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1sc.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1sc.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex1sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2sc.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2sc.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex3.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex3.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex3sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex3sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex4.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex4.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex4sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex4sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex5sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex6.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex6.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex6sos.mps
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex6sos.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7.lp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex7.out
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%