Date: Wed, 28 Aug 2013 10:49:38 GMT From: Boris Samorodov <bsam@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181611: [patch] graphics/cuneiform: unbreak with clang, add LICENSE Message-ID: <201308281049.r7SAnbOY026379@oldred.freebsd.org> Resent-Message-ID: <201308281050.r7SAo02L073283@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181611
>Category: ports
>Synopsis: [patch] graphics/cuneiform: unbreak with clang, add LICENSE
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 28 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Boris Samorodov
>Release: FreeBSD 10.0-CURRENT
>Organization:
BSDprint
>Environment:
FreeBSD bsam.int.wart.ru 10.0-CURRENT FreeBSD 10.0-CURRENT #36 r254961: Wed Aug 28 02:04:00 SAMT 2013 bsam@bsam.int.wart.ru:/usr/obj/usr/src/sys/BB64X amd64
>Description:
The port does not build with clang:
-----
/wrkdirs/usr/ports/graphics/cuneiform/work/cuneiform-linux-1.1.0/cuneiform_src/Kern/leo/src/leo_dll.c:625:30: error: character too large for enclosing character literal type
!ansi_letters[(uchar)'<U+FFFD>'] &&
^
-----
>How-To-Repeat:
>Fix:
. fix build with clang (error: character too large for enclosing character literal type);
. add LICENSE (BSD), bump PORTREVISION;
. remove unneeded WRKSRC creation;
. use new LIB_DEPENDS syntax.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 325431)
+++ Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= cuneiform
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://launchpadlibrarian.net/69906918/
DISTNAME= ${PORTNAME}-linux-${PORTVERSION}
@@ -11,6 +11,9 @@
MAINTAINER= samm@os2.kiev.ua
COMMENT= OCR system developed and open sourced by Cognitive technologies
+LICENSE= BSD
+LICENSE_FILE= ${WRKSRC}/cuneiform_src/Kern/license.txt
+
ONLY_FOR_ARCHS= i386 amd64
USE_BZIP2= yes
@@ -25,15 +28,14 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+= MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+= libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
.endif
-post-extract:
- ${MKDIR} ${WRKSRC}
-
post-patch:
${MV} ${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/strings.h \
${WRKSRC}/cuneiform_src/Kern/hhh/tigerh/h/cf_strings.h
+ @${REINPLACE_CMD} -e 's:\[(uchar):\[(uchar)L:' \
+ ${WRKSRC}/cuneiform_src/Kern/leo/src/leo_dll.c
.if ! ${PORT_OPTIONS:MIMAGEMAGICK}
@${REINPLACE_CMD} -e '/pkg_check_modules.*ImageMagick/ d' \
${WRKSRC}/cuneiform_src/Kern/CMakeLists.txt
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308281049.r7SAnbOY026379>