diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile index 8e30f685b212..902f608fa846 100644 --- a/math/lp_solve/Makefile +++ b/math/lp_solve/Makefile @@ -1,50 +1,51 @@ PORTNAME= lp_solve -PORTVERSION= 5.5.2.5 +DISTVERSION= 5.5.2.5 +PORTREVISION= 1 CATEGORIES= math -MASTER_SITES= SF/lpsolve/lpsolve/${PORTVERSION} -DISTNAME= ${PORTNAME}_${PORTVERSION}_source +MASTER_SITES= SF/lpsolve/lpsolve/${DISTVERSION} +DISTNAME= ${PORTNAME}_${DISTVERSION}_source MAINTAINER= mayo@oyam.ca COMMENT= Linear Programming Solver WWW= http://tech.groups.yahoo.com/group/lp_solve/ LICENSE= LGPL21 WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R} USE_LDCONFIG= yes BUILDENV= ${SETENV} TMPDIR="${WRKDIR}" .include .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || \ ${ARCH} == powerpc || ${ARCH} == powerpcspe LPSOLVE_ARCH= ux32 .else LPSOLVE_ARCH= ux64 .endif pre-build: @${FIND} ${WRKSRC} -name "ccc" | ${XARGS} ${REINPLACE_CMD} -e \ "s|^c=.*$$|c='${CC}'|g ; \ s|^opts=.*$$|opts='${CFLAGS}'|g ; \ s|-fpic|-fPIC|g ; \ s|-ldl||g" do-build: cd ${WRKSRC}/lp_solve ; ${BUILDENV} ${SH} -x ccc cd ${WRKSRC}/demo ; ${BUILDENV} ${SH} -x ccc cd ${WRKSRC}/lpsolve55 ; ${BUILDENV} ${SH} -x ccc do-install: ${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 .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 .endfor .include diff --git a/math/lp_solve/files/patch-respect-TMPDIR b/math/lp_solve/files/patch-respect-TMPDIR index 870da18d87cd..244a48ef9680 100644 --- a/math/lp_solve/files/patch-respect-TMPDIR +++ b/math/lp_solve/files/patch-respect-TMPDIR @@ -1,98 +1,113 @@ --- lp_solve/ccc.orig 2009-01-25 18:39:03 UTC +++ lp_solve/ccc -@@ -2,31 +2,33 @@ +@@ -1,34 +1,35 @@ + : 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 ++opts='-O3' +tmp="${TMPDIR:-/tmp}" + #determine platform (32/64 bit) ->/tmp/platform.c -echo '#include '>>/tmp/platform.c -echo '#include '>>/tmp/platform.c -echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c -$c /tmp/platform.c -o /tmp/platform -PLATFORM=`/tmp/platform` -rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"${tmp}"/platform.c -+$c "${tmp}"/platform.c -o "${tmp}"/platform ++$c $opts "${tmp}"/platform.c -o "${tmp}"/platform +PLATFORM=`"${tmp}"/platform` +rm "${tmp}"/platform "${tmp}"/platform.c >/dev/null 2>&1 mkdir bin bin/$PLATFORM >/dev/null 2>&1 math=-lm #check if this system has the isnan function ->/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo 'main(){isnan(0);}'>>/tmp/isnan.c -$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 +>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo 'main(){isnan(0);}'>>"${tmp}"/isnan.c -+$c "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 ++$c $opts "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 if [ $? = 0 ] then NOISNAN= else NOISNAN=-DNOISNAN fi -rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1 +- +-opts='-O3' +rm "${tmp}"/isnan.c "${tmp}"/isnan >/dev/null 2>&1 - opts='-O3' - + def= + if [ "$PLATFORM" = "SCO_UNIX" ] --- lpsolve55/ccc.orig 2009-03-25 00:27:18 UTC +++ lpsolve55/ccc -@@ -2,29 +2,31 @@ +@@ -1,30 +1,33 @@ + : 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 ++opts='-O3' +tmp="${TMPDIR:-/tmp}" + #determine platform (32/64 bit) ->/tmp/platform.c -echo '#include '>>/tmp/platform.c -echo '#include '>>/tmp/platform.c -echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c -$c /tmp/platform.c -o /tmp/platform -PLATFORM=`/tmp/platform` -rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 +>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo '#include '>>"${tmp}"/platform.c +echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>"${tmp}"/platform.c -+$c "${tmp}"/platform.c -o "${tmp}"/platform ++$c $opts "${tmp}"/platform.c -o "${tmp}"/platform +PLATFORM=`"${tmp}"/platform` +rm "${tmp}"/platform "${tmp}"/platform.c >/dev/null 2>&1 mkdir bin bin/$PLATFORM >/dev/null 2>&1 #check if this system has the isnan function ->/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo '#include '>>/tmp/isnan.c -echo 'main(){isnan(0);}'>>/tmp/isnan.c -$c /tmp/isnan.c -o /tmp/isnan $math >/dev/null 2>&1 +>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo '#include '>>"${tmp}"/isnan.c +echo 'main(){isnan(0);}'>>"${tmp}"/isnan.c -+$c "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 ++$c $opts "${tmp}"/isnan.c -o "${tmp}"/isnan $math >/dev/null 2>&1 if [ $? = 0 ] then NOISNAN= else NOISNAN=-DNOISNAN fi -rm /tmp/isnan.c /tmp/isnan >/dev/null 2>&1 +rm "${tmp}"/isnan.c "${tmp}"/isnan >/dev/null 2>&1 def= so= +@@ -34,8 +37,6 @@ then def='-dy -K PIC -DNOLONGLONG' + else dl=-ldl + so=y + fi +- +-opts='-O3' + + $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src + ar rv bin/$PLATFORM/liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` diff --git a/math/lp_solve/files/patch-shared+commonlib.c b/math/lp_solve/files/patch-shared+commonlib.c index 7f6322a4ac33..2d21d13829e1 100644 --- a/math/lp_solve/files/patch-shared+commonlib.c +++ b/math/lp_solve/files/patch-shared+commonlib.c @@ -1,27 +1,27 @@ --- shared/commonlib.c.orig 2016-05-06 09:25:24 UTC +++ shared/commonlib.c @@ -6,7 +6,7 @@ #elif defined EnhTime # include #else -# include +# include #endif #include @@ -844,10 +844,12 @@ double timeNow(void) } return( timeBase + (double) now.QuadPart/(double) freq.QuadPart ); #else - struct timeb buf; + struct timeval tv; + struct timezone tz; -+ -+ gettimeofday(&tv, &tz); -+ return((double)tv.tv_sec+((double)tv.tv_usec)/1000000.0); - ftime(&buf); - return((double)buf.time+((double) buf.millitm)/1000.0); ++ gettimeofday(&tv, &tz); ++ return((double)tv.tv_sec+((double)tv.tv_usec)/1000000.0); ++ #endif }