2 files changed, 14 insertions, 37 deletions

diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 2011a5080ab9..5422e0b36d72 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	1.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://qgis.org/downloads/ \
 		http://download.osgeo.org/qgis/src/
@@ -28,15 +28,13 @@ USE_CMAKE=	yes
 USE_QT_VER=	4
 USE_SQLITE=	yes
 CMAKE_USE_PTHREAD=	yes
-CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
 QT_COMPONENTS=	gui svg xml network sql designer linguist_build \
 		qmake_build moc_build rcc_build uic_build
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qtdir=${QTDIR}
 USE_LDCONFIG=	yes
 
+MAN1=		qgis.1
+
 OPTIONS=	GRASS "Enable GRASS support" Off \
 		POSTGIS "Enable PostGIS support" Off \
 		MAPSERVER "Enable MapServer support" off \
@@ -48,38 +46,36 @@ OPTIONS=	GRASS "Enable GRASS support" Off \
 BROKEN=		does not compile on 7.X
 .endif
 
-.if !defined (QTDIR)
-QTDIR=		${QT_PREFIX}
-.endif
-
-.if !defined (GRASS_INST_DIR)
-GRASS_INST_DIR=	grass
-.endif
-
 .if defined(WITH_GRASS)
-CONFIGURE_ARGS+=--with-grass=${LOCALBASE}/${GRASS_INST_DIR}
+CMAKE_ARGS+=	-DWITH_GRASS:BOOL=TRUE
 RUN_DEPENDS+=	${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
+.else
+CMAKE_ARGS+=	-DWITH_GRASS:BOOL=FALSE
 .endif
 
 .if defined(WITH_POSTGIS)
-CONFIGURE_ARGS+=--with-postgresql
+CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=TRUE
 BUILD_DEPENDS+=	${LOCALBASE}/share/postgis:${PORTSDIR}/databases/postgis
 PLIST_SUB+=	PGSQL=""
 .else
-CONFIGURE_ARGS+=--without-postgresql
+CMAKE_ARGS+=	-DWITH_POSTGRESQL:BOOL=FALSE
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
 .if defined(WITH_MAPSERVER)
+CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=TRUE
 PLIST_SUB+=	QGIS_FCGI=""
 LIB_DEPENDS+=	fcgi.0:${PORTSDIR}/www/fcgi
 .else
+CMAKE_ARGS+=	-DWITH_MAPSERVER:BOOL=FALSE
 PLIST_SUB+=	QGIS_FCGI="@comment "
 .endif
 
 .if defined(WITHOUT_PYTHON)
+CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=FALSE
 PLIST_SUB+=	QGIS_PYTHON="@comment "
 .else
+CMAKE_ARGS+=	-DWITH_BINDINGS:BOOL=TRUE
 PLIST_SUB+=	QGIS_PYTHON=""
 BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.8.2:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.5.4:${PORTSDIR}/x11-toolkits/py-qt4-gui \
@@ -90,22 +86,4 @@ BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sip>=4.8.2:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.6.5:${PORTSDIR}/databases/py-sqlite3
 .endif
 
-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' \
-			${WRKSRC}/CMakeLists.txt
-.endif
-
-.if defined(WITHOUT_PYTHON)
-		${REINPLACE_CMD} -e 's#WITH_BINDINGS TRUE#WITH_BINDINGS FALSE#g' \
-			${WRKSRC}/CMakeLists.txt
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
index b38c92aa595a..c11dc81758e2 100644
--- a/graphics/qgis/pkg-plist
+++ b/graphics/qgis/pkg-plist
@@ -648,9 +648,8 @@
 %%DATADIR%%/svg/transport/transport_train_station2.svg
 %%DATADIR%%/svg/transport/transport_train_station.svg
 %%DATADIR%%/svg/transport/transport_tram_stop.svg
-%%PGSQL%%lib/qgis/libpggeoprocessingplugin.so
-%%PGSQL%%lib/qgis/libpostgresprovider.so
-%%PGSQL%%lib/qgis/libspitplugin.so
+%%PGSQL%%lib/qgis/plugins/libpostgresprovider.so
+%%PGSQL%%lib/qgis/plugins/libspitplugin.so
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/GdalTools.py
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/about.png
 %%QGIS_PYTHON%%%%DATADIR%%/python/plugins/GdalTools/icons/contour.png