Changes 1.7.3:

* Fix 3581 Ftools: union tool leave holes in output
* Fix 4500 Simplify tool freezes QGIS
* Fix 4466 Fixes for 'v.what.vect' and 'v.generalize' modules in the GRASS
  plugin
* Fix 4552 Patch for v.what.vect
* Fix 4035 Print Composer shape combo box not refecting current shape
* Partial Fix 3097 Add preference to set/override environment variables
* Fix 2749 Move 'Add to Attributes List' button
* Fix 4560 Wrong scale displayed in Map canvas
* Partial Fix 4383 Ftools: Improve how processes are handled
* Fix 3577 Adding a print composer doesn't dirty the document
* Fix 3170 Many GDAL Tools don't work in OS X standalone
* Fix 3723 Transparency settings are not applied from *.qml
* Fix 3576 qml not read automagically for rasters
* Fix 2977 Messy uninstallation of the standalone installer
* Union and Symetrical difference works only on whole layer fixed
* Save some time in node tool for geometry export and avoid detachs
* Initialize default symbol to 0 in rule based renderer
* Make relative paths default
* Fix tab restoration in project properties
* Add helpful info to GdalTools Settings dialog on how to configure GDAL path
* New vector layer dialog - show CRS as authid-description pair instead of
  proj4 string
* Fix crash with relative file paths if projPath is not yet defined
* Add helpful info to GdalTools Settings dialog on how to configure GDAL path
* And a lot of other smaller Bugfixes

16 files changed, 345 insertions, 73 deletions

diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index f224b2aea00..74e5fd27dbc 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2012/01/13 10:55:10 obache Exp $
+# $NetBSD: Makefile,v 1.12 2012/01/23 08:58:00 adam Exp $
 
-DISTNAME=	qgis-1.6.0
-PKGREVISION=	6
+DISTNAME=	qgis-1.7.3
 CATEGORIES=	geography
 MASTER_SITES=	http://qgis.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +23,9 @@ USE_X11=		yes
 
 .include "options.mk"
 
-.include "../../databases/sqlite3/buildlink3.mk"
+pre-configure:
+	cd ${WRKSRC} && ${RM} -f cmake/FindGDAL.cmake
+
 .include "../../geography/gdal-lib/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
@@ -32,6 +33,7 @@ USE_X11=		yes
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../www/fcgi/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt4-tools=	full
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/qwt-qt4/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/geography/qgis/PLIST b/geography/qgis/PLIST
index c4842f2d99f..f5eb6d48e2c 100644
--- a/geography/qgis/PLIST
+++ b/geography/qgis/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/21 17:48:13 adam Exp $
-bin/admin.sld
+@comment $NetBSD: PLIST,v 1.3 2012/01/23 08:58:00 adam Exp $
 bin/qgis
-bin/qgis_help
-bin/qgis_mapserv.fcgi
-bin/wms_metadata.xml
 include/qgis/characterwidget.h
 include/qgis/qextserialenumerator.h
 include/qgis/qextserialport.h
@@ -11,6 +7,7 @@ include/qgis/qgis.h
 include/qgis/qgisgui.h
 include/qgis/qgisinterface.h
 include/qgis/qgisplugin.h
+include/qgis/qgsaddremoveitemcommand.h
 include/qgis/qgsapplication.h
 include/qgis/qgsattributeaction.h
 include/qgis/qgsattributeeditor.h
@@ -51,11 +48,13 @@ include/qgis/qgsdataprovider.h
 include/qgis/qgsdatasourceuri.h
 include/qgis/qgsdetaileditemdelegate.h
 include/qgis/qgsdetaileditemwidget.h
+include/qgis/qgsdiagramrendererv2.h
 include/qgis/qgsdistancearea.h
 include/qgis/qgsencodingfiledialog.h
 include/qgis/qgsexception.h
 include/qgis/qgsfeature.h
 include/qgis/qgsfield.h
+include/qgis/qgsfieldvalidator.h
 include/qgis/qgsfiledropedit.h
 include/qgis/qgsfillsymbollayerv2.h
 include/qgis/qgsformannotationitem.h
@@ -125,6 +124,8 @@ include/qgis/qgsquickprint.h
 include/qgis/qgsrasterbandstats.h
 include/qgis/qgsrasterdataprovider.h
 include/qgis/qgsrasterlayer.h
+include/qgis/qgsrasterprojector.h
+include/qgis/qgsrasterpyramid.h
 include/qgis/qgsrastershader.h
 include/qgis/qgsrastershaderfunction.h
 include/qgis/qgsrastertransparency.h
@@ -141,6 +142,7 @@ include/qgis/qgsrubberband.h
 include/qgis/qgsrulebasedrendererv2widget.h
 include/qgis/qgsrunprocess.h
 include/qgis/qgsscalecalculator.h
+include/qgis/qgssearchquerybuilder.h
 include/qgis/qgssearchstring.h
 include/qgis/qgssearchtreenode.h
 include/qgis/qgssinglesymbolrenderer.h
@@ -149,6 +151,7 @@ include/qgis/qgssinglesymbolrendererv2widget.h
 include/qgis/qgssnapper.h
 include/qgis/qgsspatialindex.h
 include/qgis/qgsstylev2.h
+include/qgis/qgsstylev2exportimportdialog.h
 include/qgis/qgsstylev2managerdialog.h
 include/qgis/qgssymbol.h
 include/qgis/qgssymbollayerv2.h
@@ -179,6 +182,7 @@ include/qgis/ui_qgsdetaileditemwidgetbase.h
 include/qgis/ui_qgsgenericprojectionselectorbase.h
 include/qgis/ui_qgsmessageviewer.h
 include/qgis/ui_qgsprojectionselectorbase.h
+include/qgis/ui_qgsquerybuilderbase.h
 lib/libqgis_analysis.so
 lib/libqgis_analysis.so.${PKGVERSION}
 lib/libqgis_core.so
