Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching

error, and to sync with reality.

2 files changed, 52 insertions, 23 deletions

diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010
index ec33074f984..dd7b1aa80a2 100644
--- a/doc/CHANGES-2010
+++ b/doc/CHANGES-2010
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.2306 2010/06/25 22:15:44 wiz Exp $
+$NetBSD: CHANGES-2010,v 1.2306.2.1 2010/07/04 07:11:21 agc Exp $
 
 PKGSRC IS CURRENTLY FROZEN FOR NEW FUNCTIONALITY - PLEASE DO NOT ADD
 ANY NEW PACKAGES, AND PLEASE DO NOT MAKE INFRASTRUCTURE CHANGES, UNTIL
@@ -2510,6 +2510,7 @@ Changes to the packages collection and infrastructure in 2010:
 	Updated mail/cone to 0.83 [adam 2010-05-18]
 	Updated audio/cmus to 2.3.2 [gls 2010-05-18]
 	Updated chat/irssi-icb to 0.14nb16 [sketch 2010-05-18]
+	Added x11/qt4-creator version 1.3.1 [drochner 2010-05-18]
 	Updated lang/gprolog to 1.3.1 [asau 2010-05-19]
 	Updated lang/snobol to 1.3 [asau 2010-05-19]
 	Added math/TinySVM version 0.09 [obache 2010-05-19]
@@ -3062,3 +3063,21 @@ Changes to the packages collection and infrastructure in 2010:
 	Updated www/seamonkey to 2.0.5 [tnn 2010-06-25]
 	Removed www/pyblosxom successor www/py-blosxom [hauke 2010-06-25]
 	Updated fonts/umefont-ttf to 0.416 [wiz 2010-06-25]
+	Updated graphics/png to 1.4.3 [wiz 2010-06-26]
+	Updated mail/getmail to 4.18.0 [schmonz 2010-06-27]
+	Updated inputmethod/scim-tomoe to 0.6.0nb3 [obache 2010-06-27]
+	Updated inputmethod/tomoe-gtk to 0.6.0nb5 [obache 2010-06-27]
+	Removed databases/php-odbc [joerg 2010-06-27]
+	Updated x11/gtkmm to 2.20.3nb2 [wiz 2010-06-28]
+	Updated sysutils/fabric to 0.9.1 [gls 2010-06-28]
+	Updated security/py-openid to 2.2.5 [roy 2010-06-28]
+	Updated lang/python26 to 2.6.5nb1 [tron 2010-06-29]
+	Updated mail/getmail to 4.19.0 [schmonz 2010-06-29]
+	Updated graphics/rabbit to 0.6.4nb2 [obache 2010-06-30]
+	Updated print/ghostscript to 8.71nb4 [tron 2010-06-30]
+	Updated mail/getmail to 4.20.0 [schmonz 2010-06-30]
+	Updated www/w3m to 0.5.2nb5 [tron 2010-07-01]
+	Updated www/w3m-img to 0.5.2nb5 [tron 2010-07-01]
+	Updated net/mydns-pgsql to 1.1.0nb9 [ghen 2010-07-01]
+	Updated net/mydns-mysql to 1.1.0nb4 [ghen 2010-07-01]
+	Updated devel/atf to 0.10 [jmmv 2010-07-02]
diff --git a/doc/TODO b/doc/TODO
index 60745974b08..659b2621321 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9430 2010/06/25 22:15:44 wiz Exp $
+$NetBSD: TODO,v 1.9430.2.1 2010/07/04 07:11:21 agc Exp $
 
 Suggested new packages
 ======================
@@ -345,7 +345,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o GMT-4.2.1
 	o GUIlib-1.1.2
 	o GutenMark-20090216
-	o ImageMagick-6.6.2.7
+	o ImageMagick-6.6.2.9
 	o MAMEDiff-2.30
 	o Mesa-7.8.2
 	o MesaLib-7.8.0
@@ -354,7 +354,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o ROMBuild-2.14
 	o RTx-Shredder-0.05
 	o RealPlayer-11
-	o Sigil-0.2.1
+	o Sigil-0.2.3
 	o SmartEiffel-2.3
 	o TeXmacs-1.0.7.4
 	o TiffIO-130e
@@ -412,7 +412,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o aqsis-1.6.0
 	o aranym-0.9.9
 	o argtable-2.9
