Mon Mar 1 01:06:30 2021 UTC ()
geography/qgis: tidy per pkglint

Add bl3 for hicolor-icon-theme.
Add patch comment


(gdt)
diff -r1.109 -r1.110 pkgsrc/geography/qgis/Makefile
diff -r1.21 -r1.22 pkgsrc/geography/qgis/distinfo
diff -r1.2 -r1.3 pkgsrc/geography/qgis/patches/patch-cmake_FindQwt.cmake
cvs diff -r1.109 -r1.110 pkgsrc/geography/qgis/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/qgis/Makefile 2021/03/01 00:03:35 1.109
+++ pkgsrc/geography/qgis/Makefile 2021/03/01 01:06:30 1.110
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.109 2021/03/01 00:03:35 gdt Exp $ 1# $NetBSD: Makefile,v 1.110 2021/03/01 01:06:30 gdt Exp $
2 2
3# This is intentionally 3.16 Long Term Release. Please do not update 3# This is intentionally 3.16 Long Term Release. Please do not update
4# to later branches, and instead discuss whether/how we want multiple 4# to later branches, and instead discuss whether/how we want multiple
5# versions. 5# versions.
6DISTNAME= qgis-3.16.4 6DISTNAME= qgis-3.16.4
7CATEGORIES= geography 7CATEGORIES= geography
8MASTER_SITES= https://qgis.org/downloads/ 8MASTER_SITES= https://qgis.org/downloads/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= gdt@NetBSD.org 11MAINTAINER= gdt@NetBSD.org
12#MAINTAINER+= brook@nmsu.edu 12#MAINTAINER+= brook@nmsu.edu
13#MAINTAINER+= bouyer@NetBSD.orrg 13#MAINTAINER+= bouyer@NetBSD.orrg
14HOMEPAGE= http://www.qgis.org/ 14HOMEPAGE= http://www.qgis.org/
@@ -65,26 +65,27 @@ CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR} @@ -65,26 +65,27 @@ CMAKE_ARGS+= -DQWT_DIR=${QWT_DIR}
65 65
66CONFIGURE_DIRS= build 66CONFIGURE_DIRS= build
67CMAKE_ARG_PATH= .. 67CMAKE_ARG_PATH= ..
68 68
69pre-configure: 69pre-configure:
70 ${MKDIR} ${WRKSRC}/build 70 ${MKDIR} ${WRKSRC}/build
71 71
72.include "../../archivers/libzip/buildlink3.mk" 72.include "../../archivers/libzip/buildlink3.mk"
73##.include "../../devel/qjson/buildlink3.mk" 73##.include "../../devel/qjson/buildlink3.mk"
74.include "../../devel/protobuf/buildlink3.mk" 74.include "../../devel/protobuf/buildlink3.mk"
75.include "../../geography/gdal-lib/buildlink3.mk" 75.include "../../geography/gdal-lib/buildlink3.mk"
76.include "../../geography/proj/buildlink3.mk" 76.include "../../geography/proj/buildlink3.mk"
77.include "../../graphics/exiv2/buildlink3.mk" 77.include "../../graphics/exiv2/buildlink3.mk"
 78.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
