FreeBSD Bugzilla – Attachment 205860 Details for
Bug 239217
comms/xastir Update to 2.1.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
Update to enable ImageMagick AND GraphicsMagick, but keep gm the default as it was before.
xastir-2.1.4_1.diff (text/plain), 6.89 KB, created by
carl
on 2019-07-18 10:53:45 UTC
(
hide
)
Description:
Update to enable ImageMagick AND GraphicsMagick, but keep gm the default as it was before.
Filename:
MIME Type:
Creator:
carl
Created:
2019-07-18 10:53:45 UTC
Size:
6.89 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 506655) >+++ Makefile (working copy) >@@ -3,8 +3,8 @@ > > PORTNAME= xastir > DISTVERSIONPREFIX= Release- >-DISTVERSION= 2.1.0 >-PORTREVISION= 4 >+DISTVERSION= 2.1.4 >+PORTREVISION= 1 > CATEGORIES= comms hamradio > > MAINTAINER= carl@stagecraft.cx >@@ -13,8 +13,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 +23,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,31 +39,33 @@ > > SUB_FILES= pkg-message > >-OPTIONS_DEFINE= DAVIS SHAPELIB DBFAWK MAGICK CURL GEOTIFF GDAL GPSMAN FESTIVAL \ >- RTREE ERRORPOP BDB >+OPTIONS_DEFINE= DAVIS DBFAWK CURL GEOTIFF GPSMAN \ >+ FESTIVAL ERRORPOP BDB >+OPTIONS_RADIO= MGG >+OPTIONS_RADIO_MGG= IMAGICK GMAGICK > > 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 > 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= SHAPELIB DBFAWK MAGICK CURL RTREE BDB >+OPTIONS_DEFAULT= DBFAWK GMAGICK CURL BDB > > DAVIS_CONFIGURE_ON= --enable-davis > >-SHAPELIB_LIB_DEPENDS= libshp.so:devel/shapelib >-SHAPELIB_CONFIGURE_WITH= shapelib >+IMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 >+IMAGICK_CONFIGURE_WITH= imagemagick > >-MAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick >-MAGICK_CONFIGURE_WITH= imagemagick graphicsmagick >+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 >@@ -74,9 +74,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 >@@ -84,7 +81,7 @@ > FESTIVAL_BUILD_DEPENDS= festival:audio/festival > FESTIVAL_CONFIGURE_WITH=festival > >-RTREE_CONFIGURE_WITH= rtree >+#RTREE_CONFIGURE_WITH= rtree > > ERRORPOP_CONFIGURE_WITH= errorpopups > >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: files/pkg-message.in >=================================================================== >--- files/pkg-message.in (revision 506655) >+++ files/pkg-message.in (working copy) >@@ -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. > >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 239217
:
205792
|
205860
|
205862