From owner-svn-ports-head@freebsd.org  Mon Apr  6 15:42:21 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 47FDA2B3C29;
 Mon,  6 Apr 2020 15:42:21 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48wvtP1Dbpz4DHf;
 Mon,  6 Apr 2020 15:42:21 +0000 (UTC)
 (envelope-from danfe@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 259DE2A4FC;
 Mon,  6 Apr 2020 15:42:21 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 036FgLOJ029676;
 Mon, 6 Apr 2020 15:42:21 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 036FgLQv029675;
 Mon, 6 Apr 2020 15:42:21 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202004061542.036FgLQv029675@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Mon, 6 Apr 2020 15:42:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r530885 - head/graphics/hdr_tools/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: head/graphics/hdr_tools/files
X-SVN-Commit-Revision: 530885
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Apr 2020 15:42:21 -0000

Author: danfe
Date: Mon Apr  6 15:42:20 2020
New Revision: 530885
URL: https://svnweb.freebsd.org/changeset/ports/530885

Log:
  Unbreak the build: as of recently, <assert.h> header file must be included
  before <Magick++.h> because of the following conflict:
  
    [...]: error: use of undeclared identifier '__assert'; did you mean
          'MagickCore::__assert'?
            assert( file.colorSpace() == Magick::sRGBColorspace );
            ^
    /usr/include/assert.h:56:36: note: expanded from macro 'assert'
    #define assert(e)       ((e) ? (void)0 : __assert(__func__, __FILE__, \
  
    /usr/include/assert.h:77:6: note: 'MagickCore::__assert' declared here
    void __assert(const char *, const char *, int, const char *) __dead2;
  
  Reported by:	pkg-fallout

Added:
  head/graphics/hdr_tools/files/patch-headers.hh   (contents, props changed)

Added: head/graphics/hdr_tools/files/patch-headers.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/hdr_tools/files/patch-headers.hh	Mon Apr  6 15:42:20 2020	(r530885)
@@ -0,0 +1,18 @@
+--- headers.hh.orig	2010-11-23 21:22:52 UTC
++++ headers.hh
+@@ -30,6 +30,7 @@
+ 
+ 
+ 
++#include <assert.h>
+ #include <popt.h>
+ #include <tiff.h>
+ #include <tiffio.h>
+@@ -61,7 +62,6 @@
+ #include <cmath>
+ 
+ 
+-#include <assert.h>
+ #include <stdlib.h>
+ #include <math.h>
+ #include <stdint.h>