comms/xastir: put back ImageMagick/GraphicsMagick choice

While here, improve formatting

PR:		239217
Submitted by:	carl@stagecraft.cx (maintainer)

2 files changed, 30 insertions, 28 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 494ad2f9c837..13a1ad49c066 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -4,6 +4,7 @@
 PORTNAME=	xastir
 DISTVERSIONPREFIX=	Release-
 DISTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	carl@stagecraft.cx
@@ -14,21 +15,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
 RUN_DEPENDS=	wget:ftp/wget
-LIB_DEPENDS=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		libjasper.so:graphics/jasper \
 		libjbig.so:graphics/jbigkit \
+		liblcms2.so:graphics/lcms2 \
+		libpng.so:graphics/png \
+		libshp.so:devel/shapelib \
+		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libwebpmux.so:graphics/webp \
-		liblcms2.so:graphics/lcms2 \
-		libfreetype.so:print/freetype2 \
-		libjasper.so:graphics/jasper \
-		libwmflite.so:graphics/libwmf \
-		libshp.so:devel/shapelib
+		libwmflite.so:graphics/libwmf
 
-GNU_CONFIGURE=	yes
 USES=		gettext gmake jpeg motif python:run shebangfix
-USE_XORG=	x11 xt xext sm ice
+
+USE_XORG=	ice sm x11 xext xt
 USE_GNOME+=	libxml2
+GNU_CONFIGURE=	yes
+
 SHEBANG_FILES=	scripts/gpx2shape
 SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
 
@@ -38,27 +41,32 @@ GH_PROJECT=	Xastir
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DAVIS DBFAWK MAGICK CURL GEOTIFF GPSMAN FESTIVAL \
-		RTREE ERRORPOP BDB
+OPTIONS_DEFINE=		BDB CURL DAVIS DBFAWK ERRORPOP FESTIVAL GEOTIFF GPSMAN
+OPTIONS_RADIO=		MGG
+OPTIONS_RADIO_MGG=	GMAGICK IMAGICK
 
 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=	BDB CURL DBFAWK GMAGICK
 
 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
@@ -71,14 +79,15 @@ GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gp
 GPSMAN_IMPLIES=		SHAPELIB
 GPSMAN_CONFIGURE_WITH=	gpsman
 
-FESTIVAL_BUILD_DEPENDS=	festival:audio/festival
-FESTIVAL_CONFIGURE_WITH=festival
+FESTIVAL_BUILD_DEPENDS=		festival:audio/festival
+FESTIVAL_CONFIGURE_WITH=	festival
 
-RTREE_CONFIGURE_WITH=	rtree
+#RTREE_CONFIGURE_WITH=	rtree
 
 ERRORPOP_CONFIGURE_WITH=	errorpopups
 
 BDB_USES=		bdb
-BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} --with-bdb-libdir=${BDB_LIB_DIR}
+BDB_CONFIGURE_ON=	--with-bdb-incdir=${BDB_INCLUDE_DIR} \
+			--with-bdb-libdir=${BDB_LIB_DIR}
 
 .include <bsd.port.mk>
diff --git a/comms/xastir/files/pkg-message.in b/comms/xastir/files/pkg-message.in
index 97fe2c5b2f03..98d87f8f1db9 100644
--- a/comms/xastir/files/pkg-message.in
+++ b/comms/xastir/files/pkg-message.in
@@ -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.