4 files changed, 42 insertions, 91 deletions

diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 3e2fb2ec5994..dc75d6a1e591 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -2,37 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.16
-PORTREVISION=	1
+PORTVERSION=	1.3.18
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
 MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
-PORTSCOUT=	limit:^1\.3\.
 PKGNAMESUFFIX=	13
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2	\
+		libpng15.so:${PORTSDIR}/graphics/png		\
+		libjbig.so:${PORTSDIR}/graphics/jbigkit		\
+		libjasper.so:${PORTSDIR}/graphics/jasper	\
+		libjpeg.so:${PORTSDIR}/graphics/jpeg		\
+		liblcms.so:${PORTSDIR}/graphics/lcms		\
+		libtiff.so:${PORTSDIR}/graphics/tiff		\
+		libxml2.so:${PORTSDIR}/textproc/libxml2
 
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
-		png15:${PORTSDIR}/graphics/png		\
-		jbig:${PORTSDIR}/graphics/jbigkit	\
-		xml2:${PORTSDIR}/textproc/libxml2
-OTHERGRAPHICS=	jasper jpeg lcms tiff
-LIB_DEPENDS+=	${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
+CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*
 
 OPTIONS_DEFINE=	Q8BIT FPX OPENMP SSE TESTS X11 DOCS
 
 Q8BIT_DESC=	Use 8-bit pixels (speed) instead of 16 (quality)
 DPS_DESC=	Enable Display Ghostscript support
-NODPS_DESC=	Disable Display Ghostscript support
 TESTS_DESC=	Run bundled self-tests after build
 
 OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
 OPTIONS_SINGLE=	X11
-OPTIONS_SINGLE_X11=	DPS NODPS
+OPTIONS_SINGLE_X11=	DPS
+
+PORTSCOUT=	limit:^1\.3\.
 
 USES=		iconv
 USE_AUTOTOOLS=	libtool libltdl
@@ -40,13 +41,6 @@ USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
 
-MAN1=	GraphicsMagick++-config.1 \
-	GraphicsMagick-config.1 \
-	GraphicsMagickWand-config.1 \
-	gm.1
-MAN4=	miff.4
-MAN5=	quantize.5
-
 CONFIGURE_ARGS=	--without-perl --enable-shared --enable-static \
 		--with-ltdl-include=${LOCALBASE}/include \
 		--with-ltdl-lib=${LOCALBASE}/lib
@@ -57,9 +51,8 @@ ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 test check:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.options.mk>
 
@@ -82,14 +75,14 @@ CFLAGS+=	-msse3
 .endif
 
 .if ${PORT_OPTIONS:MFPX}
-LIB_DEPENDS+=		fpx.[2-9]:${PORTSDIR}/graphics/libfpx
+LIB_DEPENDS+=		libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
 .else
 CONFIGURE_ARGS+=	--without-fpx
 .endif
 
 .if ${PORT_OPTIONS:MDPS}
-LIB_DEPENDS+=		dps:${PORTSDIR}/x11/dgs
+LIB_DEPENDS+=		libdps.so:${PORTSDIR}/x11/dgs
 CONFIGURE_ARGS+=	--with-dps
 .else
 CONFIGURE_ARGS+=	--without-dps
@@ -117,18 +110,19 @@ CONFIGURE_ARGS+=	--with-windows-font-dir="${WINDOWS_FONT_DIR}"
 
 .if ${PORT_OPTIONS:MX11} == ""
 CONFIGURE_ARGS+=--without-x
-LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf-nox11
+LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11
 .else
-LIB_DEPENDS+=	wmflite:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=	libwmflite.so:${PORTSDIR}/graphics/libwmf
 .endif
 
 .if ${PORT_OPTIONS:MQ8BIT}
 CONFIGURE_ARGS+=	--with-quantum-depth=8
-PLIST_SUB+=		Q=8
+QD=			8
 .else
 CONFIGURE_ARGS+=	--with-quantum-depth=16
-PLIST_SUB+=		Q=16
+QD=			16
 .endif
+PLIST_SUB+=		Q=${QD}
 
 .if ${PORT_OPTIONS:MTESTS}
 post-build::	test
@@ -140,4 +134,8 @@ post-build::
 	#
 .endif
 
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/coders	\
+		${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q${QD}/filters
+
 .include <bsd.port.mk>
diff --git a/graphics/GraphicsMagick13/distinfo b/graphics/GraphicsMagick13/distinfo
index 4b42e947f937..e721d21a065f 100644
--- a/graphics/GraphicsMagick13/distinfo
+++ b/graphics/GraphicsMagick13/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.3.16.tar.bz2) = 2845bfcd53b0ea57755f21aac80df3becfa7d37ac50c6f67387f004d67d58d83
-SIZE (GraphicsMagick-1.3.16.tar.bz2) = 7328861
+SHA256 (GraphicsMagick-1.3.18.tar.bz2) = 768b89a685d29b0e463ade21bc0649f2727800ebc5a8e13fa6fc17ccb9da769b
+SIZE (GraphicsMagick-1.3.18.tar.bz2) = 7259418
diff --git a/graphics/GraphicsMagick13/files/patch-coders__png.c b/graphics/GraphicsMagick13/files/patch-coders__png.c
deleted file mode 100644
index e5b81843dd5f..000000000000
--- a/graphics/GraphicsMagick13/files/patch-coders__png.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- ./coders/png.c.orig	2012-06-23 16:10:10.000000000 -0400
-+++ ./coders/png.c	2012-09-25 17:43:57.000000000 -0400
-@@ -1360,7 +1360,11 @@
- }
- 
- #ifdef PNG_USER_MEM_SUPPORTED
--static png_voidp png_IM_malloc(png_structp png_ptr,png_uint_32 size)
-+#if PNG_LIBPNG_VER >= 14000
-+static png_voidp png_IM_malloc(png_structp png_ptr,png_alloc_size_t size)
-+#else
-+static png_voidp png_IM_malloc(png_structp png_ptr,png_size_t size)
-+#endif
- {
-   (void) png_ptr;
-   return MagickAllocateMemory(png_voidp,(size_t) size);
-@@ -6169,12 +6173,22 @@
-       (void) printf("writing raw profile: type=%.1024s, length=%lu\n",
-                     profile_type, (unsigned long)length);
-     }
--  text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
-+#if PNG_LIBPNG_VER >= 14000
-+  text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
-+#else
-+  text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
-+#endif
-   description_length=strlen((const char *) profile_description);
-   allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
-                                   + description_length);
--  text[0].text=(png_charp) png_malloc(ping,allocated_length);
--  text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
-+#if PNG_LIBPNG_VER >= 14000
-+   text[0].text=(png_charp) png_malloc(ping,
-+      (png_alloc_size_t) allocated_length);
-+   text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
-+#else
-+   text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
-+   text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
-+#endif
-   text[0].key[0]='\0';
-   (void) strcat(text[0].key, "Raw profile type ");
-   (void) strncat(text[0].key, (const char *) profile_type, 61);
-@@ -7620,7 +7634,12 @@
- 
-       if (*attribute->key == '[')
-         continue;
--      text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
-+#if PNG_LIBPNG_VER >= 14000
-+            text=(png_textp) png_malloc(ping,
-+                 (png_alloc_size_t) sizeof(png_text));
-+#else
-+            text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
-+#endif
-       text[0].key=attribute->key;
-       text[0].text=attribute->value;
-       text[0].text_length=strlen(attribute->value);
diff --git a/graphics/GraphicsMagick13/pkg-plist b/graphics/GraphicsMagick13/pkg-plist
index 91ded55cfaa1..ed858d7716b7 100644
--- a/graphics/GraphicsMagick13/pkg-plist
+++ b/graphics/GraphicsMagick13/pkg-plist
@@ -83,6 +83,7 @@ include/GraphicsMagick/wand/drawing_wand.h
 include/GraphicsMagick/wand/magick_wand.h
 include/GraphicsMagick/wand/pixel_wand.h
 include/GraphicsMagick/wand/wand_api.h
