ports/118886: Maintainer-Update: comms/xastir

[Carl Makin]

>Number:         118886
>Category:       ports
>Synopsis:       Maintainer-Update: comms/xastir
>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:   Thu Dec 20 11:20:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Carl Makin
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD brain.stagecraft.cx 6.2-STABLE FreeBSD 6.2-STABLE #3: Wed Nov 7 18:25:20 EST 2007 carl at brain.stagecraft.cx:/usr/obj/usr/src/sys/BRAIN i386


	
>Description:
This diff updates Xastir from 1.8.4 to 1.9.2.

>How-To-Repeat:
	
>Fix:

	

--- xastir192.diff begins here ---
--- /usr/ports/comms/xastir/Makefile	2007-05-20 06:00:59.000000000 +1000
+++ xastir/Makefile	2007-12-20 17:38:23.000000000 +1100
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xastir
-PORTVERSION=	1.8.4
-PORTREVISION=	2
+PORTVERSION=	1.9.2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
@@ -26,10 +25,12 @@
 USE_GETTEXT=	yes
 
 MAN1=		xastir.1
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 
 SUB_FILES=	pkg-message
 
 OPTIONS=	SHAPELIB "Include Shapelib support" On \
+		INCSHAPE "Use Shapelib included with Xastir" On \
 		PCRE "Include Perl Compat Regular Expression Support" On \
 		DBFAWK "Include DBFAWK Support" On \
 		MAGICK "Include ImageMagick Support" On \
@@ -48,16 +49,19 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_SHAPELIB)
-CONFIGURE_ARGS+=	--without-shapelib
-.else
+.if defined(WITH_SHAPELIB) && defined(WITH_INCSHAPE)
+CONFIGURE_ARGS+=	--with-internal-shapelib
+.elif defined(WITH_SHAPELIB)
 LIB_DEPENDS+=	shp.1:${PORTSDIR}/devel/shapelib
+.else
+CONFIGURE_ARGS+=	--without-shapelib
 .endif
 
 .if defined(WITHOUT_MAGICK)
-CONFIGURE_ARGS+=	--without-imagemagick
+CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
 .else
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+CONFIGURE_ARGS+=	--without-graphicsmagick
 .endif
 
 .if defined(WITHOUT_DBFAWK)
--- /usr/ports/comms/xastir/pkg-plist	2006-07-15 08:01:56.000000000 +1000
+++ xastir/pkg-plist	2007-12-20 20:52:56.000000000 +1100
@@ -29,6 +29,20 @@
 lib/xastir/waypoint-get.pl
 lib/xastir/xastir-fixcfg.sh
 lib/xastir/xastir-migrate.sh
+share/doc/xastir/AUTHORS
+share/doc/xastir/COPYING
+share/doc/xastir/COPYING.LIB.LESSTIF
+share/doc/xastir/ChangeLog
+share/doc/xastir/FAQ
+share/doc/xastir/INSTALL
+share/doc/xastir/LICENSE
+share/doc/xastir/README
+share/doc/xastir/README.CVS
+share/doc/xastir/README.Contributing
+share/doc/xastir/README.Getting-Started
+share/doc/xastir/README.MAPS
+share/doc/xastir/README.win32
+share/doc/xastir/UPGRADE
 %%DATADIR%%/Counties/placeholder
 %%DATADIR%%/GNIS/placeholder
 %%DATADIR%%/config/24kgrid.dbfawk
@@ -49,8 +63,10 @@
 %%DATADIR%%/config/nwszoddmmyy.dbfawk
 %%DATADIR%%/config/predefined_EVENT.sys
 %%DATADIR%%/config/predefined_SAR.sys
+%%DATADIR%%/config/stored_track.dbfawk
 %%DATADIR%%/config/tgr2shp.dbfawk
 %%DATADIR%%/config/tgr2shppoly.dbfawk
+%%DATADIR%%/config/tgr2shppoly_2006.dbfawk
 %%DATADIR%%/config/tgrcty.dbfawk
 %%DATADIR%%/config/tgrkgl.dbfawk
 %%DATADIR%%/config/tgrlk.dbfawk
@@ -75,19 +91,6 @@
 %%DATADIR%%/config/tnc-stop.thd7
 %%DATADIR%%/config/tnc-stop.tnc2-ui
 %%DATADIR%%/config/xastir.rgb
-%%DATADIR%%/doc/AUTHORS
-%%DATADIR%%/doc/COPYING
-%%DATADIR%%/doc/ChangeLog
-%%DATADIR%%/doc/FAQ
-%%DATADIR%%/doc/INSTALL
-%%DATADIR%%/doc/LICENSE
-%%DATADIR%%/doc/README
-%%DATADIR%%/doc/README.CVS
-%%DATADIR%%/doc/README.Contributing
-%%DATADIR%%/doc/README.Getting-Started
-%%DATADIR%%/doc/README.MAPS
-%%DATADIR%%/doc/README.win32
-%%DATADIR%%/doc/UPGRADE
 %%DATADIR%%/fcc/placeholder
 %%DATADIR%%/help/help-Dutch.dat
 %%DATADIR%%/help/help-English.dat
@@ -107,6 +110,7 @@
 %%DATADIR%%/maps/Online/terraserver-urban.geo
 %%DATADIR%%/maps/Online/terraserver.geo
 %%DATADIR%%/maps/Online/tigermap.geo
+%%DATADIR%%/maps/worldhi.map
 %%DATADIR%%/sounds/placeholder
 %%DATADIR%%/symbols/13pct.xbm
 %%DATADIR%%/symbols/25pct.xbm
@@ -127,9 +131,9 @@
 @dirrm %%DATADIR%%/maps
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/fcc
- at dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/GNIS
 @dirrm %%DATADIR%%/Counties
 @dirrm %%DATADIR%%
+ at dirrm share/doc/xastir
 @dirrm lib/xastir
--- /usr/ports/comms/xastir/distinfo	2006-12-11 09:06:20.000000000 +1100
+++ xastir/distinfo	2007-12-20 17:39:44.000000000 +1100
@@ -1,3 +1,3 @@
-MD5 (xastir-1.8.4.tar.gz) = 10fcf7a63b0696ab6fefc40f1a80fd1d
-SHA256 (xastir-1.8.4.tar.gz) = 2c020dd4bbea8d8b6f7773ab6b1327f9c8252e4e3dbf384e200b4531a51b80fc
-SIZE (xastir-1.8.4.tar.gz) = 1685220
+MD5 (xastir-1.9.2.tar.gz) = 8608afa8f8f0c441a37ba72aeeccdcac
+SHA256 (xastir-1.9.2.tar.gz) = 4fb9ebc84113a504c8c08c563e7f0f5a53688f9aa144c8f21ecd41bc65db0e10
+SIZE (xastir-1.9.2.tar.gz) = 2253001
--- xastir192.diff ends here ---


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