ports/169172: [MAINTAINER UPDATE] comms/xastir - Fix build issue

[Carl Makin]

>Number:         169172
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] comms/xastir - Fix build issue
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 17 05:40:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Carl Makin
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD ferb 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	

HDRI has been enabled by default on ImageMagick.  This breaks Xastir badly as it
assumes QuantumDepth is an integer.

>How-To-Repeat:
	
>Fix:

	

This fix below removes ImageMagick from the build and defaults to GraphicsMagick which still works.


--- Makefile.diff begins here ---
--- /usr/ports/comms/xastir/Makefile	2012-06-01 15:16:45.000000000 +1000
+++ Makefile	2012-06-14 20:52:14.000000000 +1000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	2.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
@@ -34,8 +34,7 @@
 
 OPTIONS=	SHAPELIB "Include Shapelib support" On \
 		DBFAWK "Include DBFAWK Support" On \
-		MAGICK "Include [Image|Graphics]Magick Support" On \
-		GRAPHICK "Use GraphicsMagick instead of ImageMagick" Off \
+		MAGICK "Include GraphicsMagick Support" On \
 		CURL "Include CURL Internet Image support" On \
 		GEOTIFF "Include GeoTIFF Support" Off \
 		GDAL "Include GDAL Support" Off \
@@ -57,12 +56,7 @@
 .if defined(WITHOUT_MAGICK)
 CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
 .else
-.if defined(WITH_GRAPHICK)
 LIB_DEPENDS+=	GraphicsMagickWand.7:${PORTSDIR}/graphics/GraphicsMagick13
-.else
-LIB_DEPENDS+=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick
-CONFIGURE_ARGS+=	--without-graphicsmagick
-.endif
 .endif
 
 .if defined(WITHOUT_DBFAWK)
--- Makefile.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: