[72372] trunk/dports/textproc/cuneiform

[raphael at macports.org]

Revision: 72372
          http://trac.macports.org/changeset/72372
Author:   raphael at macports.org
Date:     2010-10-12 01:45:37 -0700 (Tue, 12 Oct 2010)
Log Message:
-----------
cuneiform:

* update to version 1.0.0
* fix build problem on powerpc by applying some upstream patches; closes #26810

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

Added Paths:
-----------
    trunk/dports/textproc/cuneiform/files/
    trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff
    trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff
    trunk/dports/textproc/cuneiform/files/patch-perc.c.diff

Modified: trunk/dports/textproc/cuneiform/Portfile
===================================================================
--- trunk/dports/textproc/cuneiform/Portfile	2010-10-12 07:53:58 UTC (rev 72371)
+++ trunk/dports/textproc/cuneiform/Portfile	2010-10-12 08:45:37 UTC (rev 72372)
@@ -4,7 +4,7 @@
 PortGroup               cmake 1.0
 
 name                    cuneiform
-version                 0.8.0
+version                 1.0.0
 set branch              [join [lrange [split ${version} .] 0 1] .]
 platforms               darwin
 maintainers             nomaintainer
@@ -22,9 +22,9 @@
 distname                ${name}-linux-${version}
 use_bzip2               yes
 
-checksums               md5     271c1adae56bf8b977bf7326f8a8a0bc \
-                        sha1    1627f5d3cd7c8d4fac476fbe749e5593e4460ff0 \
-                        rmd160  29e2ba3e1865643bd1c2cf559c29bc8a88875a49
+checksums               md5     785232ffffad7d82446fbac08a1c3ef9 \
+                        sha1    bdf8bcb3ee578f21032e1f6b6d557e9902f0af77 \
+                        rmd160  22c1dc2cbdfd150892af144e0b95103fd13c8ae2
 
 depends_lib             port:ImageMagick
 
@@ -32,6 +32,12 @@
     file mkdir ${worksrcpath}/build
 }
 
+platform darwin powerpc {
+    patchfiles          patch-perc.c.diff \
+                        patch-CMakeLists.txt.diff \
+                        patch-config.h.in.diff
+}
+
 configure.dir           ${worksrcpath}/build
 configure.args-append   ${worksrcpath}
 

Added: trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff	2010-10-12 08:45:37 UTC (rev 72372)
@@ -0,0 +1,13 @@
+--- cuneiform_src/CMakeLists.txt.orig	2010-10-12 09:33:13.000000000 +0200
++++ cuneiform_src/CMakeLists.txt	2010-10-12 09:33:29.000000000 +0200
+@@ -28,6 +28,10 @@
+     endif()
+ endif()
+ 
++
++INCLUDE (CheckIncludeFiles)
++CHECK_INCLUDE_FILES (machine/endian.h HAVE_ENDIAN_H)
++
+ add_definitions(-D_USE_RVERLINE_)
+ 
+ find_package(ImageMagick COMPONENTS Magick++)

Added: trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff	                        (rev 0)
+++ trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff	2010-10-12 08:45:37 UTC (rev 72372)
@@ -0,0 +1,10 @@
+--- cuneiform_src/Kern/include/config.h.in.orig	2010-10-12 09:34:51.000000000 +0200
++++ cuneiform_src/Kern/include/config.h.in	2010-10-12 09:35:03.000000000 +0200
+@@ -2,6 +2,7 @@
+ #define CONFIG_H_CF
+ 
+ #cmakedefine USE_MAGICK
++#cmakedefine HAVE_ENDIAN_H
+ 
+ #define CF_VERSION "@CF_VERSION@"
+ 

Added: trunk/dports/textproc/cuneiform/files/patch-perc.c.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-perc.c.diff	                        (rev 0)
+++ trunk/dports/textproc/cuneiform/files/patch-perc.c.diff	2010-10-12 08:45:37 UTC (rev 72372)
@@ -0,0 +1,24 @@
+--- cuneiform_src/Kern/rstr/src/perc.c.orig	2010-10-12 08:39:11.000000000 +0200
++++ cuneiform_src/Kern/rstr/src/perc.c	2010-10-12 08:42:14.000000000 +0200
+@@ -109,6 +109,7 @@
+ #include <string.h>
+ #include <assert.h>
+ 
++#include "config.h"
+ #include "struct.h"
+ #include "func.h"
+ #include "ligas.h"
+@@ -778,7 +779,12 @@
+  * Since it was only used on Windows (not Mac) I'm assuming it means
+  * "swap 32 bytes between big endian and current byte order".
+  */
+-#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER > 800)
++#if defined(HAVE_ENDIAN_H)
++
++#include <machine/endian.h>
++#define swapbytes(a) do { (a) = htonl(a); } while (0)
++
++#elif defined(WIN32) && defined(_MSC_VER) && (_MSC_VER > 800)
+   #define   swapbytes(a) __asm {                      \
+                                  __asm   mov   EAX,a  \
+                                  __asm   bswap EAX    \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101012/b676e30a/attachment-0001.html>