diff options
| author | kwm <kwm@FreeBSD.org> | 2016-08-22 03:52:54 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2016-08-22 03:52:54 +0800 |
| commit | 7f90b6782b66d223e363de6b0024f8f9600116a0 (patch) | |
| tree | a12c0c0001eae22790e94bb2a0cd6d2489736564 /graphics | |
| parent | cb29ae58d40055b60cd197aecfce15ec69c0991e (diff) | |
| download | freebsd-ports-gnome-7f90b6782b66d223e363de6b0024f8f9600116a0.tar.gz freebsd-ports-gnome-7f90b6782b66d223e363de6b0024f8f9600116a0.tar.zst freebsd-ports-gnome-7f90b6782b66d223e363de6b0024f8f9600116a0.zip | |
Update ImageMagick to 6.9.5.7.
Only add dependancy (indirect) to glib20 if the depenancy uses glib20. [1]
Add Indirect dependancy to ilmbase for the exr plugin.
Reported by: Miroslav Lachman <000.fbsd@quip.cz> (on freebsd-ports@) [1]
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 8 | ||||
| -rw-r--r-- | graphics/ImageMagick/distinfo | 6 | ||||
| -rw-r--r-- | graphics/ImageMagick/files/patch-tests_validate.c | 11 |
3 files changed, 8 insertions, 17 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index ffc03a191487..612bba4cf70b 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.5-5 +DISTVERSION= 6.9.5-7 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -50,7 +50,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= MAKE=${MAKE_CMD} CONFIGURE_ARGS= --without-dps USE_LDCONFIG= yes -USE_GNOME= glib20 libxml2 +USE_GNOME= libxml2 SAMPLE_FILES= coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \ policy.xml quantization-table.xml thresholds.xml type-apple.xml \ @@ -172,7 +172,8 @@ PLIST_SUB+= MODULES='@comment ' . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR +LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR \ + libImath-2_2.so:graphics/ilmbase PLIST_SUB+= OPENEXR="" . endif .else @@ -229,6 +230,7 @@ CONFIGURE_ARGS+= --without-gslib .if ${PORT_OPTIONS:MLQR} CONFIGURE_ARGS+= --with-lqr LIB_DEPENDS+= liblqr-1.so:graphics/liblqr-1 +USE_GNOME+= glib20 .else CONFIGURE_ARGS+= --without-lqr .endif diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index aaf2403ecf2e..3f7e98a8142f 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470820107 -SHA256 (ImageMagick-6.9.5-5.tar.xz) = b3b5cc1989a53b8847ffdc3b5ed740ba0c9c4e9b103cbbac7d0a78e5b7d2936f -SIZE (ImageMagick-6.9.5-5.tar.xz) = 8784240 +TIMESTAMP = 1471726909 +SHA256 (ImageMagick-6.9.5-7.tar.xz) = c5f527ab5936527a23d9da2d80ebed906302f476908235ee2b31790dfd665901 +SIZE (ImageMagick-6.9.5-7.tar.xz) = 8788196 diff --git a/graphics/ImageMagick/files/patch-tests_validate.c b/graphics/ImageMagick/files/patch-tests_validate.c deleted file mode 100644 index 805d244b9600..000000000000 --- a/graphics/ImageMagick/files/patch-tests_validate.c +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/validate.c.orig 2016-08-10 11:23:44.131844000 +0200 -+++ tests/validate.c 2016-08-10 11:24:56.257698000 +0200 -@@ -2394,7 +2394,7 @@ - else - { - (void) FormatLocaleFile(stdout,"Version: %s\n", -- GetMagickHomeURL(); -+ GetMagickVersion((size_t *) NULL)); - (void) FormatLocaleFile(stdout,"Copyright: %s\n\n", - GetMagickCopyright()); - (void) FormatLocaleFile(stdout, |