From owner-svn-ports-all@freebsd.org Tue Jul 24 20:14:37 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29F6E1054F60; Tue, 24 Jul 2018 20:14:37 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D18C07E0CD; Tue, 24 Jul 2018 20:14:36 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2B1F10643; Tue, 24 Jul 2018 20:14:36 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6OKEaWq048568; Tue, 24 Jul 2018 20:14:36 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6OKEaWh048567; Tue, 24 Jul 2018 20:14:36 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807242014.w6OKEaWh048567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 24 Jul 2018 20:14:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475272 - head/graphics/cuneiform X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/graphics/cuneiform X-SVN-Commit-Revision: 475272 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2018 20:14:37 -0000 Author: tobik Date: Tue Jul 24 20:14:36 2018 New Revision: 475272 URL: https://svnweb.freebsd.org/changeset/ports/475272 Log: graphics/cuneiform: Slap on a band-aid and fix build with Clang 6 - Code base compiles under USE_CXXSTD=gnu++98 - Use options helpers - Fix no-op IMAGEMAGICK option; the patch to disable it no longer did anything. With ImageMagick installed in the build environment ImageMagick support was enabled regardless of option state - Deprecate. It's unmaintained upstream and the build problems will likely get worse over time - Take maintainership http://beefy11.nyi.freebsd.org/data/head-i386-default/p475217_s336659/logs/cuneiform-1.1.0_4.log PR: 216197 Modified: head/graphics/cuneiform/Makefile Modified: head/graphics/cuneiform/Makefile ============================================================================== --- head/graphics/cuneiform/Makefile Tue Jul 24 20:03:01 2018 (r475271) +++ head/graphics/cuneiform/Makefile Tue Jul 24 20:14:36 2018 (r475272) @@ -3,41 +3,34 @@ PORTNAME= cuneiform PORTVERSION= 1.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://launchpadlibrarian.net/69906918/ DISTNAME= ${PORTNAME}-linux-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tobik@FreeBSD.org COMMENT= OCR system developed and open sourced by Cognitive technologies LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/cuneiform_src/Kern/license.txt -ONLY_FOR_ARCHS= i386 amd64 +DEPRECATED= Unmaintained upstream +EXPIRATION_DATE= 2018-12-15 +ONLY_FOR_ARCHS= amd64 i386 USES= cmake:outsource tar:bzip2 +USE_CXXSTD= gnu++98 USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -CFLAGS+= -I${LOCALBASE}/include - OPTIONS_DEFINE= IMAGEMAGICK -.include +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick -.if ${PORT_OPTIONS:MIMAGEMAGICK} -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick -.endif - 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 -.endif .include