From owner-svn-ports-all@FreeBSD.ORG Mon Jul 28 10:48:22 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CBBFB81; Mon, 28 Jul 2014 10:48:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40E2C245F; Mon, 28 Jul 2014 10:48:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SAmMDM078208; Mon, 28 Jul 2014 10:48:22 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SAmL2J078206; Mon, 28 Jul 2014 10:48:21 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201407281048.s6SAmL2J078206@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 28 Jul 2014 10:48:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r363128 - in branches/2014Q3/math/scilab: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2014 10:48:22 -0000 Author: makc Date: Mon Jul 28 10:48:21 2014 New Revision: 363128 URL: http://svnweb.freebsd.org/changeset/ports/363128 QAT: https://qat.redports.org/buildarchive/r363128/ Log: MFH: r361436 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@k2r.org Approved by: portmgr (bapt) Modified: branches/2014Q3/math/scilab/Makefile branches/2014Q3/math/scilab/files/patch-configure Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/math/scilab/Makefile ============================================================================== --- branches/2014Q3/math/scilab/Makefile Mon Jul 28 10:37:59 2014 (r363127) +++ branches/2014Q3/math/scilab/Makefile Mon Jul 28 10:48:21 2014 (r363128) @@ -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: branches/2014Q3/math/scilab/files/patch-configure ============================================================================== --- branches/2014Q3/math/scilab/files/patch-configure Mon Jul 28 10:37:59 2014 (r363127) +++ branches/2014Q3/math/scilab/files/patch-configure Mon Jul 28 10:48:21 2014 (r363128) @@ -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 {