-	o aria2-1.9.4
+	o aria2-1.9.4 [pkg/43511]
 	o arla-0.90
 	o arnold-20040104
 	o arping-2.09
@@ -423,12 +423,12 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o ast-ksh-20080624 [pkg/37854]
 	o asterisk16-1.6.2.6
 	o astyle-1.15.3
-	o asymptote-1.99
+	o asymptote-2.00
 	o aterm-1.0.1
 	o auctex-11.86
 	o audacious-plugins-2.3
 	o autoconvert-0.3.16
-	o autogen-5.10.1
+	o autogen-5.10.2
 	o avcheck-0.91
 	o avl-2.0.2a
 	o awesome-3.4.5
@@ -528,7 +528,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o dmenu-4.1.1
 	o dnsmasq-2.55
 	o dnstracer-1.9
-	o doxygen-1.7.0
+	o doxygen-1.7.1
 	o dpkg-1.14.25
 	o drivel-3.0.0
 	o drscheme-4.0.2
@@ -561,7 +561,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o enlightenment-1.0.0
 	o enscript-1.6.5.2
 	o eog-2.30.2 [GNOME 2.30]
-	o eog-plugins-2.30.1 [GNOME 2.30]
+	o eog-plugins-2.30.2 [GNOME 2.30]
 	o epic4-2.6
 	o epiphany-2.30.2 [GNOME 2.30]
 	o epiphany-extensions-2.30.1 [GNOME 2.30]
@@ -572,7 +572,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o espeak-1.40
 	o et-2.60
 	o etach-1.4.1
-	o etm-623
+	o etm-630
 	o eukleides-1.5.4
 	o evince-2.30.3 [GNOME 2.30]
 	o evolution-2.30.2 [GNOME 2.30]
@@ -593,7 +593,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o fbreader-0.12.10
 	o fcitx-3.6.2
 	o fd-3.00d
-	o feh-1.7
+	o feh-1.8
 	o festival-1.96
 	o felt-3.07
 	o fetchyahoo-2.13.8
@@ -731,6 +731,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o gnu-crypto-2.1.0
 	o gnumeric110-1.10.6
 	o gnupg2-2.0.15
+	o gnutls-2.10.0
 	o gob2-2.0.17
 	o goffice0.8-0.8.6
 	o gogo-3.11p1
@@ -765,6 +766,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o gtranslator-1.9.6
 	o gucharmap-2.30.2 [GNOME 2.30]
 	o guile-gtk-2.0
+	o guile-www-2.26
 	o gupnp-0.13.4
 	o gutenprint-5.2.5
 	o gv-3.7.1
@@ -947,9 +949,11 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o mantis-1.2.1
 	o matchbox-panel-0.9.3
 	o mathomatic-15.1.4
+	o mawk-1.3.4.20100625
 	o mc-4.7.0.5
 	o mdocml-1.10.2
 	o mediatomb-0.12.1
+	o meld-1.3.2
 	o memconf-2.9 [pkg/40201]
 	o merb-1.0.8.1
 	o merb-action-args-1.0.8.1
@@ -977,7 +981,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o mgetty+sendfax-1.1.35
 	o midori-0.2.6 [pkg/43500]
 	o milkytracker-0.90.85
-	o mimedefang-2.69
+	o mimedefang-2.70
 	o mined-2000.16
 	o minicom-2.4
 	o minivmac-3.0.4
@@ -1074,10 +1078,11 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o p5-JSON-2.21
 	o p5-MIME-tools-5.428
 	o p5-Module-Build-0.36090
-	o p5-Module-Install-0.99
+	o p5-Module-CoreList-2.35
+	o p5-Module-Install-1.00
 	o p5-Mouse-0.61
 	o p5-POE-1.289 [pkg/43115]
-	o p5-PerlMagick-6.6.2.7
+	o p5-PerlMagick-6.6.2.9
 	o p5-Pod-Readme-0.10
 	o p5-Search-Xapian-1.0.20.0
 	o p5-Set-Infinite-0.65
@@ -1085,6 +1090,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o p5-URI-1.54
 	o p5-XML-RSS-1.48
 	o p5-YAML-Syck-1.10
+	o p5-YAML-Tiny-1.42
 	o p5-ispman-1.2
 	o p5-sybperl-2.18
 	o p5-xmltv-0.5.57
