From owner-svn-ports-head@freebsd.org  Mon Oct 12 14:31:09 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8D802A11D1E;
 Mon, 12 Oct 2015 14:31:09 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 4D150BCC;
 Mon, 12 Oct 2015 14:31:09 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9CEV8AI023302;
 Mon, 12 Oct 2015 14:31:08 GMT (envelope-from swills@FreeBSD.org)
Received: (from swills@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9CEV8Ox023299;
 Mon, 12 Oct 2015 14:31:08 GMT (envelope-from swills@FreeBSD.org)
Message-Id: <201510121431.t9CEV8Ox023299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: swills set sender to
 swills@FreeBSD.org using -f
From: Steve Wills <swills@FreeBSD.org>
Date: Mon, 12 Oct 2015 14:31:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399136 - in head/math/scilab: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Oct 2015 14:31:09 -0000

Author: swills
Date: Mon Oct 12 14:31:07 2015
New Revision: 399136
URL: https://svnweb.freebsd.org/changeset/ports/399136

Log:
  math/scilab: fix build with OpenJDK8
  
  PR:		203511
  Approved by:	makc (maintainer)

Added:
  head/math/scilab/files/extra-patch-Makefile.in   (contents, props changed)
  head/math/scilab/files/patch-configure   (contents, props changed)
Modified:
  head/math/scilab/Makefile

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Mon Oct 12 14:28:50 2015	(r399135)
+++ head/math/scilab/Makefile	Mon Oct 12 14:31:07 2015	(r399136)
@@ -115,6 +115,12 @@ TK_USE=		XORG=x11
 CONFIGURE_ARGS+=	--without-openmp
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION:M1.8.*}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
+.endif
+
 post-patch:
 	@# Configure fixes
 	@${REINPLACE_CMD} -e 's|-ldl | |' ${WRKSRC}/configure
@@ -161,4 +167,4 @@ check test regression-test: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} \
 		${MAKE_ARGS} check)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/math/scilab/files/extra-patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/scilab/files/extra-patch-Makefile.in	Mon Oct 12 14:31:07 2015	(r399136)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2015-10-02 17:25:36.689224000 +0000
++++ Makefile.in	2015-10-02 17:25:47.634538000 +0000
+@@ -2110,7 +2110,7 @@
+ # This is not done in the module itself because its needs also the "types"
+ # module
+ javadoc:
+-	$(JAVADOC) -noindex -nohelp -nonavbar -notree \
++	$(JAVADOC) -Xdoclint:none -noindex -nohelp -nonavbar -notree \
+ 	-d $(top_builddir)/modules/javasci/javadoc \
+ 	-sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java::$(top_srcdir)/modules/localization/src/java \
+ 	org.scilab.modules.javasci org.scilab.modules.types

Added: head/math/scilab/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/scilab/files/patch-configure	Mon Oct 12 14:31:07 2015	(r399136)
@@ -0,0 +1,11 @@
+--- configure.orig	2015-10-02 17:09:45.251035000 +0000
++++ configure	2015-10-02 17:07:21.796652000 +0000
+@@ -11863,7 +11863,7 @@
+             fi
+         fi
+                 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 -ljvm"
++                ac_java_jvm_jni_lib_flags="$ac_java_jvm_jni_lib_flags -L$D -ljvm -pthread"
+                 D=$ac_java_jvm_dir/jre/lib/$machine/native_threads
+                 if test -d $D; then
+                   ac_java_jvm_jni_lib_runtime_path="${ac_java_jvm_jni_lib_runtime_path}:$D"