Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2014 22:44:23 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342371 - head/graphics/ImageMagick
Message-ID:  <201402022244.s12MiNeS008540@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



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