[79061] trunk/dports/textproc/cuneiform

[raphael at macports.org]

Revision: 79061
          http://trac.macports.org/changeset/79061
Author:   raphael at macports.org
Date:     2011-05-31 10:23:55 -0700 (Tue, 31 May 2011)
Log Message:
-----------
cuneiform: update to 1.1.0; add modeline and license info

Modified Paths:
--------------
    trunk/dports/textproc/cuneiform/Portfile
    trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff
    trunk/dports/textproc/cuneiform/files/patch-perc.c.diff

Removed Paths:
-------------
    trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff

Modified: trunk/dports/textproc/cuneiform/Portfile
===================================================================
--- trunk/dports/textproc/cuneiform/Portfile	2011-05-31 17:04:44 UTC (rev 79060)
+++ trunk/dports/textproc/cuneiform/Portfile	2011-05-31 17:23:55 UTC (rev 79061)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem              1.0
@@ -4,7 +5,7 @@
 PortGroup               cmake 1.0
 
 name                    cuneiform
-version                 1.0.0
+version                 1.1.0
 set branch              [join [lrange [split ${version} .] 0 1] .]
 platforms               darwin
 maintainers             nomaintainer
@@ -18,13 +19,14 @@
                         Cuneiform supports several languages.
 
 homepage                https://launchpad.net/cuneiform-linux
+license                 BSD
+
 master_sites            http://launchpad.net/cuneiform-linux/${branch}/${branch}/+download/
 distname                ${name}-linux-${version}
 use_bzip2               yes
 
-checksums               md5     785232ffffad7d82446fbac08a1c3ef9 \
-                        sha1    bdf8bcb3ee578f21032e1f6b6d557e9902f0af77 \
-                        rmd160  22c1dc2cbdfd150892af144e0b95103fd13c8ae2
+checksums               sha1    b78ebcf987c4792c360f23bdbe054d554ce2251c \
+                        rmd160  bc23f83103316ce635635899cf6d4d797edefc45
 
 depends_lib             port:ImageMagick
 
@@ -34,8 +36,7 @@
 
 platform darwin powerpc {
     patchfiles          patch-perc.c.diff \
-                        patch-CMakeLists.txt.diff \
-                        patch-config.h.in.diff
+                        patch-CMakeLists.txt.diff
 }
 
 configure.dir           ${worksrcpath}/build

Modified: trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff	2011-05-31 17:04:44 UTC (rev 79060)
+++ trunk/dports/textproc/cuneiform/files/patch-CMakeLists.txt.diff	2011-05-31 17:23:55 UTC (rev 79061)
@@ -1,13 +1,11 @@
---- 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()
+--- cuneiform_src/CMakeLists.txt.orig	2011-05-31 18:28:12.000000000 +0200
++++ cuneiform_src/CMakeLists.txt	2011-05-31 18:28:39.000000000 +0200
+@@ -30,7 +30,7 @@
  
-+
-+INCLUDE (CheckIncludeFiles)
+ 
+ INCLUDE (CheckIncludeFiles)
+-CHECK_INCLUDE_FILES (endian.h HAVE_ENDIAN_H)
 +CHECK_INCLUDE_FILES (machine/endian.h HAVE_ENDIAN_H)
-+
+ 
  add_definitions(-D_USE_RVERLINE_)
  
- find_package(ImageMagick COMPONENTS Magick++)

Deleted: trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff	2011-05-31 17:04:44 UTC (rev 79060)
+++ trunk/dports/textproc/cuneiform/files/patch-config.h.in.diff	2011-05-31 17:23:55 UTC (rev 79061)
@@ -1,10 +0,0 @@
---- 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@"
- 

Modified: trunk/dports/textproc/cuneiform/files/patch-perc.c.diff
===================================================================
--- trunk/dports/textproc/cuneiform/files/patch-perc.c.diff	2011-05-31 17:04:44 UTC (rev 79060)
+++ trunk/dports/textproc/cuneiform/files/patch-perc.c.diff	2011-05-31 17:23:55 UTC (rev 79061)
@@ -1,24 +1,13 @@
---- 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".
+--- cuneiform_src/Kern/rstr/src/perc.c.orig	2011-05-31 18:45:31.000000000 +0200
++++ cuneiform_src/Kern/rstr/src/perc.c	2011-05-31 18:46:11.000000000 +0200
+@@ -781,8 +781,8 @@
   */
--#if defined(WIN32) && defined(_MSC_VER) && (_MSC_VER > 800)
-+#if defined(HAVE_ENDIAN_H)
-+
+ #if defined(HAVE_ENDIAN_H)
+ 
+-#include <endian.h>
+-#define swapbytes(a) do { (a) = htobe32(a); } while (0)
 +#include <machine/endian.h>
 +#define swapbytes(a) do { (a) = htonl(a); } while (0)
-+
-+#elif defined(WIN32) && defined(_MSC_VER) && (_MSC_VER > 800)
+ 
+ #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/20110531/1d0de42e/attachment-0001.html>