Index: Makefile
===================================================================
--- Makefile	(revision 506848)
+++ Makefile	(working copy)
@@ -4,6 +4,7 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
@@ -38,28 +39,34 @@
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DAVIS DBFAWK MAGICK CURL GEOTIFF GPSMAN FESTIVAL \
-		RTREE ERRORPOP BDB
+OPTIONS_DEFINE=	DAVIS DBFAWK CURL GEOTIFF GPSMAN \
+		FESTIVAL ERRORPOP BDB
+OPTIONS_RADIO=	MGG
+OPTIONS_RADIO_MGG=	IMAGICK GMAGICK
 
 DAVIS_DESC=	Include Davis Weatherstation Support
 DBFAWK_DESC=	Include DBFAWK Support
-MAGICK_DESC=	Include GraphicsMagick Support
 CURL_DESC=	Include CURL Internet Image support
 GEOTIFF_DESC=	Include GeoTIFF Support
 GPSMAN_DESC=	Include GPSMAN Support
 FESTIVAL_DESC=	Include Festival Voice Synthesis Support
-RTREE_DESC=	Enable spatial indexing of shapefiles
 ERRORPOP_DESC=	Send error popups to stderr
 BDB_DESC=	Tiger Map Caching using Berkeley DB
+MGG_DESC=	Image library for raster map processing
+IMAGICK_DESC=	ImageMagick (Version 6)
+GMAGICK_DESC=	GraphicsMagick (Needs GCC to compile)
 
-OPTIONS_DEFAULT=	DBFAWK MAGICK CURL RTREE BDB
+OPTIONS_DEFAULT=	DBFAWK GMAGICK CURL BDB
 
 DAVIS_CONFIGURE_ON=	--enable-davis
 
-MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
-MAGICK_CONFIGURE_WITH=	graphicsmagick
-MAGICK_USES=		compiler:gcc-c++11-lib
+IMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+IMAGICK_CONFIGURE_WITH=	imagemagick
 
+GMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
+GMAGICK_CONFIGURE_WITH=	graphicsmagick
+GMAGICK_USES=		compiler:gcc-c++11-lib
+
 DBFAWK_LIB_DEPENDS=	libpcre.so:devel/pcre
 DBFAWK_CONFIGURE_WITH=	dbfawk
 
@@ -74,7 +81,7 @@
 FESTIVAL_BUILD_DEPENDS=	festival:audio/festival
 FESTIVAL_CONFIGURE_WITH=festival
 
-RTREE_CONFIGURE_WITH=	rtree
+#RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 506848)
+++ files/pkg-message.in	(working copy)
@@ -1,13 +1,6 @@
 ********************************************************************
 Xastir is now installed.
 
-**** Important ****
-If you are upgrading from v2.0.0 and using the
-"TNC with GPS on AUX port" interface then unless you have a KPC-3+ TNC
-or other TNC that requires a Control-E to be sent to receive GPS data
-you will need to deselect "Send Control-E to receive GPS data?" in
-the interface properties.  D700s and similar do NOT need this setting.
-
 Hop on over to http://www.xastir.org/ for details on getting
 maps and for more information on using Xastir.