From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 17 17:10:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9489D1065698 for ; Sun, 17 Aug 2008 17:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6D2B08FC29 for ; Sun, 17 Aug 2008 17:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7HHA3px095253 for ; Sun, 17 Aug 2008 17:10:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7HHA3m3095246; Sun, 17 Aug 2008 17:10:03 GMT (envelope-from gnats) Resent-Date: Sun, 17 Aug 2008 17:10:03 GMT Resent-Message-Id: <200808171710.m7HHA3m3095246@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 211E51065681 for ; Sun, 17 Aug 2008 17:01:14 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164]) by mx1.freebsd.org (Postfix) with ESMTP id BC2498FC1F for ; Sun, 17 Aug 2008 17:01:13 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from localhost.localdomain (U052219.ppp.dion.ne.jp [218.222.52.219]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id AE0D534034 for ; Mon, 18 Aug 2008 02:01:08 +0900 (JST) Message-Id: <20080818020020.f338f917.tkato432@yahoo.com> Date: Mon, 18 Aug 2008 02:00:20 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org X-Mailman-Approved-At: Sun, 17 Aug 2008 17:26:02 +0000 Cc: Subject: ports/126598: Update port: math/lp_solve to 5.5.0.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 17:10:03 -0000 >Number: 126598 >Category: ports >Synopsis: Update port: math/lp_solve to 5.5.0.13 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 17 17:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.0-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 5.5.0.13 Remove file: files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c files/patch-demo+ccc >How-To-Repeat: >Fix: diff -urN /usr/ports/math/lp_solve/Makefile math/lp_solve/Makefile --- /usr/ports/math/lp_solve/Makefile 2008-05-16 23:28:48.000000000 +0900 +++ math/lp_solve/Makefile 2008-08-14 17:42:17.000000000 +0900 @@ -6,29 +6,24 @@ # PORTNAME= lp_solve -PORTVERSION= ${PORTMAJOR_VER}.0.12 +PORTVERSION= 5.5.0.13 CATEGORIES= math -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= lpsolve +MASTER_SITES= SF/lpsolve DISTNAME= ${PORTNAME}_${PORTVERSION}_source MAINTAINER= ports@FreeBSD.org COMMENT= Linear Programming Solver -PORTMAJOR_VER= 5.5 -WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTMAJOR_VER} -USE_LDCONFIG= yes - -.include +WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R} -.if ${ARCH} == "sparc64" -PICFLAG?= -fPIC -.else -PICFLAG?= -fpic -.endif +USE_LDCONFIG= yes -pre-build: - @${REINPLACE_CMD} -e 's:%%CFLAGS%%:${CFLAGS}:g' -e 's:%%PICFLAG%%:${PICFLAG}:g' -e 's:%%CC%%:${CC}:g' ${WRKSRC}/lp_solve/ccc ${WRKSRC}/demo/ccc ${WRKSRC}/lpsolve55/ccc +post-patch: + @${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 ; ${SH} -x ccc @@ -37,20 +32,13 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/lp_solve ${PREFIX}/bin -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR} -.endif - ${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 + @${MKDIR} ${PREFIX}/include/lpsolve +.for i in lp_Hash.h lp_SOS.h lp_lib.h lp_matrix.h lp_mipbb.h lp_types.h lp_utils.h + ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include/lpsolve +.endfor +.for i in lpsolve55/liblpsolve55.a lpsolve55/liblpsolve55.so + ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib +.endfor + ${LN} -sf liblpsolve55.so ${PREFIX}/lib/liblpsolve55.so.1 -.include +.include diff -urN /usr/ports/math/lp_solve/distinfo math/lp_solve/distinfo --- /usr/ports/math/lp_solve/distinfo 2008-05-16 23:28:48.000000000 +0900 +++ math/lp_solve/distinfo 2008-08-14 16:53:08.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (lp_solve_5.5.0.12_source.tar.gz) = bfb8c27aacca34b2263d3f37b3ad51ab -SHA256 (lp_solve_5.5.0.12_source.tar.gz) = bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193 -SIZE (lp_solve_5.5.0.12_source.tar.gz) = 787446 +MD5 (lp_solve_5.5.0.13_source.tar.gz) = e8e71b1bf86267597d5776ab0f69721d +SHA256 (lp_solve_5.5.0.13_source.tar.gz) = 8714793ffc227c5d78b83acc8e409a68f6159d83bcf0af632a69887c97fe4155 +SIZE (lp_solve_5.5.0.13_source.tar.gz) = 793437 diff -urN /usr/ports/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c --- /usr/ports/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c 2006-09-02 21:12:44.000000000 +0900 +++ math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,26 +0,0 @@ ---- 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 - #else --# include -+#include - #endif - - #include -@@ -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 -urN /usr/ports/math/lp_solve/files/patch-demo+ccc math/lp_solve/files/patch-demo+ccc --- /usr/ports/math/lp_solve/files/patch-demo+ccc 2006-09-02 21:12:44.000000000 +0900 +++ math/lp_solve/files/patch-demo+ccc 1970-01-01 09:00:00.000000000 +0900 @@ -1,25 +0,0 @@ ---- demo/ccc.orig Fri Jun 24 03:52:04 2005 -+++ 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 - - def= --if [ "$PLATFORM" = "SCO_UNIX" ] --then def='-dy -K PIC -DNOLONGLONG' -- dl=-lc --else dl=-ldl --fi -+#if [ "$PLATFORM" = "SCO_UNIX" ] -+#then def='-dy -K PIC -DNOLONGLONG' -+# dl=-lc -+#else dl=-ldl -+#fi - --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 diff -urN /usr/ports/math/lp_solve/files/patch-lp_solve+ccc math/lp_solve/files/patch-lp_solve+ccc --- /usr/ports/math/lp_solve/files/patch-lp_solve+ccc 2006-09-02 21:12:44.000000000 +0900 +++ math/lp_solve/files/patch-lp_solve+ccc 1970-01-01 09:00:00.000000000 +0900 @@ -1,28 +0,0 @@ ---- 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%% - - math=-lm - --opts='-O3' -+opts='%%CFLAGS%%' - - def= --if [ "$PLATFORM" = "SCO_UNIX" ] --then opts='-O0' -- def='-dy -K PIC -DLLONG=long' -- dl=-ldl --else dl=-ldl --fi -+#if [ "$PLATFORM" = "SCO_UNIX" ] -+#then opts='-O0' -+# def='-dy -K PIC -DLLONG=long' -+# dl=-ldl -+#else dl=-ldl -+#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 diff -urN /usr/ports/math/lp_solve/files/patch-lpsolve55+ccc math/lp_solve/files/patch-lpsolve55+ccc --- /usr/ports/math/lp_solve/files/patch-lpsolve55+ccc 2006-10-10 13:45:52.000000000 +0900 +++ math/lp_solve/files/patch-lpsolve55+ccc 1970-01-01 09:00:00.000000000 +0900 @@ -1,39 +0,0 @@ ---- lpsolve55/ccc.orig Sun Jun 12 04:27:18 2005 -+++ lpsolve55/ccc Tue Oct 10 11:00:40 2006 -@@ -1,16 +1,16 @@ - 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%% - - def= - so= --if [ "$PLATFORM" = "SCO_UNIX" ] --then def='-dy -K PIC -DNOLONGLONG' -- dl=-lc --else dl=-ldl -- so=y --fi -- --opts='-O3' -+#if [ "$PLATFORM" = "SCO_UNIX" ] -+#then def='-dy -K PIC -DNOLONGLONG' -+# dl=-lc -+#else dl=-ldl -+# so=y -+#fi -+so=y -+opts='%%CFLAGS%%' - - $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src - ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -@@ -18,8 +18,8 @@ - - if [ "$so" != "" ] - then -- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl -+ $c %%PICFLAG%% -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -+ $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm - fi - - rm *.o 2>/dev/null diff -urN /usr/ports/math/lp_solve/pkg-plist math/lp_solve/pkg-plist --- /usr/ports/math/lp_solve/pkg-plist 2007-12-13 15:25:34.000000000 +0900 +++ math/lp_solve/pkg-plist 2008-08-14 17:42:35.000000000 +0900 @@ -6,9 +6,7 @@ include/lpsolve/lp_mipbb.h include/lpsolve/lp_utils.h include/lpsolve/lp_types.h -@dirrm include/lpsolve lib/liblpsolve55.a lib/liblpsolve55.so lib/liblpsolve55.so.1 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +@dirrm include/lpsolve >Release-Note: >Audit-Trail: >Unformatted: