--- /usr/ports/comms/xastir/Makefile	Sun Oct 15 11:44:23 2006
+++ xastir/Makefile	Sun Nov  5 22:38:15 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xastir
-PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTVERSION=	1.8.4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
@@ -34,6 +33,7 @@
 		DBFAWK "Include DBFAWK Support" On \
 		MAGICK "Include ImageMagick Support" On \
 		CURL "Include CURL Internet Image support" On \
+		GEOTIFF "Include GeoTIFF Support" Off \
 		GDAL "Include GDAL Support" Off \
 		GPSMAN "Include GPSMAN Support" Off \
 		FESTIVAL "Include Festival Voice Synthesis Support" Off \
@@ -47,20 +47,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FESTIVAL)
-RUN_DEPENDS+=	festival:${PORTSDIR}/audio/festival
-.else
-CONFIGURE_ARGS+=	--without-festival
-.endif
-
-.if defined(WITH_GPSMAN)
-RUN_DEPENDS+=	gpsmanshp:${PORTSDIR}/graphics/gpsmanshp
-WITH_SHAPELIB=	true
-.undef WITHOUT_SHAPELIB
-.else
-CONFIGURE_ARGS+=	--without-gpsman
-.endif
-
 .if defined(WITHOUT_SHAPELIB)
 CONFIGURE_ARGS+=	--without-shapelib
 .else
@@ -89,10 +75,28 @@
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .endif
 
+.if defined(WITH_GEOTIFF)
+LIB_DEPENDS+=	geotiff:${PORTSDIR}/graphics/libgeotiff
+.endif
+
 .if defined(WITH_GDAL)
 LIB_DEPENDS+=	gdal:${PORTSDIR}/graphics/gdal
 .else
 CONFIGURE_ARGS+=	--without-gdal
+.endif
+
+.if defined(WITH_GPSMAN)
+BUILD_DEPENDS+=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:${PORTSDIR}/graphics/gpsmanshp
+WITH_SHAPELIB=	true
+.undef WITHOUT_SHAPELIB
+.else
+CONFIGURE_ARGS+=	--without-gpsman
+.endif
+
+.if defined(WITH_FESTIVAL)
+BUILD_DEPENDS+=	festival:${PORTSDIR}/audio/festival
+.else
+CONFIGURE_ARGS+=	--without-festival
 .endif
 
 .if defined(WITH_RTREE)
--- /usr/ports/comms/xastir/distinfo	Sun Jul 16 12:24:43 2006
+++ xastir/distinfo	Sun Nov  5 18:43:29 2006
@@ -1,3 +1,3 @@
-MD5 (xastir-1.8.2.tar.gz) = 77b2c60cd59de17c2caccb13f95d4993
-SHA256 (xastir-1.8.2.tar.gz) = 6530851830801a331ea5fb874e3e00211994b7b6754f6396b38f6d3d649478d7
-SIZE (xastir-1.8.2.tar.gz) = 1642849
+MD5 (xastir-1.8.4.tar.gz) = 10fcf7a63b0696ab6fefc40f1a80fd1d
+SHA256 (xastir-1.8.4.tar.gz) = 2c020dd4bbea8d8b6f7773ab6b1327f9c8252e4e3dbf384e200b4531a51b80fc
+SIZE (xastir-1.8.4.tar.gz) = 1685220