Changes 1.7.4:

* Fix5010 Line intersection non fatal error
* Fix2992 Use native Separators in Filename-edit-widget
* Fix4633 'Save as...DXF' does not add file extension
* Fix4412 Ftools: Input layers are not presented in alphabetical order
* Fix4326 Use project title as default filename in Save and Save as dialogs
* Fix4623 GPS plugin: 'Save as...' does not add file extension
* Fix4652 Remove "unsynced" EPSG CRS that are not listed in GDAL
* Fix4625 Enable wait cursor when WMS search is ongoing
* Fix3845 Add support for modulo operator (%) in rule based rendering
* Fix4193 GRASS Rasters are not drawn with user-defined style
* Fix4557 Fix crash when project is not yet saved
* Fix4315 'Stretch Histogram to full dataset' toolbar button does not work with
  GRASS rasters
* Fix4632 More precise composer map rotation
* Fix4664 Fix label orientation with line dependent position
* Fix2435 Fix Query builder from layer properties when layer name in cyrrilic
* Fix4684 Skip attribute values with invalid variant type
* Fix4549 Update QgsGenericProjectionSelector bindings
* Fix4129 GDAL provider: add statusChanged signal and fix debugging output
* Fix4379 If set 'prompt for CRS', CRS is asked when creating new shapefile
  layer
* Fix4694 Hourglass not shown when classifying
* Fix4478 Actions using %% do not work from identify results
* Fix4646 Editing of table of attributes goes Wild
* Fix3963 Crash when applying a graduated vector style
* Fix3185,4689 Gps Tools: Allow user to add new ports
* Fix4402 QGIS crashes displaying overview if diagrams are used
* Fix4371 Identify tool does not work with reprojected WMS layers
* Fix4305 Query builder: added ' ' around numeric fields (wrong)
* Fix4217 Allow up to 5 decimal places for width/size Scale Field
* Fix4452 Support for cyrillic symbols in raster metadata
* Fix4558 Enhancements in OGR Provider
* Fix3201 Show warning when user tried to create field 'shape' in shapefile

7 files changed, 45 insertions, 66 deletions

diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index e0310b44705..3fde4b31df8 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/02/06 12:40:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2012/02/26 23:19:02 adam Exp $
 
-DISTNAME=	qgis-1.7.3
-PKGREVISION=	1
+DISTNAME=	qgis-1.7.4
 CATEGORIES=	geography
 MASTER_SITES=	http://qgis.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,8 +12,6 @@ LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-
 USE_CMAKE=		yes
 USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
diff --git a/geography/qgis/PLIST b/geography/qgis/PLIST
index f5eb6d48e2c..c948f9434d7 100644
--- a/geography/qgis/PLIST
+++ b/geography/qgis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/01/23 08:58:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/02/26 23:19:02 adam Exp $
 bin/qgis
 include/qgis/characterwidget.h
 include/qgis/qextserialenumerator.h
@@ -247,9 +247,11 @@ 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_et.qm
 share/qgis/i18n/qgis_fa.qm
 share/qgis/i18n/qgis_fi.qm
 share/qgis/i18n/qgis_fr.qm
+share/qgis/i18n/qgis_gl_ES.qm
 share/qgis/i18n/qgis_he.qm
 share/qgis/i18n/qgis_hr_HR.qm
 share/qgis/i18n/qgis_hu.qm
@@ -258,6 +260,7 @@ share/qgis/i18n/qgis_is.qm
 share/qgis/i18n/qgis_it.qm
 share/qgis/i18n/qgis_ja.qm
 share/qgis/i18n/qgis_ka_GE.qm
+share/qgis/i18n/qgis_ko_KR.qm
 share/qgis/i18n/qgis_lo.qm
 share/qgis/i18n/qgis_lt.qm
 share/qgis/i18n/qgis_lv.qm
