aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile6
-rw-r--r--graphics/ImageMagick/distinfo6
-rw-r--r--graphics/ImageMagick/pkg-plist5
3 files changed, 11 insertions, 6 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 530304ff54b5..533ee712baa6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ImageMagick
-DISTVERSION= 6.2.8-5
+DISTVERSION= 6.2.9-3
CATEGORIES= graphics perl5
MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
@@ -35,7 +35,7 @@ USE_AUTOTOOLS= libtool:15 libltdl:15
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --enable-shared
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
MAN1= ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
animate.1 conjure.1 compare.1 composite.1 convert.1 display.1 \
@@ -235,7 +235,7 @@ PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+= --without-x --without-mpeg2
PLIST_SUB+= X11='@comment '
.else
-CONFLICTS+= display
+CONFLICTS+= display-[0-9]*
CONFIGURE_ARGS+= --with-x
USE_XLIB= yes
PLIST_SUB+= X11=''
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 8730a5f7049a..c102fd2ea255 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.2.8-5.tar.bz2) = fea659c7e3e318358a8cff0366aae0b7
-SHA256 (ImageMagick-6.2.8-5.tar.bz2) = a93dbd334460063aa9e55c1d588f8bb59d60a3e13713c863f5ad531450fda59e
-SIZE (ImageMagick-6.2.8-5.tar.bz2) = 5313874
+MD5 (ImageMagick-6.2.9-3.tar.bz2) = 535a9304f0307cbd5a552b7b106d7f94
+SHA256 (ImageMagick-6.2.9-3.tar.bz2) = 2b55f53aba0cb83c0fea0352de76b4828920c68445f08cfdb3e3ceeb23ce0fa5
+SIZE (ImageMagick-6.2.9-3.tar.bz2) = 5365841
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 991756aa0c10..cd2f06d6a43e 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -90,6 +90,7 @@ include/magick/splay-tree.h
include/magick/statistic.h
include/magick/stream.h
include/magick/string_.h
+include/magick/threshold.h
include/magick/timer.h
include/magick/token.h
include/magick/transform.h
@@ -452,6 +453,7 @@ libdata/pkgconfig/Wand.pc
%%DATADIR%%-%%PORTVERSION%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/images/arc.png
%%PORTDOCS%%%%DOCSDIR%%/images/background.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/black.png
%%PORTDOCS%%%%DOCSDIR%%/images/button.gif
%%PORTDOCS%%%%DOCSDIR%%/images/configure.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/definitive-guide.png
@@ -466,12 +468,14 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/images/logo.eps
%%PORTDOCS%%%%DOCSDIR%%/images/logo.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/montage.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/navy.png
%%PORTDOCS%%%%DOCSDIR%%/images/piechart.png
%%PORTDOCS%%%%DOCSDIR%%/images/reconstruct.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/red-ball.png
%%PORTDOCS%%%%DOCSDIR%%/images/red-circle.png
%%PORTDOCS%%%%DOCSDIR%%/images/right.gif
%%PORTDOCS%%%%DOCSDIR%%/images/rose-over.png
+%%PORTDOCS%%%%DOCSDIR%%/images/rose-sigmoidal.png
%%PORTDOCS%%%%DOCSDIR%%/images/rose.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/rose.png
%%PORTDOCS%%%%DOCSDIR%%/images/script.png
@@ -585,6 +589,7 @@ libdata/pkgconfig/Wand.pc
%%PORTDOCS%%%%DOCSDIR%%/www/download.html
%%PORTDOCS%%%%DOCSDIR%%/www/examples.html
%%PORTDOCS%%%%DOCSDIR%%/www/formats.html
+%%PORTDOCS%%%%DOCSDIR%%/www/fx.html
%%PORTDOCS%%%%DOCSDIR%%/www/history.html
%%PORTDOCS%%%%DOCSDIR%%/www/identify.html
%%PORTDOCS%%%%DOCSDIR%%/www/import.html