diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-02-06 19:17:32 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2020-02-06 19:17:32 +0000 |
| commit | a554a86652ce3c8d7b2e082703cfac06588c2f97 (patch) | |
| tree | 113f60a02dba7ad91eb52327fe969f86e51d9f73 /graphics/qgis | |
| parent | f67d73a020c4837079c48e8410ac5d8de76f029d (diff) | |
| download | ports-a554a86652ce3c8d7b2e082703cfac06588c2f97.tar.gz ports-a554a86652ce3c8d7b2e082703cfac06588c2f97.zip | |
databases/grass7: add SONAME and use new path for graphics/qgis*
- Add SONAME (upstreamed) [1]
- Remove the (bad) idea to keep a symlink to the old path logic (grass-M.m.b)
- Fix FindGRASS.cmake for graphics/qgis and graphics/qgis-ltr (upstreamed) [2]
[1] https://github.com/OSGeo/grass/pull/301
[2] https://github.com/qgis/QGIS/pull/34088
PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243736
Approved by: Rainer Hurlin (maintainer), tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D23470
Notes
Notes:
svn path=/head/; revision=525400
Diffstat (limited to 'graphics/qgis')
| -rw-r--r-- | graphics/qgis/Makefile | 2 | ||||
| -rw-r--r-- | graphics/qgis/files/patch-cmake_FindGRASS.cmake | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 0a6df0caf47f..36717bc54e41 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_10_1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de diff --git a/graphics/qgis/files/patch-cmake_FindGRASS.cmake b/graphics/qgis/files/patch-cmake_FindGRASS.cmake new file mode 100644 index 000000000000..b8802605689b --- /dev/null +++ b/graphics/qgis/files/patch-cmake_FindGRASS.cmake @@ -0,0 +1,13 @@ +--- cmake/FindGRASS.cmake.orig 2020-01-25 06:32:41 UTC ++++ cmake/FindGRASS.cmake +@@ -161,9 +161,7 @@ IF (UNIX) + IF (GRASS_FIND_VERSION EQUAL 7) + IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) +- FOREACH (VERSION_BUILD 9 8 7 6 5 4 3 2 1 0) +- LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) +- ENDFOREACH (VERSION_BUILD) ++ LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) + ENDFOREACH(VERSION_MINOR) + ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + FOREACH (PATH /usr/lib64 /usr/lib) |