svn commit: r357584 - in head/editors/libreoffice: . files

[Baptiste Daroussin]

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"