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

(-)math/lp_solve/Makefile (-31 / +19 lines)
Lines 6-34 Link Here
6
#
6
#
7
7
8
PORTNAME=	lp_solve
8
PORTNAME=	lp_solve
9
PORTVERSION=	${PORTMAJOR_VER}.0.12
9
PORTVERSION=	5.5.0.13
10
CATEGORIES=	math
10
CATEGORIES=	math
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	SF/lpsolve
12
MASTER_SITE_SUBDIR=	lpsolve
13
DISTNAME=	${PORTNAME}_${PORTVERSION}_source
12
DISTNAME=	${PORTNAME}_${PORTVERSION}_source
14
13
15
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Linear Programming Solver
15
COMMENT=	Linear Programming Solver
17
16
18
PORTMAJOR_VER=	5.5
17
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R}
19
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTMAJOR_VER}
20
USE_LDCONFIG=	yes
21
22
.include <bsd.port.pre.mk>
23
18
24
.if ${ARCH} == "sparc64"
19
USE_LDCONFIG=	yes
25
PICFLAG?=	-fPIC
26
.else
27
PICFLAG?=	-fpic
28
.endif
29
20
30
pre-build:
21
post-patch:
31
	@${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
22
	@${FIND} ${WRKSRC} -name "ccc" | ${XARGS} ${REINPLACE_CMD} -e \
23
		"s|^c=.*$$|c='${CC}'|g ; \
24
		 s|^opts=.*$$|opts='${CFLAGS}'|g ; \
25
		 s|-fpic|-fPIC|g ; \
26
		 s|-ldl||g"
32
27
33
do-build:
28
do-build:
34
	cd ${WRKSRC}/lp_solve  ; ${SH} -x ccc
29
	cd ${WRKSRC}/lp_solve  ; ${SH} -x ccc
Lines 37-56 Link Here
37
32
38
do-install:
33
do-install:
39
	${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/lp_solve ${PREFIX}/bin
34
	${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/lp_solve ${PREFIX}/bin
40
.if !defined(NOPORTEXAMPLES)
35
	@${MKDIR} ${PREFIX}/include/lpsolve
41
	${MKDIR} ${EXAMPLESDIR}
36
.for i in lp_Hash.h lp_SOS.h lp_lib.h lp_matrix.h lp_mipbb.h lp_types.h lp_utils.h 
42
	${INSTALL_PROGRAM} ${WRKSRC}/demo/demo ${EXAMPLESDIR}
37
	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include/lpsolve
43
.endif
38
.endfor
44
	${MKDIR} ${PREFIX}/include/lpsolve
39
.for i in lpsolve55/liblpsolve55.a lpsolve55/liblpsolve55.so
45
	${INSTALL_DATA} ${WRKSRC}/lp_lib.h ${PREFIX}/include/lpsolve
40
	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib
46
	${INSTALL_DATA} ${WRKSRC}/lp_types.h ${PREFIX}/include/lpsolve
41
.endfor
47
	${INSTALL_DATA} ${WRKSRC}/lp_utils.h ${PREFIX}/include/lpsolve
42
	${LN} -sf liblpsolve55.so ${PREFIX}/lib/liblpsolve55.so.1
48
	${INSTALL_DATA} ${WRKSRC}/lp_Hash.h ${PREFIX}/include/lpsolve
49
	${INSTALL_DATA} ${WRKSRC}/lp_matrix.h ${PREFIX}/include/lpsolve
50
	${INSTALL_DATA} ${WRKSRC}/lp_mipbb.h ${PREFIX}/include/lpsolve
51
	${INSTALL_DATA} ${WRKSRC}/lp_SOS.h ${PREFIX}/include/lpsolve
52
	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.a ${PREFIX}/lib
53
	${INSTALL_DATA} ${WRKSRC}/lpsolve55/liblpsolve55.so ${PREFIX}/lib
54
	${LN} -sf ${PREFIX}/lib/liblpsolve55.so ${PREFIX}/lib/liblpsolve55.so.1
55
43
56
.include <bsd.port.post.mk>
44
.include <bsd.port.mk>
(-)math/lp_solve/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (lp_solve_5.5.0.12_source.tar.gz) = bfb8c27aacca34b2263d3f37b3ad51ab
1
MD5 (lp_solve_5.5.0.13_source.tar.gz) = e8e71b1bf86267597d5776ab0f69721d
2
SHA256 (lp_solve_5.5.0.12_source.tar.gz) = bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
2
SHA256 (lp_solve_5.5.0.13_source.tar.gz) = 8714793ffc227c5d78b83acc8e409a68f6159d83bcf0af632a69887c97fe4155
3
SIZE (lp_solve_5.5.0.12_source.tar.gz) = 787446
3
SIZE (lp_solve_5.5.0.13_source.tar.gz) = 793437
(-)math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c (-26 lines)
Lines 1-26 Link Here
1
--- bfp/bfp_LUSOL/LUSOL/commonlib.c.org	Sat Mar 18 07:14:02 2006
2
+++ bfp/bfp_LUSOL/LUSOL/commonlib.c	Sat Sep  2 20:53:52 2006
3
@@ -4,7 +4,7 @@
4
 #ifdef INTEGERTIME
5
 # include <time.h>
6
 #else
7
-# include <sys/timeb.h>
8
+#include <sys/time.h>
9
 #endif
10
 
11
 #include <stdlib.h>
12
@@ -673,10 +673,11 @@
13
 #elif defined CLOCKTIME
14
   return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
15
 #else
16
-  struct timeb buf;
17
+  struct timeval tv;
18
+  struct timezone tz;
19
 
20
-  ftime(&buf);
21
-  return((double)buf.time+((double) buf.millitm)/1000.0);
22
+  gettimeofday(&tv, &tz);
23
+  return((double)tv.tv_sec+((double)tv.tv_usec)/1000.0);
24
 #endif
25
 }
26
 
(-)math/lp_solve/files/patch-demo+ccc (-25 lines)
Lines 1-25 Link Here
1
--- demo/ccc.orig	Fri Jun 24 03:52:04 2005
2
+++ demo/ccc	Sat Sep  2 20:57:21 2006
3
@@ -1,15 +1,15 @@
4
 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'
5
-c=cc
6
+c=%%CC%%
7
 
8
 math=-lm
9
 
10
 def=
11
-if [ "$PLATFORM" = "SCO_UNIX" ]
12
-then def='-dy -K PIC -DNOLONGLONG'
13
-     dl=-lc
14
-else dl=-ldl
15
-fi
16
+#if [ "$PLATFORM" = "SCO_UNIX" ]
17
+#then def='-dy -K PIC -DNOLONGLONG'
18
+#     dl=-lc
19
+#else dl=-ldl
20
+#fi
21
 
22
-opts='-O3'
23
+opts='%%CFLAGS%%'
24
 
25
 $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
(-)math/lp_solve/files/patch-lp_solve+ccc (-28 lines)
Lines 1-28 Link Here
1
--- lp_solve/ccc.orig	Tue Nov 15 05:01:26 2005
2
+++ lp_solve/ccc	Sat Sep  2 20:56:44 2006
3
@@ -1,17 +1,17 @@
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
6
+c=%%CC%%
7
 
8
 math=-lm
9
 
10
-opts='-O3'
11
+opts='%%CFLAGS%%'
12
 
13
 def=
14
-if [ "$PLATFORM" = "SCO_UNIX" ]
15
-then opts='-O0'
16
-     def='-dy -K PIC -DLLONG=long'
17
-     dl=-ldl
18
-else dl=-ldl
19
-fi
20
+#if [ "$PLATFORM" = "SCO_UNIX" ]
21
+#then opts='-O0'
22
+#     def='-dy -K PIC -DLLONG=long'
23
+#     dl=-ldl
24
+#else dl=-ldl
25
+#fi
26
 
27
 
28
 $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
(-)math/lp_solve/files/patch-lpsolve55+ccc (-39 lines)
Lines 1-39 Link Here
1
--- lpsolve55/ccc.orig	Sun Jun 12 04:27:18 2005
2
+++ lpsolve55/ccc	Tue Oct 10 11:00:40 2006
3
@@ -1,16 +1,16 @@
4
 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'
5
-c=cc
6
+c=%%CC%%
7
 
8
 def=
9
 so=
10
-if [ "$PLATFORM" = "SCO_UNIX" ]
11
-then def='-dy -K PIC -DNOLONGLONG'
12
-     dl=-lc
13
-else dl=-ldl
14
-     so=y
15
-fi
16
-
17
-opts='-O3'
18
+#if [ "$PLATFORM" = "SCO_UNIX" ]
19
+#then def='-dy -K PIC -DNOLONGLONG'
20
+#     dl=-lc
21
+#else dl=-ldl
22
+#     so=y
23
+#fi
24
+so=y
25
+opts='%%CFLAGS%%'
26
 
27
 $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
28
 ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
29
@@ -18,8 +18,8 @@
30
 
31
 if [ "$so" != "" ]
32
 then
33
-  $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
34
-  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
35
+  $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
36
+  $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm
37
 fi
38
 
39
 rm *.o 2>/dev/null
(-)math/lp_solve/pkg-plist (-3 / +1 lines)
Lines 6-14 Link Here
6
include/lpsolve/lp_mipbb.h
6
include/lpsolve/lp_mipbb.h
7
include/lpsolve/lp_utils.h
7
include/lpsolve/lp_utils.h
8
include/lpsolve/lp_types.h
8
include/lpsolve/lp_types.h
9
@dirrm include/lpsolve
10
lib/liblpsolve55.a
9
lib/liblpsolve55.a
11
lib/liblpsolve55.so
10
lib/liblpsolve55.so
12
lib/liblpsolve55.so.1
11
lib/liblpsolve55.so.1
13
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo
12
@dirrm include/lpsolve
14
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%

Return to bug 126598