From owner-svn-ports-head@freebsd.org Fri Sep 21 22:02:32 2018 Return-Path: Delivered-To: svn-ports-head@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 72F4F10A5BC0; Fri, 21 Sep 2018 22:02:32 +0000 (UTC) (envelope-from antoine@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 24F2272B9F; Fri, 21 Sep 2018 22:02:32 +0000 (UTC) (envelope-from antoine@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 1FC5E12E52; Fri, 21 Sep 2018 22:02:32 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8LM2V2I027096; Fri, 21 Sep 2018 22:02:31 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8LM2VlY027094; Fri, 21 Sep 2018 22:02:31 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201809212202.w8LM2VlY027094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 21 Sep 2018 22:02:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480319 - in head/graphics: ImageMagick ImageMagick7 X-SVN-Group: ports-head X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in head/graphics: ImageMagick ImageMagick7 X-SVN-Commit-Revision: 480319 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Sep 2018 22:02:32 -0000 Author: antoine Date: Fri Sep 21 22:02:31 2018 New Revision: 480319 URL: https://svnweb.freebsd.org/changeset/ports/480319 Log: Revert r480301, it's broken With hat: portmgr Modified: head/graphics/ImageMagick/Makefile head/graphics/ImageMagick7/Makefile Modified: head/graphics/ImageMagick/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Fri Sep 21 22:01:53 2018 (r480318) +++ head/graphics/ImageMagick/Makefile Fri Sep 21 22:02:31 2018 (r480319) @@ -38,7 +38,8 @@ LIB_DEPENDS= libltdl.so:devel/libltdl PORTSCOUT?= limit:^6\.9\. -CONFLICTS_INSTALL= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config +CONFLICTS_INSTALL= execline-[0-9]* # bin/import +CONFLICTS_INSTALL+= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ Modified: head/graphics/ImageMagick7/Makefile ============================================================================== --- head/graphics/ImageMagick7/Makefile Fri Sep 21 22:01:53 2018 (r480318) +++ head/graphics/ImageMagick7/Makefile Fri Sep 21 22:02:31 2018 (r480319) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.8-10 +DISTVERSION= 7.0.7-16 PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -36,7 +36,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl -CONFLICTS_INSTALL= ImageMagick ImageMagick-nox11 # bin/Magick++-config +CONFLICTS_INSTALL= execline-[0-9]* # bin/import +CONFLICTS_INSTALL+= ImageMagick ImageMagick-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ @@ -60,7 +61,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ - THREADS X11 16BIT_PIXEL HDRI HEIF + THREADS X11 16BIT_PIXEL HDRI OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ TIFF WEBP WMF THREADS X11 HDRI @@ -361,18 +362,6 @@ USES+= ghostscript:x11 . else USES+= ghostscript . endif -.endif - -## HEIF (High EfficiencImage Format) support -HEIF_DESC= High Efficiency Image File support (e.g. from iPhone) - -.if ${PORT_OPTIONS:MHEIF} -LIB_DEPENDS+= libheif.so:graphics/libheif -CONFIGURE_ARGS+= --with-heic -PLIST_SUB+= HEIF="" -.else -CONFIGURE_ARGS+= --without-heic -PLIST_SUB+= HEIF="@comment " .endif .if ! ${PORT_OPTIONS:MX11}