Date: Wed, 9 Mar 2016 17:57:06 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410717 - head/astro/viking Message-ID: <201603091757.u29Hv6Et004335@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Mar 9 17:57:05 2016 New Revision: 410717 URL: https://svnweb.freebsd.org/changeset/ports/410717 Log: - Update to 1.6.2 - Fix license - Make mapnik support optional PR: 207249 Submitted by: amdmi3 Approved by: maitainer timeout (koalative@gmail.com, 3 weeks) Modified: head/astro/viking/Makefile head/astro/viking/distinfo head/astro/viking/pkg-plist Modified: head/astro/viking/Makefile ============================================================================== --- head/astro/viking/Makefile Wed Mar 9 17:54:08 2016 (r410716) +++ head/astro/viking/Makefile Wed Mar 9 17:57:05 2016 (r410717) @@ -2,43 +2,41 @@ # $FreeBSD$ PORTNAME= viking -PORTVERSION= 1.6 +PORTVERSION= 1.6.2 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/ MAINTAINER= koalative@gmail.com COMMENT= Program to manage GPS data (tracks, waypoints, etc.) -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \ - libmapnik.so:${PORTSDIR}/graphics/mapnik \ libpcre.so:${PORTSDIR}/devel/pcre \ libpng.so:${PORTSDIR}/graphics/png \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel -USES= gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2 +USES= compiler:c++11-lib gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2 USE_XORG= pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \ xfixes xi xinerama xrandr xrender USE_GNOME= cairo gnomedocutils gtk20 intlhack USE_PERL5= run GNU_CONFIGURE= yes INSTALLS_ICONS= yes -INSTALLS_OMF= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread PORTDOCS= AUTHORS ChangeLog NEWS README -OPTIONS_DEFINE= DOCS GEOCACHES NLS GEOTAG GPSD -OPTIONS_DEFAULT= GEOTAG GPSD JOSM +OPTIONS_DEFINE= DOCS GEOCACHES NLS GEOTAG GPSD MAPNIK MBTILES +OPTIONS_DEFAULT= GEOTAG GPSD JOSM MAPNIK MBTILES OPTIONS_MULTI= OpenStreetMap-Editor OPTIONS_MULTI_OpenStreetMap-Editor= JOSM MERKAATOR @@ -46,6 +44,8 @@ OPTIONS_MULTI_OpenStreetMap-Editor= JOSM GEOCACHES_DESC= GeoCaches Acquire support GEOTAG_DESC= Geotag support GPSD_DESC= Realtime GPS tracking +MAPNIK_DESC= Mapnik support +MBTILES_DESC= MBTiles support JOSM_DESC= Edit OpenStreetMap via JOSM MERKAATOR_DESC= Edit OpenStreetMap via Merkaartor @@ -63,6 +63,12 @@ GEOTAG_CONFIGURE_ENABLE=geotag GPSD_LIB_DEPENDS= libgpsd.so:${PORTSDIR}/astro/gpsd GPSD_CONFIGURE_ENABLE= realtime-gps-tracking +MAPNIK_LIB_DEPENDS= libmapnik.so:${PORTSDIR}/graphics/mapnik +MAPNIK_CONFIGURE_ENABLE= mapnik + +MBTILES_USES= sqlite +MBTILES_CONFIGURE_ENABLE= mbtiles + JOSM_RUN_DEPENDS= josm:${PORTSDIR}/astro/josm MERKAATOR_RUN_DEPENDS= merkaartor:${PORTSDIR}/astro/merkaartor @@ -75,6 +81,7 @@ post-install: ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/astro/viking/distinfo ============================================================================== --- head/astro/viking/distinfo Wed Mar 9 17:54:08 2016 (r410716) +++ head/astro/viking/distinfo Wed Mar 9 17:57:05 2016 (r410717) @@ -1,2 +1,2 @@ -SHA256 (viking-1.6.tar.bz2) = 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a -SIZE (viking-1.6.tar.bz2) = 3060389 +SHA256 (viking-1.6.2.tar.bz2) = dfe223b1cd3a1fed3616a70e732321db9013c89df3fd6e1ad0f733a1bb067826 +SIZE (viking-1.6.2.tar.bz2) = 3324897 Modified: head/astro/viking/pkg-plist ============================================================================== --- head/astro/viking/pkg-plist Wed Mar 9 17:54:08 2016 (r410716) +++ head/astro/viking/pkg-plist Wed Mar 9 17:57:05 2016 (r410717) @@ -1,45 +1,8 @@ bin/viking share/applications/viking.desktop -share/gnome/help/viking/C/attribution.xml -share/gnome/help/viking/C/commandline.xml -share/gnome/help/viking/C/figures/DEM_file_info_dialog.png -share/gnome/help/viking/C/figures/LayersTracksList.png -share/gnome/help/viking/C/figures/LayersTracksStatistics.png -share/gnome/help/viking/C/figures/Maps_download_region_dialog.png -share/gnome/help/viking/C/figures/Track_elevation_graph.png -share/gnome/help/viking/C/figures/Track_properties.png -share/gnome/help/viking/C/figures/Track_statistics.png -share/gnome/help/viking/C/figures/Trackpoint_edit_dialog.png -share/gnome/help/viking/C/figures/Viking-OSM-CycleMap-ManyTracks.jpg -share/gnome/help/viking/C/figures/WaypointsList.png -share/gnome/help/viking/C/figures/addtr_18.png -share/gnome/help/viking/C/figures/addwp_18.png -share/gnome/help/viking/C/figures/customize_toolbar_dialog.png -share/gnome/help/viking/C/figures/demdl_18.png -share/gnome/help/viking/C/figures/edtr_18.png -share/gnome/help/viking/C/figures/edwp_18.png -share/gnome/help/viking/C/figures/geomove_18.png -share/gnome/help/viking/C/figures/geozoom_18.png -share/gnome/help/viking/C/figures/map_tile_info_dialog.png -share/gnome/help/viking/C/figures/mapdl_18.png -share/gnome/help/viking/C/figures/mover_22.png -share/gnome/help/viking/C/figures/properties_degree.png -share/gnome/help/viking/C/figures/properties_units.png -share/gnome/help/viking/C/figures/route_finder_18.png -share/gnome/help/viking/C/figures/ruler_18.png -share/gnome/help/viking/C/figures/select_18.png -share/gnome/help/viking/C/figures/showpic_18.png -share/gnome/help/viking/C/figures/trw_statusbar.png -share/gnome/help/viking/C/figures/vik_new_route_18.png -share/gnome/help/viking/C/figures/zoom_18.png -share/gnome/help/viking/C/figures/zoom_status_popup.png -share/gnome/help/viking/C/georef_layer.xml -share/gnome/help/viking/C/legal.xml -share/gnome/help/viking/C/mapnik_rendering_layer.xml -share/gnome/help/viking/C/recommends.xml -share/gnome/help/viking/C/viking.xml share/icons/hicolor/48x48/apps/viking.png %%NLS%%share/locale/ast/LC_MESSAGES/viking.mo +%%NLS%%share/locale/ca/LC_MESSAGES/viking.mo %%NLS%%share/locale/cs/LC_MESSAGES/viking.mo %%NLS%%share/locale/da/LC_MESSAGES/viking.mo %%NLS%%share/locale/de/LC_MESSAGES/viking.mo @@ -66,12 +29,13 @@ share/icons/hicolor/48x48/apps/viking.pn %%NLS%%share/locale/sk/LC_MESSAGES/viking.mo %%NLS%%share/locale/sl/LC_MESSAGES/viking.mo %%NLS%%share/locale/sv/LC_MESSAGES/viking.mo +%%NLS%%share/locale/tr/LC_MESSAGES/viking.mo %%NLS%%share/locale/uk/LC_MESSAGES/viking.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/viking.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/viking.mo -share/omf/viking/viking-C.omf share/pixmaps/viking.png +%%DATADIR%%/datasources.xml %%DATADIR%%/external_tools.xml %%DATADIR%%/goto_tools.xml -%%DATADIR%%/maps.xml %%DATADIR%%/latlontz.txt +%%DATADIR%%/maps.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603091757.u29Hv6Et004335>