From nobody@FreeBSD.org  Wed Aug 28 10:49:38 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 51629E52
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Aug 2013 10:49:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 253C42D43
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Aug 2013 10:49:38 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r7SAncZs026383
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Aug 2013 10:49:38 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r7SAnbOY026379;
	Wed, 28 Aug 2013 10:49:38 GMT
	(envelope-from nobody)
Message-Id: <201308281049.r7SAnbOY026379@oldred.freebsd.org>
Date: Wed, 28 Aug 2013 10:49:38 GMT
From: Boris Samorodov <bsam@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] graphics/cuneiform: unbreak with clang, add LICENSE
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: samm@os2.kiev.ua

>Number:         181611
>Category:       ports
>Synopsis:       [patch] graphics/cuneiform: unbreak with clang, add LICENSE
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 28 10:50:00 UTC 2013
>Closed-Date:    Wed Aug 28 12:50:38 UTC 2013
>Last-Modified:  Wed Aug 28 12:50:38 UTC 2013
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 28 10:50:08 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181611 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Aug 28 10:50:10 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181611 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: samm@os2.kiev.ua
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/181611: [patch] graphics/cuneiform: unbreak with clang, add LICENSE
Date: Wed, 28 Aug 2013 10:50:09 UT

 Maintainer of graphics/cuneiform,
 
 Please note that PR ports/181611 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181611
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Alex Samorukov <samm@os2.kiev.ua>
To: bug-followup@FreeBSD.org, bsam@FreeBSD.org
Cc:  
Subject: Re: ports/181611: [patch] graphics/cuneiform: unbreak with clang,
 add LICENSE
Date: Wed, 28 Aug 2013 15:13:36 +0300

 Thank you, please commit.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/181611: commit references a PR
Date: Wed, 28 Aug 2013 12:47:24 +0000 (UTC)

 Author: bsam
 Date: Wed Aug 28 12:47:11 2013
 New Revision: 325525
 URL: http://svnweb.freebsd.org/changeset/ports/325525
 
 Log:
   . 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.
   
   PR:		ports/181611
   Submitted by:	bsam (me)
   Approved by:	Alex Samorukov <samm@os2.kiev.ua> (maintainer)
 
 Modified:
   head/graphics/cuneiform/Makefile
 
 Modified: head/graphics/cuneiform/Makefile
 ==============================================================================
 --- head/graphics/cuneiform/Makefile	Wed Aug 28 12:39:15 2013	(r325524)
 +++ head/graphics/cuneiform/Makefile	Wed Aug 28 12:47:11 2013	(r325525)
 @@ -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 @@ DISTNAME=	${PORTNAME}-linux-${PORTVERSIO
  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 @@ OPTIONS_DEFINE=	IMAGEMAGICK
  .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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: bsam 
State-Changed-When: Wed Aug 28 12:50:37 UTC 2013 
State-Changed-Why:  
Committed, thanks! ;-) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=181611 
>Unformatted:
