- Update to 0.11.0

Submitted by:	wen heping <wenheping@gmail.com>

graphics/qgis/Makefile

@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	qgis
-PORTVERSION=	0.7.4
-PORTREVISION=	5
+PORTVERSION=	0.11.0
 CATEGORIES=	graphics geography
-MASTER_SITES=	SF
+MASTER_SITES=	http://download.osgeo.org/qgis/src/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	dyeske@gmail.com
 COMMENT=	Geographical Information System (GIS) data viewer
@@ -18,19 +18,14 @@ LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
 		proj:${PORTSDIR}/graphics/proj \
 		gsl.12:${PORTSDIR}/math/gsl \
 		gdal:${PORTSDIR}/graphics/gdal
-BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-BROKEN=		Does not build with geos 3.x
-DEPRECATED=	has been broken for more than 6 months
-EXPIRATION_DATE=2009-01-19
-
-USE_AUTOTOOLS=	libtool:15
-USE_GMAKE=	yes
-USE_FREETYPE=	yes
-USE_PERL5_BUILD=yes
-USE_QT_VER=	3
+USE_BISON=	build
+USE_CMAKE=	yes
+USE_QT_VER=	4
 USE_SQLITE=	yes
-MAN1=		qgis.1
+CMAKE_USE_PTHREAD=	yes
+CMAKE_ENV+=	QMAKESPEC=${QMAKESPEC}
+QT_COMPONENTS=	qmake gui moc rcc uic svg xml network sql linguist
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qtdir=${QTDIR}
@@ -51,15 +46,12 @@ GRASS_INST_DIR=	grass
 
 .if defined(WITH_GRASS)
 CONFIGURE_ARGS+=--with-grass=${LOCALBASE}/${GRASS_INST_DIR}