@@ -187,6 +191,8 @@ lib/libqgis_gui.so
 lib/libqgis_gui.so.${PKGVERSION}
 ${PLIST.python}lib/libqgispython.so
 ${PLIST.python}lib/libqgispython.so.${PKGVERSION}
+lib/libqgissqlanyconnection.so
+lib/libqgissqlanyconnection.so.${PKGVERSION}
 lib/qgis/plugins/libcoordinatecaptureplugin.so
 lib/qgis/plugins/libcopyrightlabelplugin.so
 lib/qgis/plugins/libdelimitedtextplugin.so
@@ -195,6 +201,7 @@ lib/qgis/plugins/libdiagramoverlay.so
 lib/qgis/plugins/libdisplacementplugin.so
 lib/qgis/plugins/libdxf2shpconverterplugin.so
 lib/qgis/plugins/libevis.so
+lib/qgis/plugins/libgdalprovider.so
 lib/qgis/plugins/libgeorefplugin.so
 lib/qgis/plugins/libgpsimporterplugin.so
 lib/qgis/plugins/libgpxprovider.so
@@ -202,22 +209,24 @@ lib/qgis/plugins/libinterpolationplugin.so
 lib/qgis/plugins/libmemoryprovider.so
 lib/qgis/plugins/libnortharrowplugin.so
 lib/qgis/plugins/libofflineeditingplugin.so
-lib/qgis/plugins/libogrconverterplugin.so
 lib/qgis/plugins/libogrprovider.so
 lib/qgis/plugins/liboracleplugin.so
 lib/qgis/plugins/libosmprovider.so
 lib/qgis/plugins/libpostgresprovider.so
-lib/qgis/plugins/libquickprintplugin.so
 lib/qgis/plugins/librasterterrainplugin.so
+lib/qgis/plugins/libroadgraphplugin.so
 lib/qgis/plugins/libscalebarplugin.so
 lib/qgis/plugins/libspatialiteprovider.so
 lib/qgis/plugins/libspatialqueryplugin.so
 lib/qgis/plugins/libspitplugin.so
+lib/qgis/plugins/libsqlanywhereplugin.so
+lib/qgis/plugins/libsqlanywhereprovider.so
 lib/qgis/plugins/libwfsplugin.so
 lib/qgis/plugins/libwfsprovider.so
 lib/qgis/plugins/libwmsprovider.so
+lib/qgis/qgis_help
 man/man1/qgis.1
-man/man1/qgis_help.1
+share/qgis/FindQGIS.cmake
 share/qgis/doc/AUTHORS
 share/qgis/doc/CODING
 share/qgis/doc/CONTRIBUTORS
@@ -225,10 +234,12 @@ share/qgis/doc/DONORS
 share/qgis/doc/INSTALL
 share/qgis/doc/SPONSORS
 share/qgis/doc/TRANSLATORS
+share/qgis/doc/changelog.html
 share/qgis/doc/favicon.ico
 share/qgis/doc/images/qgis_new_80pct.png
 share/qgis/doc/index.html
-share/qgis/doc/qgisdoc.css
+share/qgis/doc/style.css
+share/qgis/i18n/qgis_af.qm
 share/qgis/i18n/qgis_ar.qm
 share/qgis/i18n/qgis_bg.qm
 share/qgis/i18n/qgis_ca_ES.qm
@@ -236,6 +247,7 @@ share/qgis/i18n/qgis_cs_CZ.qm
 share/qgis/i18n/qgis_de.qm
 share/qgis/i18n/qgis_el_GR.qm
 share/qgis/i18n/qgis_es.qm
+share/qgis/i18n/qgis_fa.qm
 share/qgis/i18n/qgis_fi.qm
 share/qgis/i18n/qgis_fr.qm
 share/qgis/i18n/qgis_he.qm
@@ -259,7 +271,9 @@ share/qgis/i18n/qgis_ru.qm
 share/qgis/i18n/qgis_sk.qm
 share/qgis/i18n/qgis_sl_SI.qm
 share/qgis/i18n/qgis_sq_AL.qm
+share/qgis/i18n/qgis_sr_CS-Latn.qm
 share/qgis/i18n/qgis_sv.qm
+share/qgis/i18n/qgis_ta.qm
 share/qgis/i18n/qgis_th.qm
 share/qgis/i18n/qgis_tr.qm
 share/qgis/i18n/qgis_uk.qm
@@ -278,11 +292,14 @@ ${PLIST.python}share/qgis/python/plugins/GdalTools/GdalTools.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/__init__.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/about.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/contour.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/dem.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/edit.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/grid.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/merge.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/nearblack.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/polygonize.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/projection-add.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/projection-export.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/proximity.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/raster-clip.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/raster-info.png
@@ -290,7 +307,10 @@ ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/raster-overview.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/raster-paletted.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/raster-rgb.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/rasterize.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/reset.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/sieve.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/tileindex.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/tooltip.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/translate.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/vrt.png
 ${PLIST.python}share/qgis/python/plugins/GdalTools/icons/warp.png
