* Install more header files.

* get rid of parts that link against libcompat
* bump PORTREVISION

6 files changed, 73 insertions, 12 deletions

diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index c2f45c9401a..eb20fb1f53b 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lp_solve
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_LOCAL} # http://groups.yahoo.com/group/lp_solve/
 MASTER_SITE_SUBDIR=	maho
@@ -33,6 +34,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
 	${MKDIR} ${PREFIX}/include/lpsolve
 	${INSTALL_DATA} ${WRKSRC}/lp_lib.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_types.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_utils.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_Hash.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_matrix.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_mipbb.h ${PREFIX}/include/lpsolve
+	${INSTALL_DATA} ${WRKSRC}/lp_SOS.h ${PREFIX}/include/lpsolve
 	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.so ${PREFIX}/lib
 	${LN} -sf ${PREFIX}/lib/liblpsolve55.so ${PREFIX}/lib/liblpsolve55.so.1
diff --git a/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c b/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c
new file mode 100644
index 00000000000..08f759b70b6
--- /dev/null
+++ b/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c
@@ -0,0 +1,26 @@
+--- bfp/bfp_LUSOL/LUSOL/commonlib.c.org	Sat Mar 18 07:14:02 2006
++++ bfp/bfp_LUSOL/LUSOL/commonlib.c	Sat Sep  2 20:53:52 2006
+@@ -4,7 +4,7 @@
+ #ifdef INTEGERTIME
+ # include <time.h>
+ #else
+-# include <sys/timeb.h>
++#include <sys/time.h>
+ #endif
+ 
+ #include <stdlib.h>
+@@ -673,10 +673,11 @@
+ #elif defined CLOCKTIME
+   return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
+ #else
+-  struct timeb buf;
++  struct timeval tv;
++  struct timezone tz;
+ 
+-  ftime(&buf);
+-  return((double)buf.time+((double) buf.millitm)/1000.0);
++  gettimeofday(&tv, &tz);
++  return((double)tv.tv_sec+((double)tv.tv_usec)/1000.0);
+ #endif
+ }
+ 
diff --git a/math/lp_solve/files/patch-demo+ccc b/math/lp_solve/files/patch-demo+ccc
index 9953b6a6810..b05bccf46a3 100644
--- a/math/lp_solve/files/patch-demo+ccc
+++ b/math/lp_solve/files/patch-demo+ccc
@@ -1,12 +1,11 @@
 --- demo/ccc.orig	Fri Jun 24 03:52:04 2005
-+++ demo/ccc	Sat Sep  2 16:31:30 2006
-@@ -1,15 +1,16 @@
++++ demo/ccc	Sat Sep  2 20:57:21 2006
+@@ -1,15 +1,15 @@
  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" ]
@@ -23,5 +22,4 @@
 -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
+ $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
diff --git a/math/lp_solve/files/patch-lp_solve+ccc b/math/lp_solve/files/patch-lp_solve+ccc
index 5ec78329e8a..9242a998138 100644
--- a/math/lp_solve/files/patch-lp_solve+ccc
+++ b/math/lp_solve/files/patch-lp_solve+ccc
@@ -1,6 +1,6 @@
---- 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 @@
+--- lp_solve/ccc.orig	Tue Nov 15 05:01:26 2005
++++ lp_solve/ccc	Sat Sep  2 20:56:44 2006
+@@ -1,17 +1,17 @@
  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%%
@@ -9,7 +9,6 @@
  
 -opts='-O3'
 +opts='%%CFLAGS%%'
-+libcompat=-lcompat
  
  def=
 -if [ "$PLATFORM" = "SCO_UNIX" ]
@@ -26,6 +25,4 @@
 +#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
-+
+ $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
diff --git a/math/lp_solve/files/patch-shared+commonlib.c b/math/lp_solve/files/patch-shared+commonlib.c
new file mode 100644
index 00000000000..978f0e153e7
--- /dev/null
+++ b/math/lp_solve/files/patch-shared+commonlib.c
@@ -0,0 +1,27 @@
+--- shared/commonlib.c.orig	Sat Mar 18 07:16:42 2006
++++ shared/commonlib.c	Sat Sep  2 21:01:39 2006
+@@ -4,7 +4,7 @@
+ #ifdef INTEGERTIME
+ # include <time.h>
+ #else
+-# include <sys/timeb.h>
++# include <sys/time.h>
+ #endif
+ 
+ #include <stdlib.h>
+@@ -673,10 +673,12 @@
+ #elif defined CLOCKTIME
+   return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
+ #else
+-  struct timeb buf;
++  struct timeval tv;
++  struct timezone tz;
++
++  gettimeofday(&tv, &tz);
++  return((double)tv.tv_sec+((double)tv.tv_usec)/1000.0);
+ 
+-  ftime(&buf);
+-  return((double)buf.time+((double) buf.millitm)/1000.0);
+ #endif
+ }
+ 
diff --git a/math/lp_solve/pkg-plist b/math/lp_solve/pkg-plist
index d0dd5b22ad8..fe0d0cf9fa7 100644
--- a/math/lp_solve/pkg-plist
+++ b/math/lp_solve/pkg-plist
@@ -1,5 +1,11 @@
 bin/lp_solve
+include/lpsolve/lp_Hash.h
+include/lpsolve/lp_SOS.h
 include/lpsolve/lp_lib.h
+include/lpsolve/lp_matrix.h
+include/lpsolve/lp_mipbb.h
+include/lpsolve/lp_utils.h
+include/lpsolve/lp_types.h
 lib/liblpsolve55.a
 lib/liblpsolve55.so
 lib/liblpsolve55.so.1