1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

- Update to 5.5.2.3

- Regenerate the patches
- Add LICENSE
- While here, fix shared lib installation

PR:		212394
Submitted by:	pfg
Approved by:	maintainer timeout (mayo@oyam.ca, 2 months)
This commit is contained in:
Dmitry Marakasov 2016-11-18 08:46:14 +00:00
parent 69a67c52eb
commit 1b3482df0c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=426312
4 changed files with 24 additions and 24 deletions

View File

@ -1,8 +1,8 @@
# Created by: Pedro F. Giffuni <giffunip@asme.org> # Created by: Pedro F. Giffuni
# $FreeBSD$ # $FreeBSD$
PORTNAME= lp_solve PORTNAME= lp_solve
PORTVERSION= 5.5.2.0 PORTVERSION= 5.5.2.3
CATEGORIES= math CATEGORIES= math
MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION} MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}_source DISTNAME= ${PORTNAME}_${PORTVERSION}_source
@ -10,13 +10,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_source
MAINTAINER= mayo@oyam.ca MAINTAINER= mayo@oyam.ca
COMMENT= Linear Programming Solver COMMENT= Linear Programming Solver
LICENSE= LGPL20
WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R} WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R}
USE_LDCONFIG= yes USE_LDCONFIG= yes
.if defined(TMPDIR) BUILDENV= ${SETENV} TMPDIR="${WRKDIR}"
BUILDENV= ${SETENV} TMPDIR="${TMPDIR}"
.endif
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -26,7 +26,7 @@ LPSOLVE_ARCH= ux32
LPSOLVE_ARCH= ux64 LPSOLVE_ARCH= ux64
.endif .endif
post-patch: pre-build:
@${FIND} ${WRKSRC} -name "ccc" | ${XARGS} ${REINPLACE_CMD} -e \ @${FIND} ${WRKSRC} -name "ccc" | ${XARGS} ${REINPLACE_CMD} -e \
"s|^c=.*$$|c='${CC}'|g ; \ "s|^c=.*$$|c='${CC}'|g ; \
s|^opts=.*$$|opts='${CFLAGS}'|g ; \ s|^opts=.*$$|opts='${CFLAGS}'|g ; \
@ -40,13 +40,12 @@ do-build:
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/bin/${LPSOLVE_ARCH}/lp_solve ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/bin/${LPSOLVE_ARCH}/lp_solve ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/lpsolve55/bin/${LPSOLVE_ARCH}/liblpsolve55.a ${STAGEDIR}${PREFIX}/lib
${INSTALL_LIB} ${WRKSRC}/lpsolve55/bin/${LPSOLVE_ARCH}/liblpsolve55.so ${STAGEDIR}${PREFIX}/lib
${LN} -sf liblpsolve55.so ${STAGEDIR}${PREFIX}/lib/liblpsolve55.so.1
@${MKDIR} ${STAGEDIR}${PREFIX}/include/lpsolve @${MKDIR} ${STAGEDIR}${PREFIX}/include/lpsolve
.for i in declare.h fortify.h ini.h lp_*.h lpkit.h lpsolve.h ufortify.h yacc_read.h .for i in declare.h fortify.h ini.h lp_*.h lpkit.h lpsolve.h ufortify.h yacc_read.h
${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/lpsolve ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/lpsolve
.endfor .endfor
.for i in liblpsolve55.a liblpsolve55.so
${INSTALL_DATA} ${WRKSRC}/lpsolve55/bin/${LPSOLVE_ARCH}/${i} ${STAGEDIR}${PREFIX}/lib
.endfor
${LN} -sf liblpsolve55.so ${STAGEDIR}${PREFIX}/lib/liblpsolve55.so.1
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

View File

@ -1,2 +1,3 @@
SHA256 (lp_solve_5.5.2.0_source.tar.gz) = 5827a30b143105283f398a09419ea608719a2d7699ecea165a66d521803bcc9c TIMESTAMP = 1473108105
SIZE (lp_solve_5.5.2.0_source.tar.gz) = 799623 SHA256 (lp_solve_5.5.2.3_source.tar.gz) = fb43ae8ad3bb4cee617863f7fc03b26ccc0ff7946a9cc4665cb9afa04c0a1cab
SIZE (lp_solve_5.5.2.3_source.tar.gz) = 812420

View File

@ -1,5 +1,5 @@
--- lp_solve/ccc.orig 2009-01-25 21:39:03.000000000 +0300 --- lp_solve/ccc.orig 2009-01-25 18:39:03 UTC
+++ lp_solve/ccc 2011-02-04 10:52:07.000000000 +0300 +++ lp_solve/ccc
@@ -2,31 +2,33 @@ @@ -2,31 +2,33 @@
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' 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
@ -48,8 +48,8 @@
opts='-O3' opts='-O3'
--- lpsolve55/ccc.bak 2009-03-25 03:27:18.000000000 +0300 --- lpsolve55/ccc.orig 2009-03-25 00:27:18 UTC
+++ lpsolve55/ccc 2011-02-04 11:00:40.000000000 +0300 +++ lpsolve55/ccc
@@ -2,29 +2,31 @@ @@ -2,29 +2,31 @@
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' 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

View File

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