@@ -1098,6 +1104,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o pbzip2-1.1.1
 	o pcal-4.8
 	o pcmanfm-0.5.2 [pkg/42451]
+	o pcre-8.10
 	o pdmenu-1.2.87
 	o pen-0.17.3
 	o perl-5.12.0
@@ -1125,6 +1132,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o plone3-3.3.4
 	o ploticus-2.41
 	o ploticus-examples-230
+	o plptools-1.0.10
 	o pngcheck-2.3.0
 	o po4a-0.36.3
 	o polsms-2.1.0
@@ -1146,7 +1154,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o puf-0.93.3
 	o pure-ftpd-1.0.29
 	o puzzle-5.2
-	o puzzles-8966
+	o puzzles-8969
 	o pv-1.1.4
 	o pwlib-1.11.1
 	o py-FourSuite-1.0.2
@@ -1157,7 +1165,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o py-bdb-xml-2.1.8
 	o py-checker-0.8.17
 	o py-cheetah-2.4.2.1 [pkg/43458]
-	o py-cups-1.9.50
+	o py-cups-1.9.51
 	o py-fpconst-0.7.2 [pkg/42556]
 	o py-game-1.9.1
 	o py-gnome2-desktop-2.30.2 [GNOME 2.30]
@@ -1170,6 +1178,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o py-m2crypto-0.20.2
 	o py-markdown-2.0.3 [pkg/43448]
 	o py-matplotlib-0.99.3
+	o py-moin-1.9.3 [pkg/43524]
 	o py-nevow-0.10.0
 	o py-psycopg-2.2.1
 	o py-psycopg2-2.0.14
@@ -1185,6 +1194,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o qpopper-4.0.14
 	o qrencode-3.1.1
 	o qt3-qscintilla-2.4.3 [wip]
+	o qt4-creator-2.0.0
 	o qvplay-0.95
 	o radiance-3.7.2
 	o raine-0.51.8
@@ -1251,7 +1261,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o samba-3.5.3
 	o sane-backends-1.0.21
 	o sarg-2.2.5
-	o sawfish-1.6.3
+	o sawfish-1.6.3.1
 	o saxon-9.2
 	o scamper-20070201
 	o scapy-2.1.1
@@ -1334,7 +1344,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o tea-28.0.0
 	o ted-en-us-2.17
 	o teem-1.10.0
-	o telepathy-gabble-0.9.13
+	o telepathy-gabble-0.9.14
 	o tetrinetx-1.40c
 	o tex-musixtex-113 [pkg/34758]
 	o texmaker-1.9.9
@@ -1370,7 +1380,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o ubs-0.20
 	o ucarp-1.5.1
 	o ucblogo-5.5
-	o udunits-1.12.9
+	o udunits-2.1.17 [pkg/43529]
 	o unicap-0.9.8
 	o unrealircd-3.2.8.1
 	o ups-nut-2.2.1 [pkgsrc-wip]
@@ -1417,14 +1427,14 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o wmweather-2.4.4
 	o wmx-7
 	o wordpress-3.0
-	o worker-2.17.7
+	o worker-2.17.8
 	o wormux-0.9.2
 	o wpi-firmware-1.14.2
 	o wwwoffle-2.9f
 	o wxGTK28-2.8.11
 	o wxRemind-101
 	o wyrd-1.4.4
-	o x264-devel-20100619
+	o x264-devel-20100626
 	o xanalyser-1.30
 	o xapian-1.0.21
 	o xapian-omega-1.0.21
@@ -1456,7 +1466,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o xf86-video-dummy-0.3.2
 	o xf86-video-geode-2.11.8 [wip]
 	o xf86-video-glide-1.0.3
-	o xf86-video-intel-2.11.0
+	o xf86-video-intel-2.12.0
 	o xf86-video-mga-1.4.12
 	o xf86-video-newport-0.2.3 [unpackaged]
 	o xf86-video-nv-2.1.17
@@ -1507,7 +1517,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o xmule-1.12.2
 	o xnap-2.5r3
 	o xorg-docs-1.5
-	o xorg-util-macros-1.9.0
+	o xorg-util-macros-1.10.0
 	o xpad-2.13
 	o xpr-1.0.3 [unpackaged]
 	o xproto-7.0.17