From owner-svn-ports-head@freebsd.org  Tue Jul 11 05:38:33 2017
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 30FE4D9603E;
 Tue, 11 Jul 2017 05:38:33 +0000 (UTC)
 (envelope-from eugen@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 03E791F1C;
 Tue, 11 Jul 2017 05:38:32 +0000 (UTC)
 (envelope-from eugen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6B5cW31099681;
 Tue, 11 Jul 2017 05:38:32 GMT (envelope-from eugen@FreeBSD.org)
Received: (from eugen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6B5cV3q099679;
 Tue, 11 Jul 2017 05:38:31 GMT (envelope-from eugen@FreeBSD.org)
Message-Id: <201707110538.v6B5cV3q099679@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eugen set sender to
 eugen@FreeBSD.org using -f
From: Eugene Grosbein <eugen@FreeBSD.org>
Date: Tue, 11 Jul 2017 05:38:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445468 - in head/java/bouncycastle15: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: eugen
X-SVN-Commit-Paths: in head/java/bouncycastle15: . files
X-SVN-Commit-Revision: 445468
X-SVN-Commit-Repository: ports
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.23
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: Tue, 11 Jul 2017 05:38:33 -0000

Author: eugen
Date: Tue Jul 11 05:38:31 2017
New Revision: 445468
URL: https://svnweb.freebsd.org/changeset/ports/445468

Log:
  Fix build of java/bouncycastle15 on armv6:
  remove fork="true" in javac and fork="yes" in junit tasks (ant/bc+-build.xml)
  
  Original report:
  
    If java/bouncycastle15 is build on armv6 with openjdk18, the build stops with
    This command is not for general use and should only be run as the result of a call to ProcessBuilder.start() or Runtime.exec() in a java application
  
  PR:		220612
  Submitted by:	Gerrit Beine <mail+freebsd@gerritbeine.de> (based on)
  Approved by:	az (mentor)

Added:
  head/java/bouncycastle15/files/
  head/java/bouncycastle15/files/armv6-patch-bc+-build.xml   (contents, props changed)
Modified:
  head/java/bouncycastle15/Makefile

Modified: head/java/bouncycastle15/Makefile
==============================================================================
--- head/java/bouncycastle15/Makefile	Tue Jul 11 04:13:11 2017	(r445467)
+++ head/java/bouncycastle15/Makefile	Tue Jul 11 05:38:31 2017	(r445468)
@@ -47,6 +47,11 @@ PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
+# PR 220612: remove fork="true" in javac and fork="yes" in junit tasks
+.if ${ARCH}=="armv6"
+EXTRA_PATCHES+=	${FILESDIR}/armv6-patch-bc+-build.xml
+.endif
+
 do-install:
 .for jar in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}on-${DVERSION}.jar \

Added: head/java/bouncycastle15/files/armv6-patch-bc+-build.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/bouncycastle15/files/armv6-patch-bc+-build.xml	Tue Jul 11 05:38:31 2017	(r445468)
@@ -0,0 +1,37 @@
+--- ant/bc+-build.xml.orig	2017-05-03 05:05:26 UTC
++++ ant/bc+-build.xml
+@@ -107,7 +107,7 @@
+                     srcdir="${artifacts.dir}/@{target}/src"
+                     destdir="${build.dir}/@{target}/classes"
+                     memoryMaximumSize="512m"
+-                    debug="${release.debug}" fork="true">
++                    debug="${release.debug}">
+                     <classpath>
+                         <path refid="project.classpath" /> 
+                         <fileset dir="${artifacts.jars.dir}">
+@@ -282,7 +282,6 @@
+             srcdir="${lcrypto.target.src.dir}"
+             destdir="${lcrypto.target.classes.dir}"
+ 	    memoryMaximumSize="512m"
+-            fork="true"
+             debug="${release.debug}">
+             <classpath>
+                 <path refid="project.classpath" /> 
+@@ -762,7 +761,7 @@
+ 
+     <target name="test">
+         <mkdir dir="${basedir}/${build.dir}/${target.prefix}" />
+-        <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
++        <junit dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
+             <classpath>
+                 <path refid="project.classpath" /> 
+                 <fileset dir="${artifacts.jars.dir}">
+@@ -789,7 +788,7 @@
+     </target>
+ 
+     <target name="test-lw">
+-        <junit fork="yes" dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
++        <junit dir="${basedir}/${build.dir}/${target.prefix}" failureProperty="test.failed">
+             <classpath>
+                 <fileset dir="${artifacts.jars.dir}">
+                     <include name="**/*.jar" />