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

[Max Brazhnikov]

Author: makc
Date: Thu Jul 10 10:08:10 2014
New Revision: 361436
URL: http://svnweb.freebsd.org/changeset/ports/361436
QAT: https://qat.redports.org/buildarchive/r361436/

Log:
  math/scilab:
  - Fix build after recent switch to OpenJDK 1.7 [1]
  - Remove HOME from MAKE_ENV, it's now set in bsd.port.mk
  
  PR:		191523
  Submitted by:	kenji at k2r.org

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

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Thu Jul 10 10:06:57 2014	(r361435)
+++ head/math/scilab/Makefile	Thu Jul 10 10:08:10 2014	(r361436)
@@ -31,8 +31,8 @@ CONFIGURE_ARGS=	--with-gfortran \
 		--without-hdf5
 CONFIGURE_ENV=	ac_cv_search_pthread_join="${PTHREAD_LIBS}" \
 	BLAS_LIBS="${BLAS_LIBS}" LAPACK_LIBS="${LAPACK_LIBS}"
-# prevert from creating $HOME/.Scilab during build
-MAKE_ENV=	HOME=/dev/null
+MAKE_ENV=	LANG=en_US.UTF-8 \
+		LC_ALL=en_US.UTF-8
 
 OPTIONS_DEFINE=	ATLAS FFTW GUI HELP NLS MATIO OCAML PVM TK UMFPACK
 OPTIONS_DEFAULT=	FFTW GUI HELP

Modified: head/math/scilab/files/patch-configure
==============================================================================
--- head/math/scilab/files/patch-configure	Thu Jul 10 10:06:57 2014	(r361435)
+++ head/math/scilab/files/patch-configure	Thu Jul 10 10:08:10 2014	(r361436)
@@ -1,5 +1,23 @@
 --- ./configure.orig	2011-07-20 08:15:42.000000000 +0000
 +++ ./configure	2013-10-23 11:59:48.722499060 +0000
+@@ -10719,7 +10719,7 @@
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+             fi
+         fi
+ 
+@@ -10850,7 +10850,7 @@
+                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+                 D=$ac_java_jvm_dir/jre/lib/mipsel/native_threads
+                 ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"
+-                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -lhpi"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm"
+             fi
+         fi
+ 
 @@ -12226,14 +12226,15 @@
  
  public class conftest {