aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/qgis/Makefile3
-rw-r--r--graphics/qgis/files/patch-cmake-FindGRASS.cmake11
2 files changed, 14 insertions, 0 deletions
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 6b530718869d..2011a5080ab9 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,6 +7,7 @@
PORTNAME= qgis
PORTVERSION= 1.7.0
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://qgis.org/downloads/ \
http://download.osgeo.org/qgis/src/
@@ -94,6 +95,8 @@ MAN1= qgis.1
post-patch:
${REINPLACE_CMD} -e 's# dl##g' \
${WRKSRC}/src/core/CMakeLists.txt
+ ${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \
+ ${WRKSRC}/cmake/FindGRASS.cmake
.if !defined(WITH_MAPSERVER)
${REINPLACE_CMD} -e 's#WITH_MAPSERVER TRUE#WITH_MAPSERVER FALSE#g' \
diff --git a/graphics/qgis/files/patch-cmake-FindGRASS.cmake b/graphics/qgis/files/patch-cmake-FindGRASS.cmake
new file mode 100644
index 000000000000..d6a2ca8a5e24
--- /dev/null
+++ b/graphics/qgis/files/patch-cmake-FindGRASS.cmake
@@ -0,0 +1,11 @@
+--- 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)