From 0a6a81d4b6327ac4fd255009a1fb8f3179dbd4c2 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 18 Jan 2015 21:12:42 +0000 Subject: Update ImageMagick to 6.9.0.4. - Normalize the ImageMagick library name so it stays the same regardless of what the 16-bit and HDRI option are set to [1]. Teach cmake to look for the new name. Bump ports that link to the libraries due to this. - As a result do away with the "HALFSUPPORTED" option block, and list 16-bit and HDRI with the other options. - ImageMagick ships a basic SVG plugin when not using librsvg2 for SVG support. This basic SVG plugin needs libxml2 to work [2]. Make libxml2 a mandatory dependency (instead of only when the SVG option was selected). - Don't touch .keep files in the modules directory, there files there so it useless. PR: 194949 [1] PR: 195227 [2] Requested by: many [1] Submitted by: software-freebsd@interfasys.ch [2] --- editors/emacs-devel/Makefile | 4 ++-- editors/emacs/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'editors') diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 63339dc4caf1..d9331534e887 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER}.${EMACS_REV} -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= editors ipv6 MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ @@ -145,7 +145,7 @@ M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index eabc798940f8..733b09521345 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -3,7 +3,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 3 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -153,7 +153,7 @@ M17N_CONFIGURE_WITH= m17n-flt OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 -- cgit