@@ -290,6 +293,8 @@ share/qgis/images/splash/splash.png
 share/qgis/images/splash/splash_mask.png
 ${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/24-to-8-bits.png
+${PLIST.python}share/qgis/python/plugins/GdalTools/icons/8-to-24-bits.png
 ${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
@@ -299,12 +304,10 @@ ${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
 ${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
@@ -444,6 +447,7 @@ ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/layer_extent.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/management.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/matrix.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/mean.png
+${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/merge_shapes.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/multi_to_single.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/neighbour.png
 ${PLIST.python}share/qgis/python/plugins/fTools/icons/gis/random_points.png
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo
index c17321d2b18..ee3746973c6 100644
--- a/geography/qgis/distinfo
+++ b/geography/qgis/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.3 2012/01/23 08:58:00 adam Exp $
+$NetBSD: distinfo,v 1.4 2012/02/26 23:19:02 adam Exp $
 
-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 (qgis-1.7.4.tar.bz2) = 0dae5cb933d1ce621e5fe30c1937887d813a2098
+RMD160 (qgis-1.7.4.tar.bz2) = dae51556b09a57ce9537ca4ed75830f15e3be5a4
+Size (qgis-1.7.4.tar.bz2) = 25618352 bytes
+SHA1 (patch-CMakeLists.txt) = 544c1ea142978b5762028aeabf21b3b81982b3e0
 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_qgsapplication.cpp) = 336de19802fdfb0cbe8e83f62f230404324af3e7
 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
index d103ee8dd19..b0a348432e2 100644
--- a/geography/qgis/patches/patch-CMakeLists.txt
+++ b/geography/qgis/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/01/23 08:58:00 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2012/02/26 23:19:02 adam Exp $
 
 Avoid application bundle on Mac OS X.
 
---- CMakeLists.txt.orig	2011-12-10 18:23:35.000000000 +0000
+--- CMakeLists.txt.orig	2012-02-22 20:48:14.000000000 +0000
 +++ CMakeLists.txt
 @@ -5,11 +5,7 @@ SET(COMPLETE_VERSION ${CPACK_PACKAGE_VER
  SET(RELEASE_NAME "Wroclaw")
@@ -17,7 +17,7 @@ Avoid application bundle on Mac OS X.
  
  # 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)
+@@ -286,10 +282,7 @@ ELSE (WIN32)
  
    IF (APPLE)
      # for Mac OS X, everything is put inside an application bundle
@@ -25,35 +25,38 @@ Avoid application bundle on Mac OS X.
 -    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 )
+@@ -307,18 +300,16 @@ ELSE (WIN32)
  
      SET (DEFAULT_BIN_SUBDIR      bin)
--    SET (QGIS_BIN_SUBDIR_REV     ..)
+     SET (QGIS_BIN_SUBDIR_REV     ..)
 -    SET (DEFAULT_CGIBIN_SUBDIR   fcgi-bin)
--    SET (QGIS_CGIBIN_SUBDIR_REV  ..)
 +    SET (DEFAULT_CGIBIN_SUBDIR   bin)
+     SET (QGIS_CGIBIN_SUBDIR_REV  ..)
      SET (DEFAULT_LIB_SUBDIR      lib)
--    SET (QGIS_LIB_SUBDIR_REV     ..)
+     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 (QGIS_DATA_SUBDIR_REV    ../..)
      SET (DEFAULT_LIBEXEC_SUBDIR  lib/qgis)
--    SET (QGIS_LIBEXEC_SUBDIR_REV ../..)
+     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 (QGIS_PLUGIN_SUBDIR_REV  ../../..)
      SET (DEFAULT_INCLUDE_SUBDIR  include/qgis)
  
    ELSE (APPLE)
-@@ -500,9 +487,9 @@ IF (APPLE)
+@@ -496,13 +487,12 @@ ENDIF (ENABLE_TESTS)
+ 
+ IF (APPLE)
+   # must be last for install, so install_name_tool can do its work
+-  SUBDIRS (mac)
  ENDIF (APPLE)
  
  # manual page - makes sense only on unix systems
diff --git a/geography/qgis/patches/patch-python_core_sipcorepart1.cpp b/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
deleted file mode 100644
index 6ca56c4df05..00000000000
--- a/geography/qgis/patches/patch-python_core_sipcorepart1.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 9205f6b7608..00000000000
--- a/geography/qgis/patches/patch-python_core_sipcorepart3.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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_core_qgsapplication.cpp b/geography/qgis/patches/patch-src_core_qgsapplication.cpp
new file mode 100644
index 00000000000..12a638d4394
--- /dev/null
+++ b/geography/qgis/patches/patch-src_core_qgsapplication.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_core_qgsapplication.cpp,v 1.1 2012/02/26 23:19:02 adam Exp $
+
+Use UNIX prefix path on Mac OS X.
+
+--- src/core/qgsapplication.cpp.orig	2012-02-26 22:09:01.000000000 +0000
++++ src/core/qgsapplication.cpp
+@@ -60,7 +60,7 @@ QString QgsApplication::mConfigPath = QD
+ QgsApplication::QgsApplication( int & argc, char ** argv, bool GUIenabled, QString customConfigPath )
+     : QApplication( argc, argv, GUIenabled )
+ {
+-#if defined(Q_WS_MACX) || defined(Q_WS_WIN32) || defined(WIN32)
++#if defined(Q_WS_WIN32) || defined(WIN32)
+   setPrefixPath( applicationDirPath(), true );
+ #else
+   QDir myDir( applicationDirPath() );