78.include "../../graphics/tiff/buildlink3.mk" 79.include "../../graphics/tiff/buildlink3.mk"
79.include "../../math/gsl/buildlink3.mk" 80.include "../../math/gsl/buildlink3.mk"
80.include "../../textproc/expat/buildlink3.mk" 81.include "../../textproc/expat/buildlink3.mk"
81.include "../../www/fcgi/buildlink3.mk" 82.include "../../www/fcgi/buildlink3.mk"
82.include "../../databases/sqlite3/buildlink3.mk" 83.include "../../databases/sqlite3/buildlink3.mk"
83.include "../../geography/libspatialite/buildlink3.mk" 84.include "../../geography/libspatialite/buildlink3.mk"
84.include "../../geography/spatialindex/buildlink3.mk" 85.include "../../geography/spatialindex/buildlink3.mk"
85.include "../../security/qca2-qt5/buildlink3.mk" 86.include "../../security/qca2-qt5/buildlink3.mk"
86.include "../../security/qt5-qtkeychain/buildlink3.mk" 87.include "../../security/qt5-qtkeychain/buildlink3.mk"
87.include "../../x11/qt5-qtbase/buildlink3.mk" 88.include "../../x11/qt5-qtbase/buildlink3.mk"
88.include "../../x11/qt5-qttools/buildlink3.mk" 89.include "../../x11/qt5-qttools/buildlink3.mk"
89.include "../../x11/qwt6-qt5/buildlink3.mk" 90.include "../../x11/qwt6-qt5/buildlink3.mk"
90.include "../../x11/qt5-qscintilla/buildlink3.mk" 91.include "../../x11/qt5-qscintilla/buildlink3.mk"
cvs diff -r1.21 -r1.22 pkgsrc/geography/qgis/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/qgis/distinfo 2021/03/01 00:03:35 1.21
+++ pkgsrc/geography/qgis/distinfo 2021/03/01 01:06:30 1.22
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.21 2021/03/01 00:03:35 gdt Exp $ 1$NetBSD: distinfo,v 1.22 2021/03/01 01:06:30 gdt Exp $
2 2
3SHA1 (qgis-3.16.4.tar.bz2) = cb412270b74b7b54e7b9c668b6db15a326c0aca4 3SHA1 (qgis-3.16.4.tar.bz2) = cb412270b74b7b54e7b9c668b6db15a326c0aca4
4RMD160 (qgis-3.16.4.tar.bz2) = ddbc056edf32224c5d154f8652a31e7557aa8fcb 4RMD160 (qgis-3.16.4.tar.bz2) = ddbc056edf32224c5d154f8652a31e7557aa8fcb
5SHA512 (qgis-3.16.4.tar.bz2) = a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25 5SHA512 (qgis-3.16.4.tar.bz2) = a58ef90089416ac08ba014f483cf7f6f929ef97306e213a5d1855fe551ecc42631926f8e015134ebcbc368f134c9f3ed8f2fda1846a409f249ed00b104036d25
6Size (qgis-3.16.4.tar.bz2) = 115427023 bytes 6Size (qgis-3.16.4.tar.bz2) = 115427023 bytes
7SHA1 (patch-cmake_FindQwt.cmake) = 4e1320601c1149dabf63b624e61f5783ff09f17c 7SHA1 (patch-cmake_FindQwt.cmake) = c07cb250727d0d9f4abe76e1118d896552a1bd68
8SHA1 (patch-mac_CMakeLists.txt) = 8e52ca943d44392939d0fcf083ba2681a7d77c53 8SHA1 (patch-mac_CMakeLists.txt) = 8e52ca943d44392939d0fcf083ba2681a7d77c53
9SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6 9SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
10SHA1 (patch-src_core_CMakeLists.txt) = 818d36e9dbbd31a46471de185d489ebbdbafe71d 10SHA1 (patch-src_core_CMakeLists.txt) = 818d36e9dbbd31a46471de185d489ebbdbafe71d
11SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145 11SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
12SHA1 (patch-src_crssync_CMakeLists.txt) = 785d820fec76d046c87297bd71ea547a83c4ac2a 12SHA1 (patch-src_crssync_CMakeLists.txt) = 785d820fec76d046c87297bd71ea547a83c4ac2a
cvs diff -r1.2 -r1.3 pkgsrc/geography/qgis/patches/patch-cmake_FindQwt.cmake (expand / switch to unified diff)

--- pkgsrc/geography/qgis/patches/patch-cmake_FindQwt.cmake 2021/03/01 00:03:35 1.2
+++ pkgsrc/geography/qgis/patches/patch-cmake_FindQwt.cmake 2021/03/01 01:06:30 1.3
@@ -1,14 +1,19 @@ @@ -1,14 +1,19 @@
1$NetBSD: patch-cmake_FindQwt.cmake,v 1.2 2021/03/01 00:03:35 gdt Exp $ 1$NetBSD: patch-cmake_FindQwt.cmake,v 1.3 2021/03/01 01:06:30 gdt Exp $
 2
 3Force pkgsrc path only rather than looking in a large number of random
 4places.
 5
 6Not yet reported upstream.
2 7
3--- cmake/FindQwt.cmake.orig 2021-02-19 12:09:21.000000000 +0000 8--- cmake/FindQwt.cmake.orig 2021-02-19 12:09:21.000000000 +0000
4+++ cmake/FindQwt.cmake 9+++ cmake/FindQwt.cmake
5@@ -17,11 +17,7 @@ set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 q 10@@ -17,11 +17,7 @@ set(QWT_LIBRARY_NAMES qwt-qt5 qwt6-qt5 q
6 find_library(QWT_LIBRARY 11 find_library(QWT_LIBRARY
7 NAMES ${QWT_LIBRARY_NAMES} 12 NAMES ${QWT_LIBRARY_NAMES}
8 PATHS 13 PATHS
9- /usr/lib 14- /usr/lib
10- /usr/local/lib 15- /usr/local/lib
11- /usr/local/lib/qt5 16- /usr/local/lib/qt5
12- "$ENV{LIB_DIR}/lib" 17- "$ENV{LIB_DIR}/lib"
13- "$ENV{LIB}" 18- "$ENV{LIB}"
14+ "${QWT_DIR}/lib" 19+ "${QWT_DIR}/lib"