Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Jul 2018 20:14:36 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475272 - head/graphics/cuneiform
Message-ID:  <201807242014.w6OKEaWh048567@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
+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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807242014.w6OKEaWh048567>