Index: graphics/ImageMagick/Makefile
===================================================================
--- graphics/ImageMagick/Makefile
+++ graphics/ImageMagick/Makefile
@@ -1,31 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.9-15
+DISTVERSION=	6.9.9-26
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
-MASTER_SITES=	http://www.imagemagick.org/download/ \
-		http://www.imagemagick.org/download/legacy/ \
-		http://servingzone.com/mirrors/ImageMagick/ \
-		http://mirror.checkdomain.de/imagemagick/ \
-		http://imagemagick.spd.co.il/ \
-		http://www.champground.com/imagemagick/ \
-		http://ftp.surfnet.nl/pub/ImageMagick/ \
-		http://mirror.searchdaimon.com/ImageMagick/ \
-		http://mirror.is.co.za/pub/imagemagick/ \
-		http://imagemagick.mirrorcatalogs.com/ \
-		ftp://ftp.imagemagick.org/pub/ImageMagick/ \
-		ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
-		ftp://mirror.checkdomain.de/imagemagick/ \
-		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
-		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
-		ftp://ftp.nluug.nl/pub/ImageMagick/ \
-		ftp://mirror.searchdaimon.com/ImageMagick/ \
-		ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
-		ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
-		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
-		ftp://ftp.is.co.za/pub/imagemagick/ \
-		ftp://ftp.fifi.org/pub/ImageMagick/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Image processing tools (legacy version)
@@ -43,18 +21,21 @@
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gettext-runtime gmake gnome libtool:keepla \
 		localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
+USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+USE_GNOME=	libxml2
+
+CONFIGURE_ENV=	MAKE=${MAKE_CMD}
+CONFIGURE_ARGS=	--without-dps
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
-SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKE=${MAKE_CMD}
-CONFIGURE_ARGS=	--without-dps
-USE_LDCONFIG=	yes
-USE_GNOME=	libxml2
+SHEBANG_FILES=	www/source/examples.pl
 
 SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-apple.xml \
-		type-dejavu.xml type-ghostscript.xml type-windows.xml type.xml
+		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
+		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
Index: graphics/ImageMagick/distinfo
===================================================================
--- graphics/ImageMagick/distinfo
+++ graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506539505
-SHA256 (ImageMagick-6.9.9-15.tar.xz) = cc5411bcd766efbc5c281ae2147f0d154c452e5f0cc72894796afb88036baf2f
-SIZE (ImageMagick-6.9.9-15.tar.xz) = 8792252
+TIMESTAMP = 1513919135
+SHA256 (ImageMagick-ImageMagick-6.9.9-26_GH0.tar.gz) = 7db817b1ccaae00892112195a00b3cad90367bb38c2bf0339d32be3acfbe7c87
+SIZE (ImageMagick-ImageMagick-6.9.9-26_GH0.tar.gz) = 14332748
Index: graphics/ImageMagick/pkg-plist
===================================================================
--- graphics/ImageMagick/pkg-plist
+++ graphics/ImageMagick/pkg-plist
@@ -14,20 +14,21 @@
 bin/mogrify
 bin/montage
 bin/stream
-@sample etc/ImageMagick-6/coder.xml.sample
-@sample etc/ImageMagick-6/colors.xml.sample
-@sample etc/ImageMagick-6/delegates.xml.sample
-@sample etc/ImageMagick-6/log.xml.sample
-@sample etc/ImageMagick-6/magic.xml.sample
-@sample etc/ImageMagick-6/mime.xml.sample
-@sample etc/ImageMagick-6/policy.xml.sample
-@sample etc/ImageMagick-6/quantization-table.xml.sample
-@sample etc/ImageMagick-6/thresholds.xml.sample
-@sample etc/ImageMagick-6/type-apple.xml.sample
-@sample etc/ImageMagick-6/type-dejavu.xml.sample
-@sample etc/ImageMagick-6/type-ghostscript.xml.sample
-@sample etc/ImageMagick-6/type-windows.xml.sample
-@sample etc/ImageMagick-6/type.xml.sample
+@sample %%ETCDIR%%-6/coder.xml.sample
+@sample %%ETCDIR%%-6/colors.xml.sample
+@sample %%ETCDIR%%-6/delegates.xml.sample
+@sample %%ETCDIR%%-6/log.xml.sample
+@sample %%ETCDIR%%-6/magic.xml.sample
+@sample %%ETCDIR%%-6/mime.xml.sample
+@sample %%ETCDIR%%-6/policy.xml.sample
+@sample %%ETCDIR%%-6/quantization-table.xml.sample
+@sample %%ETCDIR%%-6/thresholds.xml.sample
+@sample %%ETCDIR%%-6/type-apple.xml.sample
+@sample %%ETCDIR%%-6/type-dejavu.xml.sample
+@sample %%ETCDIR%%-6/type-ghostscript.xml.sample
+@sample %%ETCDIR%%-6/type-windows.xml.sample
+@sample %%ETCDIR%%-6/type.xml.sample
+@sample %%ETCDIR%%-6/type-urw-base35.xml.sample
 include/ImageMagick-6/Magick++.h
 include/ImageMagick-6/Magick++/Blob.h
 include/ImageMagick-6/Magick++/ChannelMoments.h
@@ -432,6 +433,8 @@
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so
+%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz
 libdata/pkgconfig/ImageMagick++-6.pc