From owner-svn-ports-all@FreeBSD.ORG  Thu Jun 12 11:02:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 C689D4E2;
 Thu, 12 Jun 2014 11:02:51 +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 B339D2D86;
 Thu, 12 Jun 2014 11:02:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5CB2pxG081001;
 Thu, 12 Jun 2014 11:02:51 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5CB2phH080999;
 Thu, 12 Jun 2014 11:02:51 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201406121102.s5CB2phH080999@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 12 Jun 2014 11:02:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r357584 - in head/editors/libreoffice: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Jun 2014 11:02:51 -0000

Author: bapt
Date: Thu Jun 12 11:02:50 2014
New Revision: 357584
URL: http://svnweb.freebsd.org/changeset/ports/357584
QAT: https://qat.redports.org/buildarchive/r357584/

Log:
  Restore configure regeneration

Added:
  head/editors/libreoffice/files/patch-configure.ac   (contents, props changed)
Deleted:
  head/editors/libreoffice/files/patch-configure
Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Thu Jun 12 10:51:59 2014	(r357583)
+++ head/editors/libreoffice/Makefile	Thu Jun 12 11:02:50 2014	(r357584)
@@ -66,7 +66,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/
 _MAKE_JOBS=	#
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:env aclocal:env
+USE_AUTOTOOLS=	autoconf aclocal
 USE_GL=		gl glu
 USE_OPENLDAP=	yes
 USE_PERL5=	build

Added: head/editors/libreoffice/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-configure.ac	Thu Jun 12 11:02:50 2014	(r357584)
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2014-06-12 13:00:46.943316659 +0200
++++ configure.ac	2014-06-12 13:00:39.783317665 +0200
+@@ -4024,7 +4024,7 @@
+         PLATFORMID=freebsd_x86
+         OUTPATH=unxfbsdi
+         ;;
+-    x86_64)
++    x86_64|amd64)
+         CPUNAME=X86_64
+         RTL_ARCH=X86_64
+         PLATFORMID=freebsd_x86_64
+@@ -7051,7 +7051,7 @@
+             JAVA_ARCH="i386"
+             JAVA_TOOLKIT="client"
+             ;;
+-        x86_64)
++        x86_64|amd64)
+             if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then
+                 JAVA_ARCH="i386"
+                 JAVA_TOOLKIT="client"