From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  2 22:44:23 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 ESMTPS id 7BE46927;
 Sun,  2 Feb 2014 22:44:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 67CA61748;
 Sun,  2 Feb 2014 22:44:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s12MiN6F008541;
 Sun, 2 Feb 2014 22:44:23 GMT (envelope-from riggs@svn.freebsd.org)
Received: (from riggs@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s12MiNeS008540;
 Sun, 2 Feb 2014 22:44:23 GMT (envelope-from riggs@svn.freebsd.org)
Message-Id: <201402022244.s12MiNeS008540@svn.freebsd.org>
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 2 Feb 2014 22:44:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r342371 - head/graphics/ImageMagick
X-SVN-Group: ports-head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Feb 2014 22:44:23 -0000

Author: riggs
Date: Sun Feb  2 22:44:22 2014
New Revision: 342371
URL: http://svnweb.freebsd.org/changeset/ports/342371
QAT: https://qat.redports.org/buildarchive/r342371/

Log:
  - Adjust location of freetype headers in ImageMagick sources
  - Bump PORTREVISION
  
  Note that this is a stop-gap to avoid runtime errors with ImageMagick.
  It allows for working pkg builds with default PREFIX/LOCALBASE.
  A more substantial rework and upgrade of the ImageMagick port needs to be conducted.
  
  PR:		ports/186170, ports/186171
  Submitted by:	Vivek Khera <vivek@khera.org>, Alexander Panyushkin <vsityz@gmail.com>
  Approved by:	mentor (thierry)
  MFH:		2014Q1

Modified:
  head/graphics/ImageMagick/Makefile

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Sun Feb  2 22:31:11 2014	(r342370)
+++ head/graphics/ImageMagick/Makefile	Sun Feb  2 22:44:22 2014	(r342371)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.8.0-7
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -397,6 +397,12 @@ post-patch:
 # deprecated gvCleanup
 	@${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \
 		${WRKSRC}/coders/dot.c
+# freetype headers are in freetype2/ nowadays
+	@${REINPLACE_CMD} -e "s|freetype/|freetype2/|g" \
+		${WRKSRC}/configure \
+		${WRKSRC}/coders/ttf.c \
+		${WRKSRC}/magick/annotate.c \
+		${WRKSRC}/www/api/MagickCore/annotate_8c.html
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)