From 1f627f687d9476c4cc646a707c297fd32d6b3120 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Tue, 10 Mar 2015 12:35:58 +0000 Subject: Update ImageMagick to 6.9.0-10. - USES=pkgconfig:both since the *-config scripts are wrappers around pkg-config. - Don't require ghostscript for the freetype2 option. - Actualy remove the pkg-help file with is obsolete since r377347 when the library names where normalized. Due to libMagick++-6.so bump, chase depend ports. --- graphics/ImageMagick/Makefile | 6 ++---- graphics/ImageMagick/distinfo | 4 ++-- graphics/ImageMagick/files/patch-configure | 11 ----------- graphics/ImageMagick/pkg-help | 8 -------- graphics/ImageMagick/pkg-plist | 6 ++++-- graphics/converseen/Makefile | 1 + graphics/fpc-imagemagick/Makefile | 2 +- graphics/gimp-gmic-plugin/Makefile | 2 +- graphics/inkscape/Makefile | 1 + graphics/pstoedit/Makefile | 1 + graphics/zbar/Makefile | 2 +- 11 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 graphics/ImageMagick/files/patch-configure delete mode 100644 graphics/ImageMagick/pkg-help (limited to 'graphics') diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 6e625aa45eb8..84d5b195739c 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.0-4 +DISTVERSION= 6.9.0-10 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -39,7 +39,7 @@ LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl CONFLICTS_INSTALL= execline-[0-9]* # bin/import # This port uses .la files, keep libtool:keepla! (magick/module.c) -USES= gmake libtool:keepla pathfix perl5 pkgconfig shebangfix tar:xz +USES= gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz SHEBANG_FILES= www/source/examples.pl GNU_CONFIGURE= yes CONFIGURE_ENV= MAKE=${MAKE_CMD} @@ -294,7 +294,6 @@ CONFIGURE_ARGS+= --without-lcms2 # Freetype (TrueType Font) support .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 -USE_GHOSTSCRIPT= yes CONFIGURE_ARGS+= --with-freetype .else CONFIGURE_ARGS+= --without-freetype @@ -329,7 +328,6 @@ LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf-nox11 . endif CONFIGURE_ARGS+= --with-wmf=yes -CFLAGS+= -I${LOCALBASE}/include/freetype2 PLIST_SUB+= WMF="" .else CONFIGURE_ARGS+= --without-wmf diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index b53151bf081d..9ea9d2c65f2f 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,2 +1,2 @@ -SHA256 (ImageMagick-6.9.0-4.tar.xz) = 996aa8081dced3f3bbf23d90fca861b30332f734329f89367c6fc35173a74957 -SIZE (ImageMagick-6.9.0-4.tar.xz) = 7901680 +SHA256 (ImageMagick-6.9.0-10.tar.xz) = d1f5dcd32a93130feb9e980a8a97517d3a2c814a8b608d139d4756516548748c +SIZE (ImageMagick-6.9.0-10.tar.xz) = 7906216 diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure deleted file mode 100644 index cbd21aa8d1bd..000000000000 --- a/graphics/ImageMagick/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2015-01-16 22:45:09.000000000 +0100 -+++ configure 2015-01-17 22:55:31.590059586 +0100 -@@ -33096,7 +33096,7 @@ - - - if test "x$SHAREARCH_DIRNAME" = "x"; then -- SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX} -+ SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME} - else - - cat >>confdefs.h <<_ACEOF diff --git a/graphics/ImageMagick/pkg-help b/graphics/ImageMagick/pkg-help deleted file mode 100644 index 4f74f71a6137..000000000000 --- a/graphics/ImageMagick/pkg-help +++ /dev/null @@ -1,8 +0,0 @@ -What is meant with half support for the 16BIT_PIXEL option and HDRI -option is that either by disabling 16BIT_PIXEL or enabling HDRI the -library names change. The ImageMagick port works fine and package -correctly. But ports that depend on ImageMagick might not be able to -find ImageMagick libraries anymore via the port framework. - -So please keep that in mind if you need a port that ImageMagick and -you want to change these options. diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist index ab0be32c4651..387b3d74c45e 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick/pkg-plist @@ -402,6 +402,8 @@ lib/ImageMagick-%%PORTVERSION%%/config/configure.xml %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xpm.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xps.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xps.so +%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xtrn.la +%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xtrn.so %%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xwd.la %%X11%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/xwd.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ycbcr.la @@ -413,8 +415,8 @@ lib/ImageMagick-%%PORTVERSION%%/config/configure.xml lib/libMagick++-6.a lib/libMagick++-6.la lib/libMagick++-6.so -lib/libMagick++-6.so.5 -lib/libMagick++-6.so.5.0.0 +lib/libMagick++-6.so.6 +lib/libMagick++-6.so.6.0.0 lib/libMagickCore-6.a lib/libMagickCore-6.la lib/libMagickCore-6.so diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index b35d651b833e..185cecac35ba 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -3,6 +3,7 @@ PORTNAME= converseen PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Converseen/Converseen%200.9/ diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index e300b93fa3a9..8e9398d80138 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index 843b9c22166d..f84dfdf26222 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/older_versions/ \ SF/${PORTNAME}/ diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index c7df56abeae1..180360e78728 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,6 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.91 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/ \ LOCAL/kwm diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index b8d85c1cc0d6..436a5426243c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -3,6 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index f8659ee8393f..a7b0f60a3dc1 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -3,7 +3,7 @@ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF -- cgit v1.2.3