Attachment 189050 Details for Bug 224540 – svn based diff file for update

[patch] svn based diff file for update

xastir-2.0.8_5.diff (text/plain), 11.50 KB, created by carl on 2017-12-23 10:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: carl

Created: 2017-12-23 10:26:59 UTC

Size: 11.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 457036)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xastir
>-PORTVERSION=	2.0.6
>+PORTVERSION=	2.0.8
> PORTREVISION=	5
> CATEGORIES=	comms hamradio
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
>@@ -10,21 +10,33 @@
> MAINTAINER=	carl@stagecraft.cx
> COMMENT=	X Amateur Station Tracking and Information Reporting
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+BROKEN_sparc64=		Does not compile on sparc64
>+
> BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
> RUN_DEPENDS=	wget:ftp/wget
> LIB_DEPENDS=	libtiff.so:graphics/tiff \
>-		libpng.so:graphics/png
>+		libpng.so:graphics/png \
>+		libjbig.so:graphics/jbigkit \
>+		libwebp.so:graphics/webp \
>+		liblcms2.so:graphics/lcms2 \
>+		libfreetype.so:print/freetype2 \
>+		libjasper.so:graphics/jasper
> 
> GNU_CONFIGURE=	yes
> USES=		gettext gmake jpeg motif python:run shebangfix
>-SHEBANG_FILES=	scripts/*.pl scripts/get-maptools.sh \
>-		scripts/gpx2shape scripts/values.pl.in \
>-		scripts/Xastir_tigerpoly.py
>+USE_GCC=	yes
>+USE_XORG=	x11 xt xext sm ice
>+USE_GNOME+=	libxml2
>+SHEBANG_FILES=	scripts/gpx2shape scripts/values.pl.in
>+SHEBANG_REGEX=	scripts/.*\.(sh|pl|py)
> 
> SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=	SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
>-		    RTREE ERRORPOP BDB OPTCFLAGS
>+		RTREE ERRORPOP BDB OPTCFLAGS
> 
> SHAPELIB_DESC=	Include Shapelib support
> DBFAWK_DESC=	Include DBFAWK Support
>@@ -73,6 +85,4 @@
> 
> OPTCFLAGS_CFLAGS=	-O2 -pipe
> 
>-BROKEN_sparc64=		Does not compile on sparc64
>-
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 457036)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (xastir-2.0.6.tar.gz) = e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8eeee436c3bc8a8dd43
>-SIZE (xastir-2.0.6.tar.gz) = 2662042
>+TIMESTAMP = 1512389467
>+SHA256 (xastir-2.0.8.tar.gz) = 775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6
>+SIZE (xastir-2.0.8.tar.gz) = 2697256
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 457036)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,11 +1,11 @@
>---- Makefile.in.orig	2007-12-21 16:43:24.000000000 -0500
>-+++ Makefile.in	2007-12-21 16:43:30.000000000 -0500
>-@@ -205,7 +205,7 @@
>- libexecdir = @libexecdir@
>+--- Makefile.in.orig	2016-07-01 18:52:47 UTC
>++++ Makefile.in
>+@@ -284,7 +284,7 @@ libexecdir = @libexecdir@
>+ localedir = @localedir@
>  localstatedir = @localstatedir@
>  lpr = @lpr@
> -mandir = ${prefix}/share/man
> +mandir = @mandir@
>  mkdir_p = @mkdir_p@
>+ mv = @mv@
>  oldincludedir = @oldincludedir@
>- prefix = @prefix@
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 457036)
>+++ pkg-plist	(working copy)
>@@ -1,12 +1,11 @@
>-bin/callpass
> bin/testdbfawk
> bin/xastir
> bin/xastir_udp_client
>-man/man1/callpass.1.gz
>+bin/callpass
> man/man1/testdbfawk.1.gz
> man/man1/xastir.1.gz
> man/man1/xastir_udp_client.1.gz
>-%%DOCSDIR%%/AUTHORS
>+man/man1/callpass.1.gz
> %%DOCSDIR%%/COPYING
> %%DOCSDIR%%/COPYING.LIB.LESSTIF
> %%DOCSDIR%%/ChangeLog
>@@ -22,19 +21,24 @@
> %%DOCSDIR%%/README.OSM_maps
> %%DOCSDIR%%/README.win32
> %%DOCSDIR%%/UPGRADE
>+%%DOCSDIR%%/AUTHORS
> %%DATADIR%%/Counties/placeholder
> %%DATADIR%%/GNIS/placeholder
>-%%DATADIR%%/config/24kgrid.dbfawk
>-%%DATADIR%%/config/OSM_Cloudmade_administrative.dbfawk
> %%DATADIR%%/config/OSM_Cloudmade_highway.dbfawk
> %%DATADIR%%/config/OSM_Cloudmade_natural.dbfawk
> %%DATADIR%%/config/OSM_Cloudmade_poi.dbfawk
> %%DATADIR%%/config/OSM_Cloudmade_water_and_coastline.dbfawk
>-%%DATADIR%%/config/arealm.dbfawk
> %%DATADIR%%/config/areawater.dbfawk
> %%DATADIR%%/config/cousub.dbfawk
> %%DATADIR%%/config/cousub00.dbfawk
>-%%DATADIR%%/config/edge.dbfawk
>+%%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
>+%%DATADIR%%/config/nwsmzoddmmyy.dbfawk
>+%%DATADIR%%/config/nwsozddap12.dbfawk
>+%%DATADIR%%/config/nwsozddmmyy.dbfawk
>+%%DATADIR%%/config/nwsw_ddmmyy.dbfawk
>+%%DATADIR%%/config/nwsw_ddmmyy_09.dbfawk
>+%%DATADIR%%/config/OSM_Cloudmade_administrative.dbfawk
>+%%DATADIR%%/config/pointlm.dbfawk
> %%DATADIR%%/config/featnames.dbfawk
> %%DATADIR%%/config/gfe_coastal_waters.dbfawk
> %%DATADIR%%/config/gfe_coastal_waters_warnings.dbfawk
>@@ -46,6 +50,11 @@
> %%DATADIR%%/config/language-ElmerFudd.sys
> %%DATADIR%%/config/language-English.sys
> %%DATADIR%%/config/language-French.sys
>+%%DATADIR%%/config/nwsc_ddmmyy.dbfawk
>+%%DATADIR%%/config/nwsc_ddmmyy_09.dbfawk
>+%%DATADIR%%/config/nwsc_ddmmyy_09b.dbfawk
>+%%DATADIR%%/config/nwsc_ddmmyy_13.dbfawk
>+%%DATADIR%%/config/nwsc_ddmmyy_15.dbfawk
> %%DATADIR%%/config/language-German.sys
> %%DATADIR%%/config/language-Italian.sys
> %%DATADIR%%/config/language-MuppetsChef.sys
>@@ -54,24 +63,23 @@
> %%DATADIR%%/config/language-PirateEnglish.sys
> %%DATADIR%%/config/language-Portuguese.sys
> %%DATADIR%%/config/language-Spanish.sys
>-%%DATADIR%%/config/nwsc_ddmmyy.dbfawk
>-%%DATADIR%%/config/nwsc_ddmmyy_09.dbfawk
>-%%DATADIR%%/config/nwsc_ddmmyy_09b.dbfawk
>+%%DATADIR%%/config/tnc-startup.tnc2
>+%%DATADIR%%/config/tnc-startup.tnc2-ui
>+%%DATADIR%%/config/tnc-stop.d700
>+%%DATADIR%%/config/tnc-stop.d72_d710
>+%%DATADIR%%/config/tnc-stop.sys
>+%%DATADIR%%/config/tnc-stop.thd7
>+%%DATADIR%%/config/tnc-stop.tnc2-ui
>+%%DATADIR%%/config/xastir.rgb
> %%DATADIR%%/config/nwsc_ddmmyy_10.dbfawk
> %%DATADIR%%/config/nwsc_ddmmyy_10a.dbfawk
>-%%DATADIR%%/config/nwsc_ddmmyy_13.dbfawk
> %%DATADIR%%/config/nwshzddmmyy.dbfawk
> %%DATADIR%%/config/nwsmzddmmyy.dbfawk
> %%DATADIR%%/config/nwsmzddmmyy_09.dbfawk
>-%%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
>-%%DATADIR%%/config/nwsmzoddmmyy.dbfawk
>-%%DATADIR%%/config/nwsozddap12.dbfawk
>-%%DATADIR%%/config/nwsozddmmyy.dbfawk
>+%%DATADIR%%/config/edge.dbfawk
> %%DATADIR%%/config/nwsozddmmyy_09.dbfawk
> %%DATADIR%%/config/nwsozddmmyy_14.dbfawk
> %%DATADIR%%/config/nwsw_ddjn12.dbfawk
>-%%DATADIR%%/config/nwsw_ddmmyy.dbfawk
>-%%DATADIR%%/config/nwsw_ddmmyy_09.dbfawk
> %%DATADIR%%/config/nwsw_ddmmyy_10.dbfawk
> %%DATADIR%%/config/nwsw_ddmmyy_13.dbfawk
> %%DATADIR%%/config/nwsw_ddmmyy_14.dbfawk
>@@ -78,6 +86,14 @@
> %%DATADIR%%/config/nwsw_ddmmyy_14a.dbfawk
> %%DATADIR%%/config/nwsz1ddmmyy.dbfawk
> %%DATADIR%%/config/nwsz_ddmmyy.dbfawk
>+%%DATADIR%%/config/tl_2009_pointlm.dbfawk
>+%%DATADIR%%/config/tl_2009_zcta5.dbfawk
>+%%DATADIR%%/config/tnc-startup.d700
>+%%DATADIR%%/config/tnc-startup.paccomm
>+%%DATADIR%%/config/tnc-startup.pico
>+%%DATADIR%%/config/tnc-startup.sys
>+%%DATADIR%%/config/tnc-startup.thd7
>+%%DATADIR%%/config/24kgrid.dbfawk
> %%DATADIR%%/config/nwsz_ddmmyy_09.dbfawk
> %%DATADIR%%/config/nwsz_ddmmyy_10.dbfawk
> %%DATADIR%%/config/nwsz_ddmmyy_10b.dbfawk
>@@ -85,10 +101,16 @@
> %%DATADIR%%/config/nwsz_ddmmyy_11.dbfawk
> %%DATADIR%%/config/nwsz_ddmmyy_13.dbfawk
> %%DATADIR%%/config/nwszoddmmyy.dbfawk
>-%%DATADIR%%/config/pointlm.dbfawk
> %%DATADIR%%/config/predefined_EVENT.sys
> %%DATADIR%%/config/predefined_SAR.sys
> %%DATADIR%%/config/stored_track.dbfawk
>+%%DATADIR%%/config/tgrwat.dbfawk
>+%%DATADIR%%/config/tl_2009_aiannh.dbfawk
>+%%DATADIR%%/config/tl_2009_edges.dbfawk
>+%%DATADIR%%/config/tl_2009_mil.dbfawk
>+%%DATADIR%%/config/tl_2009_nn_county.dbfawk
>+%%DATADIR%%/config/tnc-startup.aea
>+%%DATADIR%%/config/arealm.dbfawk
> %%DATADIR%%/config/tabblock.dbfawk
> %%DATADIR%%/config/tgr2shp.dbfawk
> %%DATADIR%%/config/tgr2shppoly.dbfawk
>@@ -99,39 +121,17 @@
> %%DATADIR%%/config/tgrlpt.dbfawk
> %%DATADIR%%/config/tgrlpy.dbfawk
> %%DATADIR%%/config/tgrplc00.dbfawk
>-%%DATADIR%%/config/tgrwat.dbfawk
>-%%DATADIR%%/config/tl_2009_aiannh.dbfawk
> %%DATADIR%%/config/tl_2009_aits.dbfawk
> %%DATADIR%%/config/tl_2009_arealm.dbfawk
> %%DATADIR%%/config/tl_2009_areawater.dbfawk
> %%DATADIR%%/config/tl_2009_county.dbfawk
> %%DATADIR%%/config/tl_2009_cousub.dbfawk
>-%%DATADIR%%/config/tl_2009_edges.dbfawk
>-%%DATADIR%%/config/tl_2009_mil.dbfawk
>-%%DATADIR%%/config/tl_2009_nn_county.dbfawk
>-%%DATADIR%%/config/tl_2009_pointlm.dbfawk
>-%%DATADIR%%/config/tl_2009_zcta5.dbfawk
>-%%DATADIR%%/config/tnc-startup.aea
>-%%DATADIR%%/config/tnc-startup.d700
> %%DATADIR%%/config/tnc-startup.d72_d710
> %%DATADIR%%/config/tnc-startup.kam
> %%DATADIR%%/config/tnc-startup.kpc2
> %%DATADIR%%/config/tnc-startup.kpc3
> %%DATADIR%%/config/tnc-startup.null
>-%%DATADIR%%/config/tnc-startup.paccomm
>-%%DATADIR%%/config/tnc-startup.pico
>-%%DATADIR%%/config/tnc-startup.sys
>-%%DATADIR%%/config/tnc-startup.thd7
>-%%DATADIR%%/config/tnc-startup.tnc2
>-%%DATADIR%%/config/tnc-startup.tnc2-ui
>-%%DATADIR%%/config/tnc-stop.d700
>-%%DATADIR%%/config/tnc-stop.d72_d710
>-%%DATADIR%%/config/tnc-stop.sys
>-%%DATADIR%%/config/tnc-stop.thd7
>-%%DATADIR%%/config/tnc-stop.tnc2-ui
>-%%DATADIR%%/config/xastir.rgb
> %%DATADIR%%/fcc/placeholder
>-%%DATADIR%%/help/help-Dutch.dat
> %%DATADIR%%/help/help-English.dat
> %%DATADIR%%/help/help-French.dat
> %%DATADIR%%/help/help-German.dat
>@@ -138,34 +138,21 @@
> %%DATADIR%%/help/help-Italian.dat
> %%DATADIR%%/help/help-Portuguese.dat
> %%DATADIR%%/help/help-Spanish.dat
>-%%DATADIR%%/maps/CC_OpenStreetMap.png
>+%%DATADIR%%/help/help-Dutch.dat
> %%DATADIR%%/maps/CC_OpenStreetMap_logo.png
> %%DATADIR%%/maps/CC_OpenStreetMap_txt.png
>+%%DATADIR%%/maps/worldhi.map
> %%DATADIR%%/maps/GPS/placeholder
>-%%DATADIR%%/maps/Online/CanadaTopo250k.geo
>-%%DATADIR%%/maps/Online/CanadaTopo50k.geo
>-%%DATADIR%%/maps/Online/OSM_cloudmade_1.geo
>-%%DATADIR%%/maps/Online/OSM_cloudmade_2.geo
>-%%DATADIR%%/maps/Online/OSM_cloudmade_5.geo
>-%%DATADIR%%/maps/Online/OSM_cloudmade_998.geo
>-%%DATADIR%%/maps/Online/OSM_cloudmade_999.geo
>+%%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
>+%%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
>+%%DATADIR%%/maps/Online/OSM_tiled_mapquest-aerial.geo
>+%%DATADIR%%/maps/Online/OSM_tiled_mapquest.geo
> %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_osmarender.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_skiing.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_0_relief.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_1_contour.geo
>-%%DATADIR%%/maps/Online/OSM_tiled_topOSM_2_features.geo
>-%%DATADIR%%/maps/Online/TXRadar.geo
>-%%DATADIR%%/maps/Online/USRadar.geo
>-%%DATADIR%%/maps/Online/WMSRadar.geo
>-%%DATADIR%%/maps/Online/terraserver-reflectivity.geo
>-%%DATADIR%%/maps/Online/terraserver-topo.geo
>-%%DATADIR%%/maps/Online/terraserver-urban.geo
>-%%DATADIR%%/maps/Online/terraserver.geo
>-%%DATADIR%%/maps/worldhi.map
>-%%DATADIR%%/scripts/Coordinate.pm
>+%%DATADIR%%/maps/CC_OpenStreetMap.png
> %%DATADIR%%/scripts/Xastir_tigerpoly.py
>+%%DATADIR%%/scripts/ads-b.pl
>+%%DATADIR%%/scripts/ais.pl
>+%%DATADIR%%/scripts/ais_pp.pl
> %%DATADIR%%/scripts/coord-convert.pl
> %%DATADIR%%/scripts/geopdf2gtiff.pl
> %%DATADIR%%/scripts/get-BOMdata
>@@ -172,9 +159,7 @@
> %%DATADIR%%/scripts/get-NWSdata
> %%DATADIR%%/scripts/get-fcc-rac.pl
> %%DATADIR%%/scripts/get-gnis
>-%%DATADIR%%/scripts/get-maptools.sh
> %%DATADIR%%/scripts/get-pop
>-%%DATADIR%%/scripts/get_shapelib.sh
> %%DATADIR%%/scripts/gpx2shape
> %%DATADIR%%/scripts/icontable.pl
> %%DATADIR%%/scripts/inf2geo.pl
>@@ -184,6 +169,7 @@
> %%DATADIR%%/scripts/langOldeEnglish.pl
> %%DATADIR%%/scripts/langPigLatin.pl
> %%DATADIR%%/scripts/langPirateEnglish.pl
>+%%DATADIR%%/scripts/Coordinate.pm
> %%DATADIR%%/scripts/mapblast2geo.pl
> %%DATADIR%%/scripts/mapfgd.pl
> %%DATADIR%%/scripts/object2shp.pl
>@@ -206,7 +192,6 @@
> %%DATADIR%%/scripts/xastir-fixcfg.sh
> %%DATADIR%%/scripts/xastir-migrate.sh
> %%DATADIR%%/sounds/placeholder
>-%%DATADIR%%/symbols/13pct.xbm
> %%DATADIR%%/symbols/25pct.xbm
> %%DATADIR%%/symbols/2x2.xbm
> %%DATADIR%%/symbols/alert.xbm
>@@ -219,3 +204,4 @@
> %%DATADIR%%/symbols/wind.xbm
> %%DATADIR%%/symbols/winter_storm.xbm
> %%DATADIR%%/symbols/winter_weather.xbm
>+%%DATADIR%%/symbols/13pct.xbm

Actions: View | Diff

Attachments on bug 224540: 189050