xygrib: pkglint fixes for data.mk and patches

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Fri Nov 1 19:02:28 2019 +0000
Changeset:	2308b2730b924dbef03154e976e906070dac8364

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

Log Message:
xygrib: pkglint fixes for data.mk and patches

pkglint fixes for data.mk and patches.

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

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

diffstat:
 xygrib/data.mk                      | 30 +++++++++++++++++-------------
 xygrib/distinfo                     |  2 +-
 xygrib/patches/patch-CMakeLists.txt |  2 ++
 3 files changed, 20 insertions(+), 14 deletions(-)

diffs:
diff --git a/xygrib/data.mk b/xygrib/data.mk
index 505f02a4c2..031e152601 100644
--- a/xygrib/data.mk
+++ b/xygrib/data.mk
@@ -1,21 +1,25 @@
-#$NetBSD$
+# $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}
+XYGRIBDV=	1.1.1
+XYGRIBDS=	https://github.com/openGribs/XyGrib/releases/download/v${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
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+=	XyGrib___High_Resolution_Maps.tar.gz
+DISTFILES+=	XyGrib___cities_files.tar.gz
 
+SITES.XyGrib___High_Resolution_Maps.tar.gz=	${XYGRIBDS}
+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
+
+.PHONY: install-cities
 install-cities:
 .for f in ${INSTALL_CITIES_FILES}
 	${INSTALL_DATA} ${WRKDIR}/${f} \
 		${DESTDIR}${PREFIX}/share/openGribs/XyGrib/data/gis/${f}
-.endfor	
+.endfor
 post-install: install-cities
diff --git a/xygrib/distinfo b/xygrib/distinfo
index 6cb1009369..b3a3bef433 100644
--- a/xygrib/distinfo
+++ b/xygrib/distinfo
@@ -12,4 +12,4 @@ SHA1 (XyGrib-1.1.1/XyGrib___cities_files.tar.gz) = eb82eb192bb3d6d97ebb32a21fdf7
 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
+SHA1 (patch-CMakeLists.txt) = 011146a46621b1948a6d1bfae1605d769beff4df
diff --git a/xygrib/patches/patch-CMakeLists.txt b/xygrib/patches/patch-CMakeLists.txt
index c5be57bd71..d54d374848 100644
--- a/xygrib/patches/patch-CMakeLists.txt
+++ b/xygrib/patches/patch-CMakeLists.txt
@@ -1,10 +1,12 @@
 $NetBSD$
+
 * sanitze the names and dirs to search for libs and headers files
 * use PATH_SUFFIX fix to find openjpeg
 * 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)