Update version of qgis, gdal-lib and mapserver

Add merkaator

1 files changed, 5 insertions, 4 deletions

diff --git a/doc/TODO b/doc/TODO
index e69ff8d867a..e6eb55d51af 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.15097 2015/11/14 05:08:18 wen Exp $
+$NetBSD: TODO,v 1.15098 2015/11/15 02:57:45 wen Exp $
 
 Suggested new packages
 ======================
@@ -736,7 +736,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o gcombust-0.1.55
 	o gcompris-15.02
 	o gcpio-2.12
-	o gdal-lib-1.11.2
+	o gdal-lib-2.0.1
 	o gdb-7.10
 	o gdeskcal-1.01
 	o gdl-3.16.0
@@ -1093,7 +1093,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o man-pages-4.01
 	o manedit-1.2.1
 	o mantis-1.2.19
-	o mapserver-12.11
+	o mapserver-7.0.0
 	o matchbox-panel-0.9.3
 	o mbedtls-2.0.0
 	o mbuf-20141227
@@ -1103,6 +1103,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o memcached-1.4.24
 	o menhir-20141215
 	o mergeant-0.67
+        o merkaator-0.18.2
 	o mesure-0.7.2
 	o metacity-3.14.2
 	o metis-5.1.0
@@ -1531,7 +1532,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html.
 	o pythontidy-1.23
 	o qbzr-0.22.4
 	o qcad-3.7.5.0
-	o qgis-2.10.1
+	o qgis-2.12.0
 	o qhull-2009.1.3
 	o qlandkartegt-1.8.1 [pkg/49910]
 	o qnetwalk-1.4