pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xygrib: add installation of detailed maps and city data files

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Thu Oct 31 20:21:26 2019 +0000
Changeset:	5b1a789c594d9c59df0058023f9bccdcd2f7074f

Modified Files:
	xygrib/Makefile
	xygrib/PLIST
	xygrib/distinfo
	xygrib/patches/patch-CMakeLists.txt
Added Files:
	xygrib/data.mk

Log Message:
xygrib: add installation of detailed maps and city data files

Install detailed maps and city files when installing xygrib.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5b1a789c594d9c59df0058023f9bccdcd2f7074f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xygrib/Makefile                     |  3 ++-
 xygrib/PLIST                        | 13 +++++++++++++
 xygrib/data.mk                      | 21 +++++++++++++++++++++
 xygrib/distinfo                     | 18 +++++++++++++-----
 xygrib/patches/patch-CMakeLists.txt |  4 +++-
 5 files changed, 52 insertions(+), 7 deletions(-)

diffs:
diff --git a/xygrib/Makefile b/xygrib/Makefile
index 6db2093ccf..69f928fc66 100644
--- a/xygrib/Makefile
+++ b/xygrib/Makefile
@@ -5,7 +5,6 @@ GITHUB_TAG=	v${PKGVERSION_NOREV}
 DISTNAME=	XyGrib-1.2.6.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=opengribs/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
 EXTRACT_USING=	bsdtar
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -13,6 +12,8 @@ HOMEPAGE=	https://opengribs.org/
 COMMENT=	GRIB file viewer for weather data
 LICENSE=	gnu-gpl-v3
 
+.include "data.mk"
+
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 
diff --git a/xygrib/PLIST b/xygrib/PLIST
index 8090ba81e0..02e8276a10 100644
--- a/xygrib/PLIST
+++ b/xygrib/PLIST
@@ -41,7 +41,10 @@ share/openGribs/XyGrib/data/fonts/liberation-fonts/LiberationSerif-Italic.ttf
 share/openGribs/XyGrib/data/fonts/liberation-fonts/LiberationSerif-Regular.ttf
 share/openGribs/XyGrib/data/fonts/liberation-fonts/License.txt
 share/openGribs/XyGrib/data/fonts/liberation-fonts/README
+share/openGribs/XyGrib/data/gis/cities_0-300.txt.gz
 share/openGribs/XyGrib/data/gis/cities_10k-more.txt.gz
+share/openGribs/XyGrib/data/gis/cities_1k-3k.txt.gz
+share/openGribs/XyGrib/data/gis/cities_300-1k.txt.gz
 share/openGribs/XyGrib/data/gis/cities_3k-10k.txt.gz
 share/openGribs/XyGrib/data/gis/countries_en.txt.gz
 share/openGribs/XyGrib/data/gis/countries_fr.txt.gz
@@ -105,9 +108,15 @@ share/openGribs/XyGrib/data/img/xyGrib_32.ico
 share/openGribs/XyGrib/data/img/xyGrib_32.xpm
 share/openGribs/XyGrib/data/maps/gshhs/README.gshhs
 share/openGribs/XyGrib/data/maps/gshhs/README.gshhs.rangs
+share/openGribs/XyGrib/data/maps/gshhs/gshhs_0.rim
+share/openGribs/XyGrib/data/maps/gshhs/gshhs_1.rim
 share/openGribs/XyGrib/data/maps/gshhs/gshhs_2.rim
 share/openGribs/XyGrib/data/maps/gshhs/gshhs_3.rim
 share/openGribs/XyGrib/data/maps/gshhs/gshhs_4.rim
+share/openGribs/XyGrib/data/maps/gshhs/rangs_0.cat
+share/openGribs/XyGrib/data/maps/gshhs/rangs_0.cel
+share/openGribs/XyGrib/data/maps/gshhs/rangs_1.cat
+share/openGribs/XyGrib/data/maps/gshhs/rangs_1.cel
 share/openGribs/XyGrib/data/maps/gshhs/rangs_2.cat
 share/openGribs/XyGrib/data/maps/gshhs/rangs_2.cel
 share/openGribs/XyGrib/data/maps/gshhs/rangs_3.cat
@@ -115,9 +124,13 @@ share/openGribs/XyGrib/data/maps/gshhs/rangs_3.cel
 share/openGribs/XyGrib/data/maps/gshhs/rangs_4.cat
 share/openGribs/XyGrib/data/maps/gshhs/rangs_4.cel
 share/openGribs/XyGrib/data/maps/gshhs/wdb_borders_c.b
+share/openGribs/XyGrib/data/maps/gshhs/wdb_borders_f.b
+share/openGribs/XyGrib/data/maps/gshhs/wdb_borders_h.b
 share/openGribs/XyGrib/data/maps/gshhs/wdb_borders_i.b
 share/openGribs/XyGrib/data/maps/gshhs/wdb_borders_l.b
 share/openGribs/XyGrib/data/maps/gshhs/wdb_rivers_c.b
+share/openGribs/XyGrib/data/maps/gshhs/wdb_rivers_f.b
+share/openGribs/XyGrib/data/maps/gshhs/wdb_rivers_h.b
 share/openGribs/XyGrib/data/maps/gshhs/wdb_rivers_i.b
 share/openGribs/XyGrib/data/maps/gshhs/wdb_rivers_l.b
 share/openGribs/XyGrib/data/tr/xyGrib_ar.qm
