svn commit: r331500 - in head/math/scilab: . files

[Max Brazhnikov]

Author: makc
Date: Thu Oct 24 16:44:52 2013
New Revision: 331500
URL: http://svnweb.freebsd.org/changeset/ports/331500

Log:
  - Fix build with UMFPACK [1]
  - Update patch to really fix configure after hdf5-18 update [2]
  
  PR:		ports/177364 [1]
  Submitted by:	truckman [1]
  Submitted by:	Mamoru Iwaki <1wkmmr at gmail.com> via ports maillist [2]

Modified:
  head/math/scilab/Makefile
  head/math/scilab/files/patch-configure

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Thu Oct 24 16:41:28 2013	(r331499)
+++ head/math/scilab/Makefile	Thu Oct 24 16:44:52 2013	(r331500)
@@ -201,7 +201,7 @@ post-extract:
 post-patch:
 	@# Configure fixes
 	@${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lamd -lcholmod -lcolamd $$LAPACK_LIBS $$BLAS_LIBS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lumfpack|-lumfpack -lsuitesparseconfig -lamd -lcholmod -lcolamd $$LAPACK_LIBS $$BLAS_LIBS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|TCLTK_LIBS=" -ldl"|TCLTK_LIBS=" "|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"x=" ==|"x" =|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|"x" ==|"x" =|g' ${WRKSRC}/configure

Modified: head/math/scilab/files/patch-configure
==============================================================================
--- head/math/scilab/files/patch-configure	Thu Oct 24 16:41:28 2013	(r331499)
+++ head/math/scilab/files/patch-configure	Thu Oct 24 16:44:52 2013	(r331500)
@@ -1,5 +1,23 @@
 --- ./configure.orig	2011-07-20 08:15:42.000000000 +0000
 +++ ./configure	2013-10-23 11:59:48.722499060 +0000
+@@ -12226,14 +12226,15 @@
+ 
+ public class conftest {
+     public static void main(String[] argv) {
+-        String minVersion="1.8.4";
++        int minVersion=10804;
+                             int[] vers = new int[3];
+                 try { H5.H5get_libversion(vers); }
+                 catch (Throwable ex) {System.exit(-1);}
+                 String ver = vers[0] + "."+ vers[1] +"."+vers[2];
++                int Version = 10000*vers[0] + 100*vers[1] + vers[2];
+ 
+                             System.out.println(ver);
+-                                  if (minVersion.compareTo(ver) > 0) {
++                                  if (minVersion > Version) {
+                                    System.exit(-1);
+                                 }
+ 
 @@ -12281,14 +12281,15 @@
  
  public class conftest {