[101974] trunk/dports/textproc/tesseract

[ryandesign at macports.org]

Revision: 101974
          https://trac.macports.org/changeset/101974
Author:   ryandesign at macports.org
Date:     2013-01-23 06:41:48 -0800 (Wed, 23 Jan 2013)
Log Message:
-----------
tesseract: fix autoreconf failure with automake 1.13 (#37429)

Modified Paths:
--------------
    trunk/dports/textproc/tesseract/Portfile

Added Paths:
-----------
    trunk/dports/textproc/tesseract/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/textproc/tesseract/files/patch-configure.diff

Modified: trunk/dports/textproc/tesseract/Portfile
===================================================================
--- trunk/dports/textproc/tesseract/Portfile	2013-01-23 14:00:03 UTC (rev 101973)
+++ trunk/dports/textproc/tesseract/Portfile	2013-01-23 14:41:48 UTC (rev 101974)
@@ -40,7 +40,11 @@
                             port:leptonica \
                             port:jpeg
     
-    patchfiles              patch-configure.diff \
+    post-extract {
+        file mkdir ${worksrcpath}/m4
+    }
+    
+    patchfiles              patch-configure.ac.diff \
                             patch-ccutil-strngs.h.diff
     
     use_autoreconf          yes

Copied: trunk/dports/textproc/tesseract/files/patch-configure.ac.diff (from rev 101957, trunk/dports/textproc/tesseract/files/patch-configure.diff)
===================================================================
--- trunk/dports/textproc/tesseract/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/textproc/tesseract/files/patch-configure.ac.diff	2013-01-23 14:41:48 UTC (rev 101974)
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2011-10-21 21:40:55.000000000 -0500
++++ configure.ac 2013-01-02 16:37:20.000000000 -0500
+@@ -223,7 +223,7 @@
+ # TODO(luc) Resolve this issue.
+ #AM_INIT_AUTOMAKE(dist-zip)
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config_auto.h:config/config.h.in)
++AC_CONFIG_HEADERS(config_auto.h:config/config.h.in)
+ #AM_PROG_CC_C_O
+ AM_MAINTAINER_MODE
+ # Need to tell automake if Visual C++ is being used:
+@@ -158,7 +158,7 @@
+ #AM_PROG_CC_C_O
+ AM_MAINTAINER_MODE
+ # Need to tell automake if Visual C++ is being used:
+-AM_CONDITIONAL(USING_CL, test x$CC = xcl.exe)
++AM_CONDITIONAL(USING_CL, test "x$CC" = xcl.exe)
+ 
+ # Additional checking of compiler characteristics
+ # ----------------------------------------

Deleted: trunk/dports/textproc/tesseract/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/tesseract/files/patch-configure.diff	2013-01-23 14:00:03 UTC (rev 101973)
+++ trunk/dports/textproc/tesseract/files/patch-configure.diff	2013-01-23 14:41:48 UTC (rev 101974)
@@ -1,12 +0,0 @@
-# Fix "too many arguments" error when $CC contains multiple words, e.g. when using ccache or distcc
---- configure.orig	2011-10-21 23:14:14.000000000 -0500
-+++ configure	2011-11-15 18:10:21.000000000 -0600
-@@ -14612,7 +14612,7 @@
- 
- 
- # Need to tell automake if Visual C++ is being used:
-- if test x$CC = xcl.exe; then
-+ if test "x$CC" = xcl.exe; then
-   USING_CL_TRUE=
-   USING_CL_FALSE='#'
- else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130123/1a01dc54/attachment.html>