From owner-svn-ports-head@FreeBSD.ORG  Sun May  3 06:37:11 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 791045AB;
 Sun,  3 May 2015 06:37:11 +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 6775E18C5;
 Sun,  3 May 2015 06:37:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t436bBXL077607;
 Sun, 3 May 2015 06:37:11 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t436bBVu077606;
 Sun, 3 May 2015 06:37:11 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201505030637.t436bBVu077606@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Sun, 3 May 2015 06:37:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r385231 - head/editors/libreoffice
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 May 2015 06:37:11 -0000

Author: pi
Date: Sun May  3 06:37:10 2015
New Revision: 385231
URL: https://svnweb.freebsd.org/changeset/ports/385231

Log:
  editors/libreoffice: fix build, if JAVA is selected
  
  ... which needs junit, which was updated because it no longer built,
  which caused a new dependency on hamcrest.
  
  PR:		199819
  Submitted by:	danilo
  Approved by:	just fix it approval

Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Sun May  3 02:47:10 2015	(r385230)
+++ head/editors/libreoffice/Makefile	Sun May  3 06:37:10 2015	(r385231)
@@ -250,7 +250,8 @@ JAVA_CONFIGURE_ON=	--enable-ext-wiki-pub
 			--enable-report-builder \
 			--with-ant-home=${LOCALBASE}/share/java/apache-ant \
 			--with-jdk-home="${JAVA_HOME}" \
-			--with-junit=${JAVAJARDIR}/junit.jar
+			--with-junit=${JAVAJARDIR}/junit.jar \
+			--with-hamcrest=${JAVAJARDIR}/hamcrest.jar
 JAVA_CONFIGURE_OFF=	--without-java
 JAVA_BUILD=	yes
 JAVA_USE=	JAVA=yes