graphics/GraphicsMagick: Upgrade version 1.3.20 => 1.3.21

The shared library versions changed, so bump all the ports that
depend on GraphicsMagick by default too.

PR:		200304
Submitted by:	ports fury

13 files changed, 27 insertions, 25 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 2953420cb319..a9899fa4661a 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 3821a24b2d2d..1da007343b46 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.20
-PORTREVISION=	6
+PORTVERSION=	1.3.21
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 5d3879369bc3..9f9824ae8897 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.3.20.tar.bz2) = 7caf27691ec21682de1f0259c9243725db7cdeca699c40958c28aece99e4f1dc
-SIZE (GraphicsMagick-1.3.20.tar.bz2) = 7371945
+SHA256 (GraphicsMagick-1.3.21.tar.bz2) = a0ce08f2710c158e39faa083463441f6eeeecce07dbd59510498ffa4e0b053d1
+SIZE (GraphicsMagick-1.3.21.tar.bz2) = 7527643
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in
index 7c5d272c8bd3..ea31500796d9 100644
--- a/graphics/GraphicsMagick/files/patch-Makefile.in
+++ b/graphics/GraphicsMagick/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-05-18 17:22:51.000000000 -0400
-+++ Makefile.in	2008-06-06 18:41:23.620488084 -0400
-@@ -1775,7 +1775,7 @@
+--- Makefile.in.orig	2015-02-28 20:53:46 UTC
++++ Makefile.in
+@@ -2221,7 +2221,7 @@ MagickFilterModulesPath = @MagickFilterM
  MagickLibConfigPath = @MagickLibConfigPath@
  MagickLibPath = @MagickLibPath@
  MagickShareConfigPath = @MagickShareConfigPath@
@@ -9,7 +9,7 @@
  MogrifyDelegate = @MogrifyDelegate@
  NM = @NM@
  NMEDIT = @NMEDIT@
-@@ -4382,7 +4382,7 @@
+@@ -4381,7 +4381,7 @@ PERLMAGICK_MAINTAINER_TARGETS = $(top_sr
  @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick
  
  # Pkgconfig directory
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 1680e29eafa8..262023e8a38e 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2013-12-31 20:58:17.000000000 +0100
-+++ configure	2014-04-26 15:53:04.000000000 +0200
-@@ -12919,7 +12919,6 @@
+--- configure.orig	2015-02-28 20:53:46 UTC
++++ configure
+@@ -13277,7 +13277,6 @@ fi
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
      freebsd* | dragonfly*)
        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
@@ -8,7 +8,7 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        ;;
-@@ -23889,60 +23888,6 @@
+@@ -24497,60 +24496,6 @@ else
      X_CFLAGS="$X_CFLAGS -I$x_includes"
    fi
  
@@ -69,7 +69,7 @@
  
    # Check for system-dependent libraries X programs must link with.
    # Do this before checking for the system-independent R6 libraries
-@@ -24637,15 +24582,16 @@
+@@ -25245,15 +25190,16 @@ fi
      # Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build.
      # Adobe DPS (as delivered on Solaris) doesn't require -lXt.
      # GraphicsMagick itself doesn't use -lXt.
@@ -88,7 +88,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -27095,7 +27041,7 @@
+@@ -27703,7 +27649,7 @@ fi
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -97,7 +97,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
-@@ -27199,7 +27145,7 @@
+@@ -27807,7 +27753,7 @@ _ACEOF
  
  #
  # Path to GraphicsMagick share files
diff --git a/graphics/GraphicsMagick/pkg-plist b/graphics/GraphicsMagick/pkg-plist
index fbacd048e699..b15caa7f1fc0 100644
--- a/graphics/GraphicsMagick/pkg-plist
+++ b/graphics/GraphicsMagick/pkg-plist
@@ -91,16 +91,16 @@ lib/GraphicsMagick/config/type-windows.mgk
 lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.so
-lib/libGraphicsMagick++.so.3
-lib/libGraphicsMagick++.so.3.7.0
+lib/libGraphicsMagick++.so.11
+lib/libGraphicsMagick++.so.11.0.0
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.so
 lib/libGraphicsMagick.so.3
-lib/libGraphicsMagick.so.3.12.0
+lib/libGraphicsMagick.so.3.13.0
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.so
 lib/libGraphicsMagickWand.so.2
-lib/libGraphicsMagickWand.so.2.7.0
+lib/libGraphicsMagickWand.so.2.7.1
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
@@ -142,6 +142,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2014.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index ba18b38cbafc..fed8fa6260ef 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.4
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	graphics devel
 
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index f84dfdf26222..21b2ac4603a1 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=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/older_versions/ \
 		SF/${PORTNAME}/
diff --git a/graphics/pecl-gmagick/Makefile b/graphics/pecl-gmagick/Makefile
index 7994fbec43bb..0ea6376b0fff 100644
--- a/graphics/pecl-gmagick/Makefile
+++ b/graphics/pecl-gmagick/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmagick
 PORTVERSION=	1.1.7RC2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index ae4d9b595bc5..222ec4891c7d 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	vips
 PORTVERSION=	8.0.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 550a5ddea3f7..9419ea8f3d1c 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	3.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	GNU
 
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 679270fc11fa..fe7b11b74360 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${DISTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index fb8067a914d1..70fcabb8b61a 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}