+include/GraphicsMagick/wand/wand_symbols.h
 lib/GraphicsMagick/config/delegates.mgk
 lib/GraphicsMagick/config/type-ghostscript.mgk
 lib/GraphicsMagick/config/type-solaris.mgk
@@ -95,14 +96,20 @@ lib/libGraphicsMagick++.so.9
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.la
 lib/libGraphicsMagick.so
-lib/libGraphicsMagick.so.12
+lib/libGraphicsMagick.so.14
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.la
 lib/libGraphicsMagickWand.so
-lib/libGraphicsMagickWand.so.7
+lib/libGraphicsMagickWand.so.8
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
+man/man1/GraphicsMagick++-config.1.gz
+man/man1/GraphicsMagick-config.1.gz
+man/man1/GraphicsMagickWand-config.1.gz
+man/man1/gm.1.gz
+man/man4/miff.4.gz
+man/man5/quantize.5.gz
 %%DATADIR%%/config/colors.mgk
 %%DATADIR%%/config/log.mgk
 %%DATADIR%%/config/modules.mgk
@@ -118,6 +125,7 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2009
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2010
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2011
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2012
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
@@ -131,6 +139,7 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2009.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2010.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
@@ -145,18 +154,15 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ChangeLog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/CoderInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Color.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Enumerations.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Exception.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/FormatCharacters.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Future.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Geometry.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageDesign.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Install.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Montage.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/PixelPacket.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Pixels.html
@@ -226,6 +232,8 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/types.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html
 %%PORTDOCS%%%%DOCSDIR%%/www/authors.html
+%%PORTDOCS%%%%DOCSDIR%%/www/batch.html
+%%PORTDOCS%%%%DOCSDIR%%/www/benchmark.html
 %%PORTDOCS%%%%DOCSDIR%%/www/benchmarks.html
 %%PORTDOCS%%%%DOCSDIR%%/www/bugs.html
 %%PORTDOCS%%%%DOCSDIR%%/www/color.html
@@ -265,8 +273,10 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
 %%PORTDOCS%%%%DOCSDIR%%/www/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/www/smile.c
+%%PORTDOCS%%%%DOCSDIR%%/www/time.html
 %%PORTDOCS%%%%DOCSDIR%%/www/tools.html
 %%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
+%%PORTDOCS%%%%DOCSDIR%%/www/version.html
 %%PORTDOCS%%%%DOCSDIR%%/www/wand/drawing_wand.html
 %%PORTDOCS%%%%DOCSDIR%%/www/wand/magick_wand.html
 %%PORTDOCS%%%%DOCSDIR%%/www/wand/pixel_wand.html
@@ -289,5 +299,3 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 @dirrm include/GraphicsMagick/magick
 @dirrm include/GraphicsMagick/Magick++
 @dirrm include/GraphicsMagick
-@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/filters
-@exec mkdir -p %D/lib/GraphicsMagick/modules-Q%%Q%%/coders