7 files changed, 24 insertions, 156 deletions

diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index a0810396c828..ba1807a3b937 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -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 <bsd.port.pre.mk>
+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-build:
 
 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
-
-.include <bsd.port.post.mk>
+	@${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 <bsd.port.mk>
diff --git a/math/lp_solve/distinfo b/math/lp_solve/distinfo
index 200ce3e469a0..cd67448a59fb 100644
--- a/math/lp_solve/distinfo
+++ b/math/lp_solve/distinfo
@@ -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 --git a/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c b/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c
deleted file mode 100644
index 08f759b70b61..000000000000
--- a/math/lp_solve/files/patch-bfp+bfp_LUSOL+LUSOL+commonlib.c
+++ /dev/null
@@ -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 <time.h>
- #else
--# include <sys/timeb.h>
-+#include <sys/time.h>
- #endif
- 
- #include <stdlib.h>
-@@ -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 --git a/math/lp_solve/files/patch-demo+ccc b/math/lp_solve/files/patch-demo+ccc
deleted file mode 100644
index b05bccf46a3b..000000000000
--- a/math/lp_solve/files/patch-demo+ccc
+++ /dev/null
@@ -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 --git a/math/lp_solve/files/patch-lp_solve+ccc b/math/lp_solve/files/patch-lp_solve+ccc
deleted file mode 100644
index 9242a998138e..000000000000
--- a/math/lp_solve/files/patch-lp_solve+ccc
+++ /dev/null
@@ -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 --git a/math/lp_solve/files/patch-lpsolve55+ccc b/math/lp_solve/files/patch-lpsolve55+ccc
deleted file mode 100644
index 825bd6a48339..000000000000
--- a/math/lp_solve/files/patch-lpsolve55+ccc
+++ /dev/null
@@ -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 --git a/math/lp_solve/pkg-plist b/math/lp_solve/pkg-plist
index 3b9a766ea2c0..244ba6f953fc 100644
--- a/math/lp_solve/pkg-plist
+++ b/math/lp_solve/pkg-plist
@@ -6,9 +6,7 @@ include/lpsolve/lp_matrix.h
 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