svn commit: r366831 - head/graphics/GraphicsMagick

[Adam Weinberger]

Author: adamw
Date: Sun Aug 31 21:48:41 2014
New Revision: 366831
URL: http://svnweb.freebsd.org/changeset/ports/366831
QAT: https://qat.redports.org/buildarchive/r366831/

Log:
  Update to 1.3.20.
  
  While here, fix up the OPTIONS. X11 was used as an option and as a
  category name, which made it very confusing what you could and
  could not select. Fix this by simply telling the user they have to
  enable X11 to get DPS.
  
  Also, I have removed DPS from OPTIONS_DEFAULT. It brings in gtk12 and
  frankly that is ridiculous in 2014.
  
  I'm not touching the mysterious reassignment of CXX after <bsd.port.post.mk>
  with a ten foot pole.

Modified:
  head/graphics/GraphicsMagick/Makefile
  head/graphics/GraphicsMagick/distinfo
  head/graphics/GraphicsMagick/pkg-plist

Modified: head/graphics/GraphicsMagick/Makefile
==============================================================================
--- head/graphics/GraphicsMagick/Makefile	Sun Aug 31 21:27:28 2014	(r366830)
+++ head/graphics/GraphicsMagick/Makefile	Sun Aug 31 21:48:41 2014	(r366831)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.19
-PORTREVISION=	2
+PORTVERSION=	1.3.20
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
@@ -21,8 +20,6 @@ LIB_DEPENDS=	libjbig.so:${PORTSDIR}/grap
 		libtiff.so:${PORTSDIR}/graphics/tiff		\
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*
-
 PORTSCOUT=	limit:^1\.3\.
 
 USES=		iconv libtool tar:bzip2
@@ -40,15 +37,10 @@ PLIST_SUB=	Q="${QD}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=		DOCS FPX OPENMP Q8BIT SSE TESTS WEBP X11
-OPTIONS_SINGLE=		X11
-OPTIONS_SINGLE_X11=	DPS
-OPTIONS_DEFAULT=	DPS OPENMP WEBP X11
-
-DPS_DESC=		Enable Display Ghostscript support
-DPS_LIB_DEPENDS=	libdps.so:${PORTSDIR}/x11/dgs
-DPS_USE=		XORG=xt
-DPS_CONFIGURE_WITH=	dps
+OPTIONS_DEFINE=		DOCS DPS FPX OPENMP Q8BIT SSE TESTS WEBP X11
+OPTIONS_DEFAULT=	OPENMP WEBP X11
+
+DPS_DESC=		Display Ghostscript support (must also select X11)
 FPX_LIB_DEPENDS+=	libfpx.so.[2-9]:${PORTSDIR}/graphics/libfpx
 FPX_CONFIGURE_WITH=	fpx
 OPENMP_USES=		compiler:openmp
@@ -66,6 +58,14 @@ X11_CONFIGURE_WITH=	x
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MX11} && ${PORT_OPTIONS:MDPS}
+LIB_DEPENDS+=	libdps.so:${PORTSDIR}/x11/dgs
+USE_XORG=	xt
+CONFIGURE_ARGS+=--with-dps
+.else
+CONFIGURE_ARGS+=--without-dps
+.endif
+
 .if ${PORT_OPTIONS:MQ8BIT}
 QD=		8
 .else

Modified: head/graphics/GraphicsMagick/distinfo
==============================================================================
--- head/graphics/GraphicsMagick/distinfo	Sun Aug 31 21:27:28 2014	(r366830)
+++ head/graphics/GraphicsMagick/distinfo	Sun Aug 31 21:48:41 2014	(r366831)
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.3.19.tar.bz2) = b57cdeb1ab9492b667776bbbc265149eda5601d2c572d65f43b44273e892fff1
-SIZE (GraphicsMagick-1.3.19.tar.bz2) = 7252296
+SHA256 (GraphicsMagick-1.3.20.tar.bz2) = 7caf27691ec21682de1f0259c9243725db7cdeca699c40958c28aece99e4f1dc
+SIZE (GraphicsMagick-1.3.20.tar.bz2) = 7371945

Modified: head/graphics/GraphicsMagick/pkg-plist
==============================================================================
--- head/graphics/GraphicsMagick/pkg-plist	Sun Aug 31 21:27:28 2014	(r366830)
+++ head/graphics/GraphicsMagick/pkg-plist	Sun Aug 31 21:48:41 2014	(r366831)
@@ -95,15 +95,15 @@ lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.so
 lib/libGraphicsMagick++.so.3
-lib/libGraphicsMagick++.so.3.6.3
+lib/libGraphicsMagick++.so.3.7.0
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.so
 lib/libGraphicsMagick.so.3
-lib/libGraphicsMagick.so.3.11.1
+lib/libGraphicsMagick.so.3.12.0
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.so
 lib/libGraphicsMagickWand.so.2
-lib/libGraphicsMagickWand.so.2.6.1
+lib/libGraphicsMagickWand.so.2.7.0
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
@@ -129,6 +129,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2010
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2011
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2012
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2013
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
@@ -143,6 +144,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2010.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2011.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2012.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2013.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changes.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
@@ -242,6 +244,7 @@ man/man5/quantize.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/www/color.html
 %%PORTDOCS%%%%DOCSDIR%%/www/compare.html
 %%PORTDOCS%%%%DOCSDIR%%/www/composite.html
+%%PORTDOCS%%%%DOCSDIR%%/www/configure-target-setup.png
 %%PORTDOCS%%%%DOCSDIR%%/www/conjure.html
 %%PORTDOCS%%%%DOCSDIR%%/www/contribute.html
 %%PORTDOCS%%%%DOCSDIR%%/www/convert.html