diff options
| author | wen <wen@FreeBSD.org> | 2011-10-20 11:18:52 +0800 |
|---|---|---|
| committer | wen <wen@FreeBSD.org> | 2011-10-20 11:18:52 +0800 |
| commit | a8cb85996789def3ed11c1fb2d2fd9ccc62db80b (patch) | |
| tree | bfa9e29d94f79585cf9050f30b05a5b9533710a5 /graphics | |
| parent | 5e0fae2e1d5339a98d2821020b8b4eae9b7744f7 (diff) | |
| download | freebsd-ports-gnome-a8cb85996789def3ed11c1fb2d2fd9ccc62db80b.tar.gz freebsd-ports-gnome-a8cb85996789def3ed11c1fb2d2fd9ccc62db80b.tar.zst freebsd-ports-gnome-a8cb85996789def3ed11c1fb2d2fd9ccc62db80b.zip | |
- Fix build after databases/grass update
PR: ports/161583
Submitted by: Bartoletti <coder@tuxfamily.org>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/qgis/Makefile | 2 | ||||
| -rw-r--r-- | graphics/qgis/files/patch-cmake-FindGRASS.cmake | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index e3f9d71c5eac..d13dd2d7b384 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -46,7 +46,7 @@ BROKEN= does not compile on 7.X .endif .if defined(WITH_GRASS) -CMAKE_ARGS+= -DWITH_GRASS:BOOL=TRUE +CMAKE_ARGS+= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.1 RUN_DEPENDS+= ${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass .else CMAKE_ARGS+= -DWITH_GRASS:BOOL=FALSE diff --git a/graphics/qgis/files/patch-cmake-FindGRASS.cmake b/graphics/qgis/files/patch-cmake-FindGRASS.cmake deleted file mode 100644 index d6a2ca8a5e24..000000000000 --- a/graphics/qgis/files/patch-cmake-FindGRASS.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/FindGRASS.cmake.orig 2011-08-08 10:51:01.000000000 +0800 -+++ cmake/FindGRASS.cmake 2011-08-08 10:52:58.000000000 +0800 -@@ -44,7 +44,7 @@ - # search for grass installations - - # list of paths which to search - user's choice as first --SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass /usr/lib64/grass64 /usr/lib/grass64 c:/msys/local /opt/grass $ENV{GRASS_PREFIX}) -+SET (GRASS_PATHS ${GRASS_PREFIX} %%PREFIX%%/grass-6.4.0 /usr/lib/grass /usr/lib64/grass64 /usr/lib/grass64 c:/msys/local /opt/grass $ENV{GRASS_PREFIX}) - - # mac-specific path - IF (APPLE) |