Attachment #174395 for bug #212394

View | Details | Raw Unified | Return to bug 212394
Collapse All | Expand All

Lines 1-8 Link Here

(-)math/lp_solve/Makefile (-3 / +5 lines)
1	# Created by: Pedro F. Giffuni <giffunip@asme.org>	1	# Created by: Pedro F. Giffuni
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= lp_solve	4	PORTNAME= lp_solve
5	PORTVERSION= 5.5.2.0	5	PORTVERSION= 5.5.2.3
6	CATEGORIES= math	6	CATEGORIES= math
7	MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION}	7	MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION}
8	DISTNAME= ${PORTNAME}_${PORTVERSION}_source	8	DISTNAME= ${PORTNAME}_${PORTVERSION}_source
Lines 10-15 Link Here
10	MAINTAINER= mayo@oyam.ca	10	MAINTAINER= mayo@oyam.ca
11	COMMENT= Linear Programming Solver	11	COMMENT= Linear Programming Solver
12		12
		13	LICENSE= LGPL20
		14
13	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R}	15	WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R}
14		16
15	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
Lines 26-32 Link Here
26	LPSOLVE_ARCH= ux64	28	LPSOLVE_ARCH= ux64
27	.endif	29	.endif
28		30
29	post-patch:	31	pre-build:
30	@${FIND} ${WRKSRC} -name "ccc" \| ${XARGS} ${REINPLACE_CMD} -e \	32	@${FIND} ${WRKSRC} -name "ccc" \| ${XARGS} ${REINPLACE_CMD} -e \
31	"s\|^c=.*$$\|c='${CC}'\|g ; \	33	"s\|^c=.*$$\|c='${CC}'\|g ; \
32	s\|^opts=.*$$\|opts='${CFLAGS}'\|g ; \	34	s\|^opts=.*$$\|opts='${CFLAGS}'\|g ; \

Lines 1-2 Link Here

(-)math/lp_solve/distinfo (-2 / +3 lines)
1	SHA256 (lp_solve_5.5.2.0_source.tar.gz) = 5827a30b143105283f398a09419ea608719a2d7699ecea165a66d521803bcc9c	1	TIMESTAMP = 1473108105
2	SIZE (lp_solve_5.5.2.0_source.tar.gz) = 799623	2	SHA256 (lp_solve_5.5.2.3_source.tar.gz) = fb43ae8ad3bb4cee617863f7fc03b26ccc0ff7946a9cc4665cb9afa04c0a1cab
		3	SIZE (lp_solve_5.5.2.3_source.tar.gz) = 812420

Lines 1-5 Link Here

(-)math/lp_solve/files/patch-respect-TMPDIR (-4 / +4 lines)
1	--- lp_solve/ccc.orig 2009-01-25 21:39:03.000000000 +0300	1	--- lp_solve/ccc.orig 2009-01-25 18:39:03 UTC
2	+++ lp_solve/ccc 2011-02-04 10:52:07.000000000 +0300	2	+++ lp_solve/ccc
3	@@ -2,31 +2,33 @@	3	@@ -2,31 +2,33 @@
4	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'	4	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'
5	c=cc	5	c=cc
Lines 48-55 Link Here
48		48
49	opts='-O3'	49	opts='-O3'
50		50
51	--- lpsolve55/ccc.bak 2009-03-25 03:27:18.000000000 +0300	51	--- lpsolve55/ccc.orig 2009-03-25 00:27:18 UTC
52	+++ lpsolve55/ccc 2011-02-04 11:00:40.000000000 +0300	52	+++ lpsolve55/ccc
53	@@ -2,29 +2,31 @@	53	@@ -2,29 +2,31 @@
54	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'	54	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'
55	c=cc	55	c=cc




--- shared/commonlib.c.orig	2016-05-06 09:25:24 UTC
+++ shared/commonlib.c
@@ -6,7 +6,7 @@
 #elif defined EnhTime
 # include <windows.h>
 #else
-# include <sys/timeb.h>
+# include <sys/time.h>

 #endif
 
 #include <stdlib.h>
@@ -844,10 +844,12 @@ double timeNow(void)
   }
   return( timeBase + (double) now.QuadPart/(double) freq.QuadPart );
 #else
-  struct timeb buf;
+  struct timeval tv;

Return to bug 212394

Lines 1-8 Link Here

(-)math/lp_solve/files/patch-shared+commonlib.c (-8 / +8 lines)
1	--- shared/commonlib.c.orig Sat Mar 18 07:16:42 2006	1	--- shared/commonlib.c.orig 2016-05-06 09:25:24 UTC
2	+++ shared/commonlib.c Sat Sep 2 21:01:39 2006	2	+++ shared/commonlib.c
3	@@ -4,7 +4,7 @@	3	@@ -6,7 +6,7 @@
4	#ifdef INTEGERTIME	4	#elif defined EnhTime
5	# include <time.h>	5	# include <windows.h>
6	#else	6	#else
7	-# include <sys/timeb.h>	7	-# include <sys/timeb.h>
8	+# include <sys/time.h>	8	+# include <sys/time.h>
Lines 9-17 Link Here
9	#endif	9	#endif
10		10
11	#include <stdlib.h>	11	#include <stdlib.h>
12	@@ -673,10 +673,12 @@	12	@@ -844,10 +844,12 @@ double timeNow(void)
13	#elif defined CLOCKTIME	13	}
14	return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);	14	return( timeBase + (double) now.QuadPart/(double) freq.QuadPart );
15	#else	15	#else
16	- struct timeb buf;	16	- struct timeb buf;
17	+ struct timeval tv;	17	+ struct timeval tv;