-RUN_DEPENDS+=${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
-PLIST_SUB+=	GRASS=""
-.else
-PLIST_SUB+=	GRASS="@comment "
+RUN_DEPENDS+=	${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass
 .endif
 
 .if defined(WITH_POSTGIS)
 CONFIGURE_ARGS+=--with-postgresql
-BUILD_DEPENDS+=${LOCALBASE}/share/postgis:${PORTSDIR}/databases/postgis
+BUILD_DEPENDS+=	${LOCALBASE}/share/postgis:${PORTSDIR}/databases/postgis
 PLIST_SUB+=	PGSQL=""
 .else
 CONFIGURE_ARGS+=--without-postgresql

graphics/qgis/distinfo

@@ -1,3 +1,3 @@
-MD5 (qgis-0.7.4.tar.gz) = 66047d4c15adcb1b5bcb8e5740168cdc
-SHA256 (qgis-0.7.4.tar.gz) = 829407211884f8b88922d2a53f0369accac98ba9317e12caf2156cc1f516f07b
-SIZE (qgis-0.7.4.tar.gz) = 9630420
+MD5 (qgis_0.11.0.tar.gz) = 33a2c5bab0e61fd443250ccd431b6e48
+SHA256 (qgis_0.11.0.tar.gz) = 631dc56df31d99c0229aae3df69b604fdb58d59d0bd8a283f532654e1a5d789f
+SIZE (qgis_0.11.0.tar.gz) = 22261268

graphics/qgis/files/patch-gcc42

@@ -1,87 +0,0 @@
---- src/qgsproject.h	2005-05-11 19:21:56.000000000 -0800
-+++ src2/qgsproject.h	2007-08-14 00:23:04.000000000 -0800
-@@ -95,9 +95,9 @@
-        write()
-      */
-     //@{
--    bool QgsProject::dirty() const;
-+    bool dirty() const;
- 
--    void QgsProject::dirty( bool b );
-+    void dirty( bool b );
-     //@}
- 
- 
---- src/qgsrasterlayerproperties.h	2005-07-30 21:03:14.000000000 -0800
-+++ src2/qgsrasterlayerproperties.h	2007-08-14 00:29:06.000000000 -0800
-@@ -69,7 +69,7 @@
-         /** \brief slot executed when the three band radio button is pressed. */
-         void rbtnThreeBand_toggled( bool );
-         /** \brief slot executed when user wishes to refresh raster histogram */
--        void QgsRasterLayerProperties::pbnHistRefresh_clicked();
-+        void pbnHistRefresh_clicked();
-         /** Override the SRS specified when the layer was loaded */
-         void pbnChangeSpatialRefSys_clicked();
- 
---- src/qgsprojectproperties.h	2005-10-23 16:00:18.000000000 -0800
-+++ src2/qgsprojectproperties.h	2007-08-14 00:32:22.000000000 -0800
-@@ -60,7 +60,7 @@
-   /*! Accessor for projection */
-   QString projectionWKT();
-   /*! Indicates that the projection switch is on */
--  bool QgsProjectProperties::isProjected();
-+  bool isProjected();
- public slots:
-   /*! 
-    * Slot called when a new button (unit) is selected
-
---- src/qgslabel.h.orig	2005-06-03 01:42:55.000000000 -0800
-+++ src/qgslabel.h	2007-08-14 02:12:34.000000000 -0800
-@@ -91,7 +91,7 @@
-     void addRequiredFields ( std::list<int> *fields );
- 
-     //! Available vector fields
--    std::vector<QgsField> & QgsLabel::fields ( void );
-+    std::vector<QgsField> & fields ( void );
- 
-     //! Pointer to default attributes
-     QgsLabelAttributes *layerAttributes ( void );
-
---- providers/gpx/qgsgpxprovider.h.orig	2005-02-11 14:36:49.000000000 -0900
-+++ providers/gpx/qgsgpxprovider.h	2007-08-14 12:03:47.000000000 -0800
-@@ -142,7 +142,7 @@
- 			     const std::map<QString, QString>& attrs);
-   
-   /** Adds one feature (used by addFeatures()) */
--  bool QgsGPXProvider::addFeature(QgsFeature* f);
-+  bool addFeature(QgsFeature* f);
-   
-   /**Returns the default value for attribute @c attr for feature @c f. */
-   QString getDefaultValue(const QString& attr, QgsFeature* f);
-
---- plugins/georeferencer/datapointacetate.h.orig	2005-05-01 12:23:17.000000000 -0800
-+++ plugins/georeferencer/datapointacetate.h	2007-08-14 12:34:48.000000000 -0800
-@@ -13,7 +13,7 @@
- class DataPointAcetate : public QgsAcetateObject {
- public:
-   
--  DataPointAcetate::DataPointAcetate(const QgsPoint& pixelCoords,
-+  DataPointAcetate(const QgsPoint& pixelCoords,
- 				     const QgsPoint& mapCoords)
-   // UGLY!
-     : QgsAcetateObject(const_cast<QgsPoint&>(pixelCoords)),
-
---- plugins/grid_maker/graticulecreator.h.orig	2005-05-29 12:04:47.000000000 -0800
-+++ plugins/grid_maker/graticulecreator.h	2007-08-14 13:13:03.000000000 -0800
-@@ -19,8 +19,8 @@
-                          double theXEndPointDouble,
-                          double theYEndPointDouble);
-         ~GraticuleCreator() {};
--        DBFHandle GraticuleCreator::createDbf (QString theDbfName ) ;
--        SHPHandle GraticuleCreator::createShapeFile(QString theFileName ); 
-+        DBFHandle createDbf (QString theDbfName ) ;
-+        SHPHandle createShapeFile(QString theFileName ); 
-         void writeDbfRecord (DBFHandle theDbfHandle, int theRecordIdInt, QString theLabel) ;
-         void writePoint(SHPHandle theShapeHandle, int theRecordInt, double theXDouble, double y ); 
-         //! Writes a WGS 84 .prj file for the generated grid
-