From 3d8f51a2829ec098b580c02a1c17a116091d7383 Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 9 Jul 2009 18:53:28 +0000
Subject: [PATCH] - Update to 0.7.0

PR:		136623
Submitted by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)
---
 graphics/cuneiform/Makefile  | 20 +++++++++++++-------
 graphics/cuneiform/distinfo  |  6 +++---
 graphics/cuneiform/pkg-plist | 16 ++++++++--------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index 4c90f2bd9bdf..e19018878f15 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	cuneiform
-PORTVERSION=	0.5.0
-PORTREVISION=	2
+PORTVERSION=	0.7.0
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/cuneiform-linux/${PORTVERSION:R}/${PORTVERSION:R}/+download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}
+DISTNAME=	${PORTNAME}-linux-${PORTVERSION:R}
 
 MAINTAINER=	samm@os2.kiev.ua
 COMMENT=	OCR system developed and open sourced by Cognitive technologies
 
-LIB_DEPENDS=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc
-
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
-CMAKE_ARGS=	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -ldlmalloc"
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/build
+WRKSRC=		${WRKDIR}/${PORTNAME}-linux-${PORTVERSION:R}/build
 CMAKE_SOURCE_PATH=..
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -34,6 +30,11 @@ OPTIONS=	IMAGEMAGICK "Enable support of different graphic formats" off
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 700000
+LIB_DEPENDS=	dlmalloc.2:${PORTSDIR}/devel/libdlmalloc
+CMAKE_ARGS=	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -ldlmalloc"
+.endif
+
 .if defined(WITH_IMAGEMAGICK)
 LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
@@ -46,5 +47,10 @@ post-patch:
 	@${REINPLACE_CMD} -e '/pkg_check_modules.*ImageMagick/ d' \
 		${WRKSRC}/../cuneiform_src/Kern/CMakeLists.txt
 .endif
+.if ${OSVERSION} < 700000
+	@${REINPLACE_CMD} -e 's|malloc_np.h|dlmalloc/malloc.h|' \
+		${WRKSRC}/../cuneiform_src/Kern/windummy.c \
+		${WRKSRC}/../cuneiform_src/Kern/rbal/src/statsearchbl.cpp
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/cuneiform/distinfo b/graphics/cuneiform/distinfo
index 14b624f5894e..93714d4ca17b 100644
--- a/graphics/cuneiform/distinfo
+++ b/graphics/cuneiform/distinfo
@@ -1,3 +1,3 @@
-MD5 (cuneiform-0.5.tar.bz2) = 081bc59aa93880e4de2ee0117cc0a3b4
-SHA256 (cuneiform-0.5.tar.bz2) = ab2f9a80d8d541cc00769fc7099846e3410607e9f3d7660b23d088ac03f4c7dd
-SIZE (cuneiform-0.5.tar.bz2) = 30109795
+MD5 (cuneiform-linux-0.7.tar.bz2) = a13c91a4c2f88b7573e1b3d3306436e2
+SHA256 (cuneiform-linux-0.7.tar.bz2) = c2d250467e05336dcfd4ef5df5ed39ad803966b64c8b57afdc4677a410f5fcec
+SIZE (cuneiform-linux-0.7.tar.bz2) = 29158105
diff --git a/graphics/cuneiform/pkg-plist b/graphics/cuneiform/pkg-plist
index 734a01c89a78..1b470faf60a2 100644
--- a/graphics/cuneiform/pkg-plist
+++ b/graphics/cuneiform/pkg-plist
@@ -5,21 +5,21 @@ lib/libcfio.so
 lib/libcimage.so
 lib/libcline.so
 lib/libcpage.so
-lib/libcpu.so
+lib/libcpu32.so
 lib/libcstr.so
 lib/libctb32.so
-lib/libdif.so
+lib/libdif32.so
 lib/libevn32.so
 lib/libexc.so
-lib/libfon.so
-lib/libleo.so
+lib/libfon32.so
+lib/libleo32.so
 lib/liblns32.so
-lib/libloc.so
-lib/libmmx.so
-lib/libmsk.so
+lib/libloc32.so
+lib/libmmx32.so
+lib/libmsk32.so
 lib/libpass2.so
 lib/libpuma.so
-lib/libr35.so
+lib/libr3532.so
 lib/librbal.so
 lib/librblock.so
 lib/librcorrkegl.so