@@ -303,6 +323,7 @@ ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doAbout.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doBuildVRT.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doClipper.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doContour.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doDEM.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doGrid.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doInfo.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doMerge.py
@@ -316,17 +337,24 @@ ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doRasterize.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doRgbPct.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doSettings.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doSieve.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doTileIndex.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doTranslate.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/doWarp.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/extentSelector.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/inOutSelector.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/optionsTable.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/terrain.txt
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_dialogAbout.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_dialogBase.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_dialogSettings.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_extentSelector.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_inOutSelector.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_optionsTable.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetBuildVRT.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetClipper.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetContour.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetConvert.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetDEM.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetGrid.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetInfo.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetMerge.py
@@ -337,15 +365,13 @@ ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetProjection.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetProximity.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetRasterize.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetSieve.py
+${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetTileIndex.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetTranslate.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/ui_widgetWarp.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/widgetBatchBase.py
 ${PLIST.python}share/qgis/python/plugins/GdalTools/tools/widgetPluginBase.py
 ${PLIST.python}share/qgis/python/plugins/fTools/__init__.py
-${PLIST.python}share/qgis/python/plugins/fTools/doAbout.py
 ${PLIST.python}share/qgis/python/plugins/fTools/fTools.py
-${PLIST.python}share/qgis/python/plugins/fTools/ftools_help.xml
-${PLIST.python}share/qgis/python/plugins/fTools/ftools_help.xsl
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/default/analysis.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/default/basic_statistics.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/default/buffer.png
@@ -436,35 +462,35 @@ ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/to_lines.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/union.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/unique.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/vector_grid.png
+${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/voronoi.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/logo.svg
+${PLIST.python}share/qgis/python/plugins/fTools/icons/logo_small.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/menu_icons.svg
 ${PLIST.python}share/qgis/python/plugins/fTools/resources_rc.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doDefineProj.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doGeometry.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doGeoprocessing.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doIntersectLines.py
-${PLIST.python}share/qgis/python/plugins/fTools/tools/doJoinAttributes.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doMeanCoords.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doMergeShapes.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doPointDistance.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doPointsInPolygon.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doRandPoints.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doRandom.py
-${PLIST.python}share/qgis/python/plugins/fTools/tools/doReProject.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doRegPoints.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doSelectByLocation.py
+${PLIST.python}share/qgis/python/plugins/fTools/tools/doSimplify.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doSpatialJoin.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doSubsetSelect.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doSumLines.py
+${PLIST.python}share/qgis/python/plugins/fTools/tools/doValidate.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doVectorGrid.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doVectorSplit.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/doVisual.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ftools_utils.py
-${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmAbout.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmGeometry.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmGeoprocessing.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmIntersectLines.py
-${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmJoinAttributes.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmMeanCoords.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmMergeShapes.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmPointDistance.py
@@ -473,6 +499,7 @@ ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmRandPoints.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmRandom.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmReProject.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmRegPoints.py
+${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmSimplify.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmSpatialJoin.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmSubsetSelect.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmSumLines.py
@@ -480,7 +507,6 @@ ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmVectorGrid.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmVectorSplit.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/ui_frmVisual.py
 ${PLIST.python}share/qgis/python/plugins/fTools/tools/voronoi.py
-${PLIST.python}share/qgis/python/plugins/fTools/ui_frmAbout.py
 ${PLIST.python}share/qgis/python/plugins/mapserver_export/__init__.py
 ${PLIST.python}share/qgis/python/plugins/mapserver_export/mapserver_export.png
 ${PLIST.python}share/qgis/python/plugins/mapserver_export/mapserverexport.py
@@ -536,6 +562,10 @@ ${PLIST.python}share/qgis/python/plugins/plugin_installer/ui_qgsplugininstallerp
 ${PLIST.python}share/qgis/python/plugins/plugin_installer/ui_qgsplugininstallerrepositorybase.py
 ${PLIST.python}share/qgis/python/plugins/plugin_installer/unzip.py
 ${PLIST.python}share/qgis/python/plugins/plugin_installer/version_compare.py
+${PLIST.python}share/qgis/python/pyspatialite/__init__.py
+${PLIST.python}share/qgis/python/pyspatialite/_spatialite.so
+${PLIST.python}share/qgis/python/pyspatialite/dbapi2.py
+${PLIST.python}share/qgis/python/pyspatialite/dump.py
 ${PLIST.python}share/qgis/python/qgis/__init__.py
 ${PLIST.python}share/qgis/python/qgis/__init__.pyc
 ${PLIST.python}share/qgis/python/qgis/analysis.so
@@ -613,6 +643,9 @@ share/qgis/resources/context_help/QgsDelimitedTextPluginGui-pt_BR
 share/qgis/resources/context_help/QgsDelimitedTextPluginGui-ru_RU
 share/qgis/resources/context_help/QgsDelimitedTextPluginGui-sk_SK
 share/qgis/resources/context_help/QgsDelimitedTextPluginGui-sv_SE
+share/qgis/resources/context_help/QgsFieldCalculator-de_DE
+share/qgis/resources/context_help/QgsFieldCalculator-en_US
+share/qgis/resources/context_help/QgsFieldCalculator-fr_FR
 share/qgis/resources/context_help/QgsGPSPluginGui-de_DE
 share/qgis/resources/context_help/QgsGPSPluginGui-en_US
 share/qgis/resources/context_help/QgsGPSPluginGui-it_IT
@@ -631,13 +664,10 @@ share/qgis/resources/context_help/QgsIdentifyResults-pt_BR
 share/qgis/resources/context_help/QgsIdentifyResults-ru_RU
 share/qgis/resources/context_help/QgsIdentifyResults-sk_SK
 share/qgis/resources/context_help/QgsIdentifyResults-sv_SE
-share/qgis/resources/context_help/QgsMapserverExport-es_ES
-share/qgis/resources/context_help/QgsMapserverExport-pt_BR
-share/qgis/resources/context_help/QgsMapserverExport-ru_RU
-share/qgis/resources/context_help/QgsMapserverExport-sk_SK
 share/qgis/resources/context_help/QgsMeasureDialog-de_DE
 share/qgis/resources/context_help/QgsMeasureDialog-en_US
 share/qgis/resources/context_help/QgsMeasureDialog-es_ES
+share/qgis/resources/context_help/QgsMeasureDialog-fr_FR
 share/qgis/resources/context_help/QgsMeasureDialog-it_IT
 share/qgis/resources/context_help/QgsMeasureDialog-ja_JP
 share/qgis/resources/context_help/QgsMeasureDialog-pl_PL
@@ -648,6 +678,7 @@ share/qgis/resources/context_help/QgsMeasureDialog-sv_SE
 share/qgis/resources/context_help/QgsNewConnection-de_DE
 share/qgis/resources/context_help/QgsNewConnection-en_US
 share/qgis/resources/context_help/QgsNewConnection-es_ES
+share/qgis/resources/context_help/QgsNewConnection-fr_FR
 share/qgis/resources/context_help/QgsNewConnection-it_IT
 share/qgis/resources/context_help/QgsNewConnection-ja_JP
 share/qgis/resources/context_help/QgsNewConnection-pl_PL
@@ -655,15 +686,17 @@ share/qgis/resources/context_help/QgsNewConnection-pt_BR
 share/qgis/resources/context_help/QgsNewConnection-ru_RU
 share/qgis/resources/context_help/QgsNewConnection-sk_SK
 share/qgis/resources/context_help/QgsNewConnection-sv_SE
-share/qgis/resources/context_help/QgsNewHttpConnection-pt_BR
 share/qgis/resources/context_help/QgsNewOgrConnection-de_DE
 share/qgis/resources/context_help/QgsNewOgrConnection-en_US
+share/qgis/resources/context_help/QgsNewOgrConnection-fr_FR
 share/qgis/resources/context_help/QgsNewOgrConnection-it_IT
 share/qgis/resources/context_help/QgsNewOgrConnection-ja_JP
 share/qgis/resources/context_help/QgsNewOgrConnection-pt_BR
 share/qgis/resources/context_help/QgsNewOgrConnection-ru_RU
 share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-de_DE
 share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-en_US
+share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-es_ES
+share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-fr_FR
 share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-ja_JP
 share/qgis/resources/context_help/QgsNewSpatialiteLayerDialog-pt_BR
 share/qgis/resources/context_help/QgsNewVectorLayerDialog-de_DE
@@ -676,22 +709,26 @@ share/qgis/resources/context_help/QgsNewVectorLayerDialog-ru_RU
 share/qgis/resources/context_help/QgsNewVectorLayerDialog-sk_SK
 share/qgis/resources/context_help/QgsNorthArrowPluginGui-de_DE
 share/qgis/resources/context_help/QgsNorthArrowPluginGui-en_US
+share/qgis/resources/context_help/QgsNorthArrowPluginGui-fr_FR
 share/qgis/resources/context_help/QgsNorthArrowPluginGui-it_IT
 share/qgis/resources/context_help/QgsNorthArrowPluginGui-ja_JP
 share/qgis/resources/context_help/QgsNorthArrowPluginGui-pt_BR
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-de_DE
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-en_US
+share/qgis/resources/context_help/QgsOpenVectorLayerDialog-fr_FR
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-it_IT
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-ja_JP
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-pt_BR
 share/qgis/resources/context_help/QgsOpenVectorLayerDialog-ru_RU
 share/qgis/resources/context_help/QgsOptions-de_DE
 share/qgis/resources/context_help/QgsOptions-en_US
+share/qgis/resources/context_help/QgsOptions-fr_FR
 share/qgis/resources/context_help/QgsOptions-it_IT
 share/qgis/resources/context_help/QgsOptions-ja_JP
 share/qgis/resources/context_help/QgsOptions-pt_BR
 share/qgis/resources/context_help/QgsPgSourceSelect-de_DE
 share/qgis/resources/context_help/QgsPgSourceSelect-en_US
+share/qgis/resources/context_help/QgsPgSourceSelect-fr_FR
 share/qgis/resources/context_help/QgsPgSourceSelect-it_IT
 share/qgis/resources/context_help/QgsPgSourceSelect-ja_JP
 share/qgis/resources/context_help/QgsPgSourceSelect-pl_PL
@@ -701,6 +738,7 @@ share/qgis/resources/context_help/QgsPgSourceSelect-sk_SK
 share/qgis/resources/context_help/QgsPgSourceSelect-sv_SE
 share/qgis/resources/context_help/QgsPluginInstallerDialog-de_DE
 share/qgis/resources/context_help/QgsPluginInstallerDialog-en_US
+share/qgis/resources/context_help/QgsPluginInstallerDialog-fr_FR
 share/qgis/resources/context_help/QgsPluginInstallerDialog-it_IT
 share/qgis/resources/context_help/QgsPluginInstallerDialog-ja_JP
 share/qgis/resources/context_help/QgsPluginInstallerDialog-pl_PL
@@ -708,6 +746,7 @@ share/qgis/resources/context_help/QgsPluginInstallerDialog-pt_BR
 share/qgis/resources/context_help/QgsProjectProperties-de_DE
 share/qgis/resources/context_help/QgsProjectProperties-en_US
 share/qgis/resources/context_help/QgsProjectProperties-es_ES
+share/qgis/resources/context_help/QgsProjectProperties-fr_FR
 share/qgis/resources/context_help/QgsProjectProperties-it_IT
 share/qgis/resources/context_help/QgsProjectProperties-ja_JP
 share/qgis/resources/context_help/QgsProjectProperties-pl_PL
@@ -717,12 +756,15 @@ share/qgis/resources/context_help/QgsProjectProperties-sk_SK
 share/qgis/resources/context_help/QgsProjectProperties-sv_SE
 share/qgis/resources/context_help/QgsScaleBarPluginGui-de_DE
 share/qgis/resources/context_help/QgsScaleBarPluginGui-en_US
+share/qgis/resources/context_help/QgsScaleBarPluginGui-es_ES
+share/qgis/resources/context_help/QgsScaleBarPluginGui-fr_FR
 share/qgis/resources/context_help/QgsScaleBarPluginGui-it_IT
 share/qgis/resources/context_help/QgsScaleBarPluginGui-ja_JP
 share/qgis/resources/context_help/QgsScaleBarPluginGui-pl_PL
 share/qgis/resources/context_help/QgsScaleBarPluginGui-pt_BR
 share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-de_DE
 share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US
+share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-fr_FR
 share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-it_IT
 share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-ja_JP
 share/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-pl_PL
@@ -735,6 +777,7 @@ share/qgis/resources/context_help/QgsStyleV2ManagerDialog-pt_BR
 share/qgis/resources/context_help/QgsVectorLayerProperties-de_DE
 share/qgis/resources/context_help/QgsVectorLayerProperties-en_US
 share/qgis/resources/context_help/QgsVectorLayerProperties-es_ES
+share/qgis/resources/context_help/QgsVectorLayerProperties-fr_FR
 share/qgis/resources/context_help/QgsVectorLayerProperties-it_IT
 share/qgis/resources/context_help/QgsVectorLayerProperties-ja_JP
 share/qgis/resources/context_help/QgsVectorLayerProperties-pl_PL
@@ -745,6 +788,7 @@ share/qgis/resources/context_help/QgsVectorLayerSaveAsDialog-de_DE
 share/qgis/resources/context_help/QgsVectorLayerSaveAsDialog-en_US
 share/qgis/resources/context_help/QgsWMSSourceSelect-de_DE
 share/qgis/resources/context_help/QgsWMSSourceSelect-en_US
+share/qgis/resources/context_help/QgsWMSSourceSelect-fr_FR
 share/qgis/resources/context_help/QgsWMSSourceSelect-it_IT
 share/qgis/resources/context_help/QgsWMSSourceSelect-ja_JP
 share/qgis/resources/context_help/QgsWMSSourceSelect-pl_PL
@@ -752,6 +796,20 @@ share/qgis/resources/context_help/QgsWMSSourceSelect-pt_BR
 share/qgis/resources/context_help/QgsWMSSourceSelect-ru_RU
 share/qgis/resources/context_help/QgsWMSSourceSelect-sk_SK
 share/qgis/resources/context_help/QgsWMSSourceSelect-sv_SE
+share/qgis/resources/context_help/RgSettingsDlg-de_DE
+share/qgis/resources/context_help/RgSettingsDlg-en_US
+share/qgis/resources/context_help/RgSettingsDlg-fr_FR
+share/qgis/resources/context_help/RgSettingsDlg-ru_RU
+share/qgis/resources/context_help/RgShortestPathWidget-de_DE
+share/qgis/resources/context_help/RgShortestPathWidget-en_US
+share/qgis/resources/context_help/RgShortestPathWidget-fr_FR
+share/qgis/resources/context_help/RgShortestPathWidget-ru_RU
+share/qgis/resources/context_help/SaNewConnection-de_DE
+share/qgis/resources/context_help/SaNewConnection-en_US
+share/qgis/resources/context_help/SaNewConnection-fr_FR
+share/qgis/resources/context_help/SaSourceSelect-de_DE
+share/qgis/resources/context_help/SaSourceSelect-en_US
+share/qgis/resources/context_help/SaSourceSelect-fr_FR
 share/qgis/resources/context_help/eVisDatabaseConnectionGui-de_DE
 share/qgis/resources/context_help/eVisDatabaseConnectionGui-en_US
 share/qgis/resources/context_help/eVisDatabaseConnectionGui-es_ES
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo
index 837de11bb6e..c17321d2b18 100644
--- a/geography/qgis/distinfo
+++ b/geography/qgis/distinfo
@@ -1,10 +1,16 @@
-$NetBSD: distinfo,v 1.2 2010/12/21 17:48:13 adam Exp $
+$NetBSD: distinfo,v 1.3 2012/01/23 08:58:00 adam Exp $
 
-SHA1 (qgis-1.6.0.tar.bz2) = 815e7d7f465f878c37866b0bc38345bbd76541cc
-RMD160 (qgis-1.6.0.tar.bz2) = e98aef1bf5290dc7f4433fc1ec648ad13273604c
-Size (qgis-1.6.0.tar.bz2) = 17479207 bytes
-SHA1 (patch-ab) = 59a6f7305ae86664cad08d3d65f6450e64822535
-SHA1 (patch-ac) = 4f5fff981f42e6fbd4ed87ef67564c8999ee0914
-SHA1 (patch-ad) = 47c48d236079369a61e1c6c2522cddfb04e344f0
-SHA1 (patch-al) = fcc667900e73e4a843d009c216aad6fa6354f1f6
-SHA1 (patch-am) = 4fe6cde9bd459d0e3197bc5e3d6fd301039178b9
+SHA1 (qgis-1.7.3.tar.bz2) = 97ad40ada045fcecbd858114527820f1e3f0eae1
+RMD160 (qgis-1.7.3.tar.bz2) = 830202899996013cd296dca8a5fa2440e85e4d27
+Size (qgis-1.7.3.tar.bz2) = 25328792 bytes
+SHA1 (patch-CMakeLists.txt) = 2f7c42d6d68ead325537f72fae6d785afa30aa65
+SHA1 (patch-ad) = c5fbccce3eb93c3181d19eb9b1b29463a3fba1c1
+SHA1 (patch-al) = d3910f1dc5ddcdafef21d214b84289c51bc0f84a
+SHA1 (patch-am) = 69864d921b4438b9a90f0bfb8f727d96a41d00d9
+SHA1 (patch-cmake_FindGEOS.cmake) = f3d2cfc454a3da938cdfa9b1c25aead96674d796
+SHA1 (patch-python_core_sipcorepart1.cpp) = 26ac87ca62dc744c3cc560387fe48361f9f16016
+SHA1 (patch-python_core_sipcorepart3.cpp) = ff1fd8551f3e43197386ac3e0db16c93d2ca6a99
+SHA1 (patch-src_app_CMakeLists.txt) = 9862723ae1cc432aabb53eca5b3eb29bc6906b1a
+SHA1 (patch-src_core_spatialindex_include_Tools.h) = ccee3200f1a4d6807d0da2fb3f2307bfc345f83d
+SHA1 (patch-src_core_spatialite_spatialite.c) = a6b8ad377311a4a3e122a1336ccc32a2b1638cd7
+SHA1 (patch-src_helpviewer_CMakeLists.txt) = 209347863b9b3719d0eb04b142c831a2bfdb77ea
diff --git a/geography/qgis/patches/patch-CMakeLists.txt b/geography/qgis/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..d103ee8dd19
--- /dev/null
+++ b/geography/qgis/patches/patch-CMakeLists.txt
@@ -0,0 +1,67 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- CMakeLists.txt.orig	2011-12-10 18:23:35.000000000 +0000
++++ CMakeLists.txt
+@@ -5,11 +5,7 @@ SET(COMPLETE_VERSION ${CPACK_PACKAGE_VER
+ SET(RELEASE_NAME "Wroclaw")
+ SET(PROJECT_VERSION ${COMPLETE_VERSION})
+ PROJECT(qgis${PROJECT_VERSION})
+-IF (APPLE)
+-  SET(QGIS_APP_NAME "QGIS")
+-ELSE (APPLE)
+-  SET(QGIS_APP_NAME "qgis")
+-ENDIF (APPLE)
++SET(QGIS_APP_NAME "qgis")
+ 
+ # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
+ MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
+@@ -286,10 +282,9 @@ ELSE (WIN32)
+ 
+   IF (APPLE)
+     # for Mac OS X, everything is put inside an application bundle
+-    SET (QGIS_MACAPP_PREFIX ${CMAKE_INSTALL_PREFIX}/${QGIS_APP_NAME}.app/Contents)
+-    SET (CMAKE_INSTALL_PREFIX ${QGIS_MACAPP_PREFIX}/MacOS)
+     # path for library references
+-    SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
++    #SET (CMAKE_INSTALL_PREFIX bin)
++    #SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib)
+     # 4 bundling levels, each includes previous
+     #   0  nothing
+     #   1  Qt frameworks
+@@ -306,19 +301,11 @@ ELSE (WIN32)
+     FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices )
+ 
+     SET (DEFAULT_BIN_SUBDIR      bin)
+-    SET (QGIS_BIN_SUBDIR_REV     ..)
+-    SET (DEFAULT_CGIBIN_SUBDIR   fcgi-bin)
+-    SET (QGIS_CGIBIN_SUBDIR_REV  ..)
++    SET (DEFAULT_CGIBIN_SUBDIR   bin)
+     SET (DEFAULT_LIB_SUBDIR      lib)
+-    SET (QGIS_LIB_SUBDIR_REV     ..)
+-    SET (QGIS_FW_SUBDIR          ../Frameworks)
+-    SET (QGIS_FW_SUBDIR_REV      ../MacOS)
+-    SET (DEFAULT_DATA_SUBDIR     ../Resources)
+-    SET (QGIS_DATA_SUBDIR_REV    ../MacOS)
+     SET (DEFAULT_LIBEXEC_SUBDIR  lib/qgis)
+-    SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
+-    SET (DEFAULT_PLUGIN_SUBDIR   ../PlugIns/qgis)
+-    SET (QGIS_PLUGIN_SUBDIR_REV  ../../MacOS)
++    SET (DEFAULT_DATA_SUBDIR     share/qgis)
++    SET (DEFAULT_PLUGIN_SUBDIR   lib/qgis/plugins)
+     SET (DEFAULT_INCLUDE_SUBDIR  include/qgis)
+ 
+   ELSE (APPLE)
+@@ -500,9 +487,9 @@ IF (APPLE)
+ ENDIF (APPLE)
+ 
+ # manual page - makes sense only on unix systems
+-IF (UNIX AND NOT APPLE)
++IF (UNIX)
+   INSTALL (FILES qgis.1 DESTINATION ${QGIS_MANUAL_DIR}/man1)
+-ENDIF (UNIX AND NOT APPLE)
++ENDIF (UNIX)
+ 
+ INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR})
+ 
diff --git a/geography/qgis/patches/patch-ab b/geography/qgis/patches/patch-ab
deleted file mode 100644
index f01efed6ea2..00000000000
--- a/geography/qgis/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
-
---- src/analysis/interpolation/qgsinterpolator.cpp.orig	2009-12-14 12:39:35.000000000 +0000
-+++ src/analysis/interpolation/qgsinterpolator.cpp
-@@ -92,7 +92,7 @@ int QgsInterpolator::cacheBaseData()
-           continue;
-         }
-         attributeValue = att_it.value().toDouble( &attributeConversionOk );
--        if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-+        if ( !attributeConversionOk || isnanf( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-         {
-           continue;
-         }
diff --git a/geography/qgis/patches/patch-ac b/geography/qgis/patches/patch-ac
deleted file mode 100644
index f986743ab9c..00000000000
--- a/geography/qgis/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
-
---- src/analysis/interpolation/qgstininterpolator.cpp.orig	2009-11-22 14:41:00.000000000 +0000
-+++ src/analysis/interpolation/qgstininterpolator.cpp
-@@ -195,7 +195,7 @@ int QgsTINInterpolator::insertData( QgsF
-       return 3;
-     }
-     attributeValue = att_it.value().toDouble( &attributeConversionOk );
--    if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-+    if ( !attributeConversionOk || isnanf( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation
-     {
-       return 4;
-     }
diff --git a/geography/qgis/patches/patch-ad b/geography/qgis/patches/patch-ad
index a27c9554364..1a76ae4fa26 100644
--- a/geography/qgis/patches/patch-ad
+++ b/geography/qgis/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-ad,v 1.2 2012/01/23 08:58:00 adam Exp $
 
---- src/plugins/grass/qtermwidget/kpty.cpp.orig	2009-12-31 06:59:10.000000000 +0000
+--- src/plugins/grass/qtermwidget/kpty.cpp.orig	2011-06-05 11:59:48.000000000 +0000
 +++ src/plugins/grass/qtermwidget/kpty.cpp
-@@ -61,6 +61,8 @@
+@@ -66,6 +66,8 @@
  #include <unistd.h>
  #include <grp.h>
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
  #if defined(HAVE_PTY_H)
  # include <pty.h>
  #endif
-@@ -565,7 +567,7 @@ void KPty::logout()
+@@ -570,7 +572,7 @@ void KPty::logout()
      ut->ut_type = DEAD_PROCESS;
  #  endif
  #  ifdef HAVE_UTMPX
diff --git a/geography/qgis/patches/patch-al b/geography/qgis/patches/patch-al
index 65c644d8753..6f25757c997 100644
--- a/geography/qgis/patches/patch-al
+++ b/geography/qgis/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-al,v 1.2 2012/01/23 08:58:00 adam Exp $
 
---- src/plugins/grass/CMakeLists.txt.orig	2009-12-03 09:13:55.000000000 +0000
+--- src/plugins/grass/CMakeLists.txt.orig	2011-06-05 11:59:48.000000000 +0000
 +++ src/plugins/grass/CMakeLists.txt
-@@ -147,6 +147,10 @@ INCLUDE_DIRECTORIES(
+@@ -137,6 +137,10 @@ INCLUDE_DIRECTORIES(
       qtermwidget
  )
  
diff --git a/geography/qgis/patches/patch-am b/geography/qgis/patches/patch-am
index 68b704b06ea..3331d0dbca6 100644
--- a/geography/qgis/patches/patch-am
+++ b/geography/qgis/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
+$NetBSD: patch-am,v 1.2 2012/01/23 08:58:00 adam Exp $
 
---- src/providers/grass/CMakeLists.txt.orig	2009-11-28 16:02:15.000000000 +0000
+--- src/providers/grass/CMakeLists.txt.orig	2011-06-05 11:59:48.000000000 +0000
 +++ src/providers/grass/CMakeLists.txt
-@@ -27,6 +27,7 @@ IF (WIN32)
+@@ -34,6 +34,7 @@ IF (WIN32)
    SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
  ELSE (WIN32)
    SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
@@ -10,8 +10,8 @@ $NetBSD: patch-am,v 1.1.1.1 2010/08/27 11:43:05 adam Exp $
  ENDIF (WIN32)
  
  TARGET_LINK_LIBRARIES (qgisgrass
-@@ -48,6 +49,7 @@ IF (WIN32)
-   SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllimport)\"" )
+@@ -55,6 +56,7 @@ IF (WIN32)
+   SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
  ELSE (WIN32)
    SET_TARGET_PROPERTIES(grassprovider PROPERTIES COMPILE_FLAGS "-DGRASS_EXPORT=" )
 +  SET_TARGET_PROPERTIES(grassprovider PROPERTIES LINK_FLAGS "-L${GRASS_PREFIX}/lib -Wl,-rpath,${GRASS_PREFIX}/lib")
diff --git a/geography/qgis/patches/patch-cmake_FindGEOS.cmake b/geography/qgis/patches/patch-cmake_FindGEOS.cmake
new file mode 100644
index 00000000000..f084a37967f
--- /dev/null
+++ b/geography/qgis/patches/patch-cmake_FindGEOS.cmake
@@ -0,0 +1,33 @@
+$NetBSD: patch-cmake_FindGEOS.cmake,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundles.
+
+--- cmake/FindGEOS.cmake.orig	2011-06-07 06:45:26.000000000 +0000
++++ cmake/FindGEOS.cmake
+@@ -45,7 +45,7 @@ ELSE(WIN32)
+ 
+     # try to use framework on mac
+     # want clean framework path, not unix compatibility path
+-    IF (APPLE)
++    IF (ELPPA)
+       IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
+           OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
+           OR NOT CMAKE_FIND_FRAMEWORK)
+@@ -70,7 +70,7 @@ ELSE(WIN32)
+         ENDIF (GEOS_LIBRARY)
+         SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+       ENDIF ()
+-    ENDIF (APPLE)
++    ENDIF (ELPPA)
+ 
+     IF (NOT GEOS_INCLUDE_DIR OR NOT GEOS_LIBRARY OR NOT GEOS_CONFIG)
+       # didn't find OS X framework, and was not set by user
+@@ -114,7 +114,7 @@ ELSE(WIN32)
+         ## split off the link dirs (for rpath)
+         ## use regular expression to match wildcard equivalent "-L*<endchar>"
+         ## with <endchar> is a space or a semicolon
+-        STRING(REGEX MATCHALL "[-][L]([^ ;])+" 
++        STRING(REGEX MATCH "[-][L]([^ ;])+" 
+             GEOS_LINK_DIRECTORIES_WITH_PREFIX 
+             "${GEOS_CONFIG_LIBS}" )
+         #MESSAGE("DBG  GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")
diff --git a/geography/qgis/patches/patch-python_core_sipcorepart1.cpp b/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
new file mode 100644
index 00000000000..6ca56c4df05
--- /dev/null
+++ b/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_core_sipcorepart1.cpp,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix C++ errors.
+
+--- python/core/sipcorepart1.cpp.orig	2012-01-23 06:43:32.000000000 +0000
++++ python/core/sipcorepart1.cpp
+@@ -6661,7 +6661,7 @@ static PyObject *meth_QgsSymbolV2_render
+     PyObject *sipParseErr = NULL;
+ 
+     {
+-        const QgsSymbolV2 *sipCpp;
++        QgsSymbolV2 *sipCpp;
+ 
+         if (sipParseArgs(&sipParseErr, sipArgs, "B", &sipSelf, sipType_QgsSymbolV2, &sipCpp))
+         {
+@@ -7061,7 +7061,7 @@ static PyObject *meth_QgsSymbolV2RenderC
+ 
+     {
+         bool a0;
+-        const QgsSymbolV2RenderContext *sipCpp;
++        QgsSymbolV2RenderContext *sipCpp;
+ 
+         if (sipParseArgs(&sipParseErr, sipArgs, "Bb", &sipSelf, sipType_QgsSymbolV2RenderContext, &sipCpp, &a0))
+         {
diff --git a/geography/qgis/patches/patch-python_core_sipcorepart3.cpp b/geography/qgis/patches/patch-python_core_sipcorepart3.cpp
new file mode 100644
index 00000000000..9205f6b7608
--- /dev/null
+++ b/geography/qgis/patches/patch-python_core_sipcorepart3.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-python_core_sipcorepart3.cpp,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix C++ errors.
+
+--- python/core/sipcorepart3.cpp.orig	2012-01-23 06:46:18.000000000 +0000
++++ python/core/sipcorepart3.cpp
+@@ -2968,7 +2968,7 @@ static PyObject *meth_QgsMapLayer_writeX
+     {
+         QDomNode * a0;
+         QDomDocument * a1;
+-        const QgsMapLayer *sipCpp;
++        QgsMapLayer *sipCpp;
+ 
+         if (sipParseArgs(&sipParseErr, sipArgs, "BJ9J9", &sipSelf, sipType_QgsMapLayer, &sipCpp, sipType_QDomNode, &a0, sipType_QDomDocument, &a1))
+         {
diff --git a/geography/qgis/patches/patch-src_app_CMakeLists.txt b/geography/qgis/patches/patch-src_app_CMakeLists.txt
new file mode 100644
index 00000000000..fd8894eda67
--- /dev/null
+++ b/geography/qgis/patches/patch-src_app_CMakeLists.txt
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_app_CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- src/app/CMakeLists.txt.orig	2012-01-21 19:36:22.000000000 +0000
++++ src/app/CMakeLists.txt
+@@ -446,12 +446,7 @@ IF (SPATIALITE_FOUND)
+   TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${SPATIALITE_LIBRARY})
+ ENDIF (SPATIALITE_FOUND)
+ 
+-IF (APPLE)
+-  # For Mac OS X, the executable must be at the root of the bundle's executable folder
+-  INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+-ELSE (APPLE)
+-  INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${QGIS_BIN_DIR})
+-ENDIF (APPLE)
++INSTALL(TARGETS ${QGIS_APP_NAME} RUNTIME DESTINATION ${QGIS_BIN_DIR})
+ 
+ IF(MSVC)
+   INSTALL(FILES qgis.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
diff --git a/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
new file mode 100644
index 00000000000..4ab1814ba91
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_spatialindex_include_Tools.h
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_core_spatialindex_include_Tools.h,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix building with Clang.
+
+--- src/core/spatialindex/include/Tools.h.orig	2011-06-07 07:42:08.000000000 +0000
++++ src/core/spatialindex/include/Tools.h
+@@ -407,7 +407,7 @@ namespace Tools
+     private:
+       std::map<std::string, Variant> m_propertySet;
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+       // MSVC's friend function syntax differs slightly from everyone elses:
+       // don't seem to need to qualify function name.
+       friend std::ostream& operator<<(
+@@ -620,7 +620,7 @@ namespace Tools
+       unsigned long long* m_a;
+       unsigned long m_k;
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__clang__)
+       // MSVC's friend function syntax differs slightly from everyone elses
+       // don't seem to need to qualify function name.
+       friend std::ostream& operator<<(
diff --git a/geography/qgis/patches/patch-src_core_spatialite_spatialite.c b/geography/qgis/patches/patch-src_core_spatialite_spatialite.c
new file mode 100644
index 00000000000..459f1292b69
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_spatialite_spatialite.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_core_spatialite_spatialite.c,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Fix types.
+
+--- src/core/spatialite/spatialite.c.orig	2011-06-07 07:44:51.000000000 +0000
++++ src/core/spatialite/spatialite.c
+@@ -57583,11 +57583,11 @@ Parse (void *yyp,		/* The parser */
+ 
+ /* #include <inttypes.h> */
+ typedef int8_t flex_int8_t;
+-typedef uint8_t flex_uint8_t;
++typedef u_int8_t flex_uint8_t;
+ typedef int16_t flex_int16_t;
+-typedef uint16_t flex_uint16_t;
++typedef u_int16_t flex_uint16_t;
+ typedef int32_t flex_int32_t;
+-typedef uint32_t flex_uint32_t;
++typedef u_int32_t flex_uint32_t;
+ #else
+ typedef signed char flex_int8_t;
+ typedef short int flex_int16_t;
diff --git a/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt b/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt
new file mode 100644
index 00000000000..90e7745f21e
--- /dev/null
+++ b/geography/qgis/patches/patch-src_helpviewer_CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_helpviewer_CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+
+Avoid application bundle on Mac OS X.
+
+--- src/helpviewer/CMakeLists.txt.orig	2011-12-10 18:23:35.000000000 +0000
++++ src/helpviewer/CMakeLists.txt
+@@ -54,7 +54,7 @@ QT4_WRAP_CPP (HELP_MOC_SRCS  ${HELP_MOC_
+ 
+ #QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
+ 
+-ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
++ADD_EXECUTABLE (qgis_help ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}/../core
+@@ -97,11 +97,4 @@ SET_TARGET_PROPERTIES(qgis_help PROPERTI
+ ########################################################
+ # Install
+ 
+-IF (APPLE)
+-  INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
+-  # needed because global install_name prefix is for main qgis app
+-  INSTALL (CODE "EXECUTE_PROCESS(COMMAND install_name_tool -change ${CMAKE_INSTALL_NAME_DIR}/libqgis_core.${COMPLETE_VERSION}.dylib @executable_path/../../../../lib/libqgis_core.${COMPLETE_VERSION}.dylib \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/MacOS/qgis_help\")")
+-  INSTALL (CODE "EXECUTE_PROCESS (COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qgis_help.app/Contents/Frameworks\")")
+-ELSE (APPLE)
+-  INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
+-ENDIF (APPLE)
++INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})