Attachment 205792 Details for Bug 239217 – svn diff update from 2.1.0 to 2.1.4

[patch] svn diff update from 2.1.0 to 2.1.4

xastir-2.1.4.diff (text/plain), 5.59 KB, created by carl on 2019-07-15 10:25:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: carl

Created: 2019-07-15 10:25:09 UTC

Size: 5.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 506655)
>+++ Makefile	(working copy)
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	xastir
> DISTVERSIONPREFIX=	Release-
>-DISTVERSION=	2.1.0
>-PORTREVISION=	4
>+DISTVERSION=	2.1.4
> CATEGORIES=	comms hamradio
> 
> MAINTAINER=	carl@stagecraft.cx
>@@ -13,8 +12,6 @@
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN=		magick/image-private.h: No such file or directory
>-
> BUILD_DEPENDS=	xfontsel:x11-fonts/xfontsel
> RUN_DEPENDS=	wget:ftp/wget
> LIB_DEPENDS=	libtiff.so:graphics/tiff \
>@@ -25,14 +22,14 @@
> 		liblcms2.so:graphics/lcms2 \
> 		libfreetype.so:print/freetype2 \
> 		libjasper.so:graphics/jasper \
>-		libwmflite.so:graphics/libwmf
>+		libwmflite.so:graphics/libwmf \
>+		libshp.so:devel/shapelib
> 
> GNU_CONFIGURE=	yes
> USES=		gettext gmake jpeg motif python:run shebangfix
>-USE_GCC=	yes
> USE_XORG=	x11 xt xext sm ice
> USE_GNOME+=	libxml2
>-SHEBANG_FILES=	scripts/gpx2shape scripts/values.pl.in
>+SHEBANG_FILES=	scripts/gpx2shape
> SHEBANG_REGEX=	./scripts/.*\.(sh|pl|py)
> 
> USE_GITHUB=	yes
>@@ -41,16 +38,14 @@
> 
> SUB_FILES=	pkg-message
> 
>-OPTIONS_DEFINE=	DAVIS SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \
>+OPTIONS_DEFINE=	DAVIS DBFAWK MAGICK CURL GEOTIFF GPSMAN FESTIVAL \
> 		RTREE ERRORPOP BDB
> 
> DAVIS_DESC=	Include Davis Weatherstation Support
>-SHAPELIB_DESC=	Include Shapelib support
> DBFAWK_DESC=	Include DBFAWK Support
> MAGICK_DESC=	Include GraphicsMagick Support
> CURL_DESC=	Include CURL Internet Image support
> GEOTIFF_DESC=	Include GeoTIFF Support
>-GDAL_DESC=	Include GDAL Support
> GPSMAN_DESC=	Include GPSMAN Support
> FESTIVAL_DESC=	Include Festival Voice Synthesis Support
> RTREE_DESC=	Enable spatial indexing of shapefiles
>@@ -57,15 +52,13 @@
> ERRORPOP_DESC=	Send error popups to stderr
> BDB_DESC=	Tiger Map Caching using Berkeley DB
> 
>-OPTIONS_DEFAULT=	SHAPELIB DBFAWK MAGICK CURL RTREE BDB
>+OPTIONS_DEFAULT=	DBFAWK MAGICK CURL RTREE BDB
> 
> DAVIS_CONFIGURE_ON=	--enable-davis
> 
>-SHAPELIB_LIB_DEPENDS=	libshp.so:devel/shapelib
>-SHAPELIB_CONFIGURE_WITH=	shapelib
>-
> MAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
>-MAGICK_CONFIGURE_WITH=	imagemagick graphicsmagick
>+MAGICK_CONFIGURE_WITH=	graphicsmagick
>+MAGICK_USES=		compiler:gcc-c++11-lib
> 
> DBFAWK_LIB_DEPENDS=	libpcre.so:devel/pcre
> DBFAWK_CONFIGURE_WITH=	dbfawk
>@@ -74,9 +67,6 @@
> 
> GEOTIFF_LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff
> 
>-GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
>-GDAL_CONFIGURE_WITH=	gdal
>-
> GPSMAN_BUILD_DEPENDS=	${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp
> GPSMAN_IMPLIES=		SHAPELIB
> GPSMAN_CONFIGURE_WITH=	gpsman
>Index: distinfo
>===================================================================
>--- distinfo	(revision 506655)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519518726
>-SHA256 (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = a481e6a6c035954041904352ec58f52240c06874a30dfb810001da489d40f43a
>-SIZE (Xastir-Xastir-Release-2.1.0_GH0.tar.gz) = 2996246
>+TIMESTAMP = 1563174412
>+SHA256 (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 0bd3768440422a666e1c4c532df0184374244b77ae6650e6690715a0ca1fe7bc
>+SIZE (Xastir-Xastir-Release-2.1.4_GH0.tar.gz) = 2694124
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 506655)
>+++ pkg-plist	(working copy)
>@@ -64,6 +64,7 @@
> %%DATADIR%%/config/nwsc_ddmmyy_13.dbfawk
> %%DATADIR%%/config/nwsc_ddmmyy_15.dbfawk
> %%DATADIR%%/config/nwshzddmmyy.dbfawk
>+%%DATADIR%%/config/nwshzddmmyy_old14.dbfawk
> %%DATADIR%%/config/nwsmzddmmyy.dbfawk
> %%DATADIR%%/config/nwsmzddmmyy_09.dbfawk
> %%DATADIR%%/config/nwsmzddmmyy_11.dbfawk
>@@ -74,6 +75,7 @@
> %%DATADIR%%/config/nwsozddmmyy.dbfawk
> %%DATADIR%%/config/nwsozddmmyy_09.dbfawk
> %%DATADIR%%/config/nwsozddmmyy_14.dbfawk
>+%%DATADIR%%/config/nwsozddmmyy_14b.dbfawk
> %%DATADIR%%/config/nwsw_ddjn12.dbfawk
> %%DATADIR%%/config/nwsw_ddmmyy.dbfawk
> %%DATADIR%%/config/nwsw_ddmmyy_09.dbfawk
>@@ -151,17 +153,17 @@
> %%DATADIR%%/maps/Online/OSM_tiled_cycle.geo
> %%DATADIR%%/maps/Online/OSM_tiled_fosm.geo
> %%DATADIR%%/maps/Online/OSM_tiled_mapnik.geo
>+%%DATADIR%%/maps/Online/USTigermap.geo
>+%%DATADIR%%/maps/Online/USTigermapBorders.geo
> %%DATADIR%%/maps/Online/geogratis.gc.ca/National.geo
> %%DATADIR%%/maps/Online/geogratis.gc.ca/Regional.geo
> %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_national.geo
> %%DATADIR%%/maps/Online/geogratis.gc.ca/Sub_regional.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/Aerial.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/Contours.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/Hydrography.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/ShadedRelief.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/Topo1-10.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/TopoRelief1-7.geo
>-%%DATADIR%%/maps/Online/nationalmap.gov/Transportation.geo
>+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Hydrography.geo
>+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryOnly.geo
>+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ImageryTopo.geo
>+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_ShadedReliefOnly.geo
>+%%DATADIR%%/maps/Online/nationalmap.gov/WMS_USGS_Topo.geo
> %%DATADIR%%/maps/worldhi.map
> %%DATADIR%%/scripts/Coordinate.pm
> %%DATADIR%%/scripts/Xastir_tigerpoly.py
>@@ -200,13 +202,9 @@
> %%DATADIR%%/scripts/toporama50k.pl
> %%DATADIR%%/scripts/track-get.pl
> %%DATADIR%%/scripts/update_langfile.pl
>-%%DATADIR%%/scripts/values
>-%%DATADIR%%/scripts/values.pl
> %%DATADIR%%/scripts/waypoint-get.pl
> %%DATADIR%%/scripts/wms.pl
> %%DATADIR%%/scripts/wxnowsrv.pl
>-%%DATADIR%%/scripts/xastir-fixcfg.sh
>-%%DATADIR%%/scripts/xastir-migrate.sh
> %%DATADIR%%/sounds/placeholder
> %%DATADIR%%/symbols/13pct.xbm
> %%DATADIR%%/symbols/25pct.xbm

Actions: View | Diff

Attachments on bug 239217: 205792 | 205860 | 205862