aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorWen Heping <wen@FreeBSD.org>2011-10-20 03:18:52 +0000
committerWen Heping <wen@FreeBSD.org>2011-10-20 03:18:52 +0000
commitc41cb4c2b32a9d54140f4855783ec2da5303afbf (patch)
treeea2421a1718a6d896bfd0714e28e6a264540fb79 /graphics
parentf038eaba733532ad4b1e3b06c4b033f3c9bbcd4d (diff)
downloadports-c41cb4c2b32a9d54140f4855783ec2da5303afbf.tar.gz
ports-c41cb4c2b32a9d54140f4855783ec2da5303afbf.zip
Notes
Diffstat (limited to 'graphics')
-rw-r--r--graphics/qgis/Makefile2
-rw-r--r--graphics/qgis/files/patch-cmake-FindGRASS.cmake11
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)