Fix build on platforms that actually need -ldl. Improve the ftime

removal.

6 files changed, 34 insertions, 12 deletions

diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 61e247bd0fe..47825c9fc47 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/11/08 15:08:00 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2015/12/07 17:40:27 joerg Exp $
 #
 
 DISTNAME=	lp_solve_5.5.2.0_source
@@ -35,6 +35,8 @@ LPSOLVE_ARCH=	ux32
 
 INSTALLATION_DIRS=	bin include/lpsolve lib
 
+MAKE_ENV+=	DL_LDADD=${BUILDLINK_LDADD.dl:Q}
+
 do-build:
 .for dir in lp_solve lpsolve55 demo
 	${RUN}${_ULIMIT_CMD}				\
diff --git a/math/lp_solve/distinfo b/math/lp_solve/distinfo
index 1e160fdfa37..0b4f4eac775 100644
--- a/math/lp_solve/distinfo
+++ b/math/lp_solve/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2014/05/12 11:41:46 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2015/12/07 17:40:27 joerg Exp $
 
 SHA1 (lp_solve_5.5.2.0_source.tar.gz) = e2830053cf079839b9ce21662cbc886ac6d31c80
 RMD160 (lp_solve_5.5.2.0_source.tar.gz) = 23a69c71062747ddf4cbc57120cd7db5f9378ac2
 Size (lp_solve_5.5.2.0_source.tar.gz) = 799623 bytes
-SHA1 (patch-aa) = 17fbc9c80e5a8c34064d426adf2fdae2ce4a7db1
-SHA1 (patch-lp__utils.c) = c0ec019feeac7016f83c63454fa92b137f30675c
+SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b
+SHA1 (patch-demo_ccc) = 6262975fdcc61e94390060425a79e8bbc5f4554b
+SHA1 (patch-lp__solve_ccc) = b70bbaedc56c04e3d2dad14050c0278142f382bd
+SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34
diff --git a/math/lp_solve/patches/patch-aa b/math/lp_solve/patches/patch-aa
index 14727af88b2..e4dafe8d214 100644
--- a/math/lp_solve/patches/patch-aa
+++ b/math/lp_solve/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/10/16 15:35:08 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2015/12/07 17:40:27 joerg Exp $
 
 ftime() is deprecated, use gettimeofday() instead.
 
@@ -23,7 +23,7 @@ ftime() is deprecated, use gettimeofday() instead.
 -  ftime(&buf);
 -  return((double)buf.time+((double) buf.millitm)/1000.0);
 +  gettimeofday(&buf, NULL);
-+  return((double)buf.tv_sec+((double) buf.tv_usec)/1000000.0);
++  return(buf.tv_sec + buf.tv_usec * 0.000001);
  #endif
  }
  
diff --git a/math/lp_solve/patches/patch-demo_ccc b/math/lp_solve/patches/patch-demo_ccc
new file mode 100644
index 00000000000..c4f13bfb90a
--- /dev/null
+++ b/math/lp_solve/patches/patch-demo_ccc
@@ -0,0 +1,10 @@
+$NetBSD: patch-demo_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $
+
+--- demo/ccc.orig	2015-12-07 17:17:03.273655855 +0000
++++ demo/ccc
+@@ -12,4 +12,4 @@ fi
+ 
+ opts='-O3'
+ 
+-$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_LDADD
diff --git a/math/lp_solve/patches/patch-lp__solve_ccc b/math/lp_solve/patches/patch-lp__solve_ccc
new file mode 100644
index 00000000000..1bc64ad6e99
--- /dev/null
+++ b/math/lp_solve/patches/patch-lp__solve_ccc
@@ -0,0 +1,10 @@
+$NetBSD: patch-lp__solve_ccc,v 1.1 2015/12/07 17:40:27 joerg Exp $
+
+--- lp_solve/ccc.orig	2015-12-07 17:17:20.529655116 +0000
++++ lp_solve/ccc
+@@ -38,4 +38,4 @@ then opts='-O0'
+ else dl=-ldl
+ fi
+ 
+-$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $dl
++$c -I.. -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I../shared $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -o bin/$PLATFORM/lp_solve $math $DL_LDADD
diff --git a/math/lp_solve/patches/patch-lp__utils.c b/math/lp_solve/patches/patch-lp__utils.c
index abbf14ee9c9..58ef5c8b8aa 100644
--- a/math/lp_solve/patches/patch-lp__utils.c
+++ b/math/lp_solve/patches/patch-lp__utils.c
@@ -1,16 +1,14 @@
-$NetBSD: patch-lp__utils.c,v 1.1 2014/05/12 11:41:46 ryoon Exp $
+$NetBSD: patch-lp__utils.c,v 1.2 2015/12/07 17:40:27 joerg Exp $
 
-OpenBSD 5.5 has no sys/timeb.h.
+Don't use obsolete headers.
 
 --- lp_utils.c.orig	2009-08-27 19:52:00.000000000 +0000
 +++ lp_utils.c
-@@ -5,7 +5,9 @@
+@@ -5,7 +5,6 @@
  #include "lp_lib.h"
  #include "lp_utils.h"
  #include <time.h>
-+#if !defined(__OpenBSD__)
- #include <sys/timeb.h>
-+#endif
+-#include <sys/timeb.h>
  #include "lp_bit.h"
  
  #ifdef FORTIFY