diff --git a/xygrib/data.mk b/xygrib/data.mk
new file mode 100644
index 0000000000..505f02a4c2
--- /dev/null
+++ b/xygrib/data.mk
@@ -0,0 +1,21 @@
+#$NetBSD$
+#
+XYGRIBDV=1.1.1
+XYGRIBDS=https://github.com/openGribs/XyGrib/releases/download/v${XYGRIBDV}/
+DISTFILES=${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=XyGrib___High_Resolution_Maps.tar.gz
+SITES.XyGrib___High_Resolution_Maps.tar.gz=${XYGRIBDS}
+DISTFILES+=XyGrib___cities_files.tar.gz
+SITES.XyGrib___cities_files.tar.gz=${XYGRIBDS}
+DIST_SUBDIR=XyGrib-${XYGRIBDV}
+
+INSTALL_CITIES_FILES=  cities_0-300.txt.gz
+INSTALL_CITIES_FILES+= cities_300-1k.txt.gz
+INSTALL_CITIES_FILES+= cities_1k-3k.txt.gz
+
+install-cities:
+.for f in ${INSTALL_CITIES_FILES}
+	${INSTALL_DATA} ${WRKDIR}/${f} \
+		${DESTDIR}${PREFIX}/share/openGribs/XyGrib/data/gis/${f}
+.endfor	
+post-install: install-cities
diff --git a/xygrib/distinfo b/xygrib/distinfo
index a7da17d41d..6cb1009369 100644
--- a/xygrib/distinfo
+++ b/xygrib/distinfo
@@ -1,7 +1,15 @@
 $NetBSD$
 
-SHA1 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 8e3431ed6a5ef114d77ac57029129a26a381f696
-RMD160 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 876e8a53b492b2e2ea0572e5b0cd31a2c04f505a
-SHA512 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 33c8a0fc6791dbe3342524555dc90362560fed08b4e2a624111167d92e2c71890dcb5bfe7e85d7df2ffc11a382ea5afa484cdab84c29935d4be2e673c76a371c
-Size (XyGrib/XyGrib-1.2.6.1.tar.gz) = 14704088 bytes
-SHA1 (patch-CMakeLists.txt) = 45164582f0fd449adc4c86c1fbb98d8104da530b
+SHA1 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 8e3431ed6a5ef114d77ac57029129a26a381f696
+RMD160 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 876e8a53b492b2e2ea0572e5b0cd31a2c04f505a
+SHA512 (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 33c8a0fc6791dbe3342524555dc90362560fed08b4e2a624111167d92e2c71890dcb5bfe7e85d7df2ffc11a382ea5afa484cdab84c29935d4be2e673c76a371c
+Size (XyGrib-1.1.1/XyGrib-1.2.6.1.tar.gz) = 14704088 bytes
+SHA1 (XyGrib-1.1.1/XyGrib___High_Resolution_Maps.tar.gz) = 7849cd9361757ae89c48f0e74ce340c7faf15015
+RMD160 (XyGrib-1.1.1/XyGrib___High_Resolution_Maps.tar.gz) = a0c82dfc09db8cb466c7bc7d396e7a62cb77b4fd
+SHA512 (XyGrib-1.1.1/XyGrib___High_Resolution_Maps.tar.gz) = 42d1f938ade119ab73cb8da7b2fe4758a4288a869e8fbb2974c0f2fe8e4418af826a2cc0dbf282e0a30cf814fc3ea18dccda2ff6b6c2ab62e6d0e1ea1916c909
+Size (XyGrib-1.1.1/XyGrib___High_Resolution_Maps.tar.gz) = 103284692 bytes
+SHA1 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = eb82eb192bb3d6d97ebb32a21fdf7737bb640f94
+RMD160 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 1c47e3af9884e1a927b1e717f938178f12a17fa8
+SHA512 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 6bb9362c87fec7633b0ad1fd3b8717408c0fffa36631db1d1a680928c724e8e49758c292cac164ad7a9773fd51a432d25628eecbaa1261f5f3c5ab6fc499fd01
+Size (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = 2487518 bytes
+SHA1 (patch-CMakeLists.txt) = f6c5740e9724b0c1f5ed933b3d2b9b303472fa25
diff --git a/xygrib/patches/patch-CMakeLists.txt b/xygrib/patches/patch-CMakeLists.txt
index d5c69e3196..c5be57bd71 100644
--- a/xygrib/patches/patch-CMakeLists.txt
+++ b/xygrib/patches/patch-CMakeLists.txt
@@ -4,6 +4,7 @@ $NetBSD$
 * install bins and data into the right directory
 * don't install cmake files in the translation directory
 * install icon and desktop files
+* install hi-res maps
 --- CMakeLists.txt.orig	2019-07-05 09:01:01.000000000 +0000
 +++ CMakeLists.txt
 @@ -54,71 +54,23 @@ find_package(Qt5Xml CONFIG REQUIRED)
@@ -94,7 +95,7 @@ $NetBSD$
  endif()
  
  add_subdirectory(src)
-@@ -241,4 +194,13 @@ set_target_properties(${PROJECT_NAME} PR
+@@ -241,4 +194,14 @@ set_target_properties(${PROJECT_NAME} PR
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}")
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors")
  # Install data
@@ -109,3 +110,4 @@ $NetBSD$
 +        DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
 +install(FILES debian/xygrib.png
 +	DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pixmaps)
++install(DIRECTORY ../data/ DESTINATION ${PREFIX_PKGDATA})
Home | Main Index | Thread Index | Old Index