 @@ -1,14 +1,14 @@
-$NetBSD: TODO,v 1.10982 2012/04/01 22:02:16 dholland Exp $
+$NetBSD: TODO,v 1.10983 2012/04/04 14:28:04 wiz Exp $
 Suggested new packages
 ======================
 	any unresolved PRs (if you have commit access)
 	http://www.netbsd.org/Gnats/category/pkg.html
 	any complete, polished packages in pkgsrc-wip (ditto)
 	http://pkgsrc-wip.sourceforge.net/
 	bacula-rescue
 	Scripts used to help create rescue boot cd's for bare metal
 	restores with bacula.  Scripts exist for linux, solaris, and
 @@ -331,28 +331,28 @@ For possible perl packages updates, see
 	o Mesa-7.11.1
 	o MesaLib-7.11
 	o PAM-0.99.7.1
 	o REminiscence-0.1.9
 	o ROMBuild-2.14
 	o RTx-Shredder-0.05
 	o RealPlayer-11
 	o SmartEiffel-2.3
 	o TeXmacs-1.0.7.15
 	o TiffIO-130e
 	o XaoS-3.5
 	o YoSucker-81
 	o ZIPIdent-2.9
-	o abcm2ps-6.6.3
+	o abcm2ps-6.6.9
-	o abcmidi-20120327
+	o abcmidi-20120403
 	o accerciser-1.12.2 [GNOME 2.32]
 	o accerciser-3.4.0
 	o acme-091 [pkg/44771]
 	o acpica-utils-20110623
 	o acr-0.5.2
 	o adocman-0.13
 	o adtool-1.3
 	o aewm++-1.0.27
 	o afterstep-2.2.11
 	o akonadi-1.7.1
 	o alacarte-0.13.2
 	o album-4.06
 	o aliados-0.2.0
 @@ -398,26 +398,27 @@ For possible perl packages updates, see
 	o asc-2.4.0
 	o aspell-faroese-0.4.0
 	o aspell-norwegian-2.0.10
 	o ast-ksh-20080624 [pkg/37854]
 	o astyle-1.15.3
 	o at-spi-2.4.0
 	o aterm-1.0.1
 	o atk-2.4.0
 	o attica-0.3.0
 	o audacious-plugins-2.4.4
 	o audacity-2.0
 	o autoconvert-0.3.16
 	o autogen-5.15
 	o automake-1.11.4
 	o avcheck-0.91
 	o avidemux-2.5.6
 	o avl-2.0.2a
 	o awesome-3.4.11
 	o baci-20040415
 	o bacula-5.2.6
 	o balance-3.54
 	o balsa-2.4.9
 	o bash-completion-1.3
 	o bbkeys-0.9.0
 	o bbsload-0.2.8
 	o bbweather-0.6.3
 	o bdftopcf-1.0.3 [pkg/45536]
 @@ -435,27 +436,27 @@ For possible perl packages updates, see
 	o bmon-2.1.0
 	o bomberclone-0.11.9
 	o bos-2.5
 	o boson-0.13
 	o botan-1.10.0
 	o brasero-3.4.0
 	o bugzilla-3.6
 	o byacc-20120115
 	o c4-1.10 [schmonz]
 	o cabextract-1.4
 	o cairo-1.12.0
 	o cal3d-0.11.0
 	o calamaris-2.59
-	o calibre-0.8.44
+	o calibre-0.8.45
 	o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/]
 	o cc65-2.13.3
 	o cddbd-1.5.2
 	o cdialog-1.1.20120215
 	o cdif-1.19
 	o cdk-5.0.20120323
 	o cdlabelgen-4.1.0
 	o cdrkit-1.1.10
 	o celestia-1.6.0
 	o cflow-1.4
 	o cheese-2.32.0 [GNOME 2.32]
 	o cheese-3.4.0
 	o chromium-0.9.15
 @@ -478,26 +479,27 @@ For possible perl packages updates, see
 	o consolekit-0.4.0
 	o cook-2.31
 	o coreutils-8.16
 	o courier-0.66.1
 	o covered-0.7.9
 	o covered-current-20090802
 	o cpio-2.9
 	o cpmtools-2.6
 	o cross-h8300-hms-binutils-2.17
 	o crossfire-client-gtk2-1.60.0
 	o cryptopp-5.6.0
 	o csound5-5.13
 	o ctwm-3.8.1
 	o curl-7.25.0
 	o cvs2p4-2.5.5 [schmonz]
 	o cvsd-1.0.23
 	o cygwin_lib-1.5.24.2
 	o damageproto-1.2.1
 	o dansguardian-2.10.0.3
 	o dante-1.3.2
 	o dap-3.7
 	o dar-2.4.4
 	o darcs-2.4
 	o dasher-4.11
 	o dasm-2.20.11
 	o dbench-4.0
 	o dbus-1.4.16
 @@ -548,37 +550,38 @@ For possible perl packages updates, see
 	o elfsh-0.78
 	o elm-me-2.5plalpha28
 	o emacs-muse-3.20
 	o emech-2.8.5.1
 	o emerillon-0.1.90
 	o enca-1.13
 	o encodings-1.0.4
 	o enlightenment-1.0.9
 	o eog-3.4.0
 	o eog-plugins-3.4.0
 	o epic4-2.6
 	o epiphany-extensions-3.2.0
 	o epstool-3.08
-	o eric5-5.2.0
+	o eric5-5.2.1
 	o erlang-15b
 	o esh-0.8.5
 	o espeak-1.40
 	o et-2.60
 	o etach-1.4.1
 	o eterm-0.9.6
 	o etm-890
 	o ettercap-0.7.4
 	o eukleides-1.5.4
 	o evieext-1.1.1
 	o evince-3.4.0
 	o evolution-3.0.0
 	o evolution-couchdb-0.4.5
 	o evolution-exchange-2.32.2
 	o evolution-mapi-0.32.2 [GNOME 2.32]
 	o ex-20050325
 	o ezmlm-idx-5.1.2 [schmonz]
 	o ezxml-0.8.6
 	o f-spot-0.8.2
 	o faces-1.7.7
 	o fakeroot-1.6.5
 	o farsight2-0.0.31
 	o fbreader-0.12.10
 	o fcitx-3.6.2
 @@ -626,27 +629,27 @@ For possible perl packages updates, see
 	o font-misc-ethiopic-1.0.3 [pkg/45549]
 	o font-misc-meltho-1.0.3 [pkg/45549]
 	o font-misc-misc-1.1.2 [pkg/45549]
 	o font-mutt-misc-1.0.3 [pkg/45549]
 	o font-screen-cyrillic-1.0.4 [pkg/45549]
 	o font-sony-misc-1.0.3 [pkg/45549]
 	o font-sun-misc-1.0.3 [pkg/45549]
 	o font-util-1.2.0 [pkg/45537]
 	o font-util-1.3.0
 	o font-winitzki-cyrillic-1.0.3 [pkg/45549]
 	o font-xfree86-type1-1.0.4 [pkg/45549]
 	o fontconfig-2.9.0
 	o fontsproto-2.1.2
-	o fotoxx-12.03
+	o fotoxx-12.04
 	o fox-1.6.41
 	o freeciv-2.3.1
 	o freeglut-2.4.0
 	o freenet-0.7
 	o freepops-0.2.9 [pkg/45790]
 	o freesci-0.6.4
 	o freetype-lib-1.5.20050518
 	o freetype-utils-1.5.20050518
 	o freewais-sf-2.2.14
 	o ftplibpp-2.0.2
 	o fuse-archivemount-0.6.1
 	o fuse-encfs-1.5.2
 	o fuse-ntfs-3g-2012.1.15
 @@ -712,27 +715,27 @@ For possible perl packages updates, see
 	o gnome-power-manager-3.2.1
 	o gnome-session-2.32.1 [GNOME 2.32, wants DeviceKit-power]
 	o gnome-subtitles-1.2
 	o gnome-system-monitor-2.28.2
 	o gnome-system-tools-2.32.0 [GNOME 2.32]
 	o gnome-system-tools-3.0.0
 	o gnome-user-share-2.30.2 [GNOME 2.32]
 	o gnomeicu-0.99.16
 	o gnopernicus-1.1.2
 	o gnu-crypto-2.1.0
 	o gnucash-docs-2.4.1
 	o gnuchess-6.0.1
 	o gnupg2-2.0.19
-	o gnutls-3.0.16
+	o gnutls-3.0.18
 	o gok-2.30.1 [GNOME 2.32]
 	o golem-0.0.6
 	o goocanvas-2.0
 	o gossip-0.31
 	o gourmet-0.13.3
 	o gpredict-1.3
 	o gpsdrive-2.11
 	o gpsim-0.26.1
 	o gramofile-1.6P
 	o gramps3-3.3.1
 	o granulate-0.2
 	o graphviz-2.28.0
 	o grep-2.11
 @@ -752,27 +755,27 @@ For possible perl packages updates, see
 	o gtkmm-3.0
 	o gtkmm-documentation-2.16.0 [GNOME 2.26]
 	o gtkwave-3.3.34
 	o gtodo-0.16.0rc2
 	o gtodo-applet-0.16.2
 	o gtranslator-1.9.6
 	o guile-2.0.5
 	o guile-gtk-2.0
 	o gupnp-0.16.1
 	o gupnp-igd-0.2.1
 	o gutenprint-5.2.7
 	o gv-3.7.3
 	o gvfs-1.6.7
-	o gwaei-3.4.1
+	o gwaei-3.4.2
 	o gworkspace-0.9.0
 	o gxine-0.5.906
 	o gzip-1.4
 	o hackbot-2.21
 	o hamster-applet-2.32.1 [GNOME 2.32]
 	o hanzim-3.4
 	o haproxy-1.4.20
 	o haskell-mode-1.45
 	o hdf-4.2.5 [jpeg library version 7 and higher is not currently supported]
 	o help2man-1.40.7
 	o hesiod-3.1.0
 	o heyu-2.9.0
 	o hiawatha-8.1
 @@ -846,27 +849,27 @@ For possible perl packages updates, see
 	o kphotobook-0.0.7
 	o kronolith-3.0.16
 	o krusader-2.0
 	o ktorrent-4.1.3
 	o ktorrent3-3.3.4
 	o lapack-3.4.0
 	o latd-1.21
 	o latex2rtf-1.9.19
 	o lbdb-0.38
 	o lcc-4.2
 	o ldapsdk-6.0.7
 	o leafnode-1.11.8
 	o level9-4.1
-	o lftp-4.3.5
+	o lftp-4.3.6
 	o lgeneral-1.2.2
 	o libAppleWM-1.4.1
 	o libFS-1.0.4
 	o libICE-1.0.8
 	o libSM-1.2.1
 	o libX11-1.4.4 [pkg/46183]
 	o libXScrnSaver-1.2.2
 	o libXau-1.0.7
 	o libXaw-1.0.10
 	o libXcomposite-0.4.3
 	o libXcursor-1.1.13
 	o libXdmcp-1.1.1
 	o libXevie-1.0.3
 @@ -891,27 +894,27 @@ For possible perl packages updates, see
 	o libcanberra-0.28 [drops support for GNOME2; don't update for now -- wiz]
 	o libcares-1.7.4
 	o libcdio-0.83
 	o libchamplain08-0.12.1
 	o libdrm-2.4.33
 	o libextractor-0.6.3
 	o libffi-3.0.10
 	o libflash-0.4.13
 	o libfolks-0.6.8
 	o libfontenc-1.1.1
 	o libgail-gnome-1.20.4
 	o libgda-4.2.1 [GNOME 2.32]
 	o libgda-4.2.5
-	o libgdata-0.10.2
+	o libgdata-0.12.0
 	o libgiigic-1.1.2
 	o libgnome-keyring-3.4.0
 	o libgnomedb-3.1.2
 	o libgnomekbd-3.4.0.2
 	o libixp-0.5 [breaks wmii-3.6, wait for compatible version]
 	o libjit-1.0.2
 	o libjpeg-turbo-1.2.0
 	o liblbxutil-1.1.0
 	o libltdl-2.4
 	o libmatheval-1.1.6
 	o libmcs-0.7.2
 	o libmilter-8.14.5
 	o libnasl-2.3.1
 @@ -960,26 +963,27 @@ For possible perl packages updates, see
 	o maelstrom-x11-2.0.7
 	o mailgraph-1.14
 	o mailscanner-4.74
 	o makedepend-1.0.4
 	o maketool-0.8.4
 	o makeztxt-1.60
 	o manedit-1.2.1
 	o mantis-1.2.3
 	o matchbox-panel-0.9.3
 	o mathomatic-15.8.2
 	o mc-4.8.1.1
 	o mdocml-1.12.1
 	o mediawiki-1.18.1
 	o meld-1.5.4
 	o mergeant-0.67
 	o mesure-0.7.2
 	o mgetty+sendfax-1.1.35
 	o milkytracker-0.90.85
 	o mined-2012.21
 	o minicom-2.6
 	o minivmac-3.2.3
 	o miredo-1.2.4
 	o mirmon-1.37
 	o mkfontdir-1.0.7
 	o mkfontscale-1.1.0
 	o mknmz-wwwoffle-0.7.2
 	o mksh-40e
 @@ -1022,38 +1026,39 @@ For possible perl packages updates, see
 	o ne-2.01
 	o nessus-4.4.1
 	o net-snmp-5.7.1
 	o netcdf-4.2
 	o netramet-50
 	o newmail-1.0.2
 	o newt-0.52.12
 	o ng-1.4.4
 	o nginx-1.0.14
 	o nhc98-1.22 [pkg/45318]
 	o nikto-2.0.1
 	o nmh-1.4
 	o notification-daemon-0.7.0
-	o ns-3.12.1
+	o ns-3.13
 	o ns-plugger-common-5.1.3
 	o ntp-4.2.6p3
 	o ntp4-4.2.6p5
 	o nulib2-220
 	o nut-17.5
 	o nxtvepg-2.8.1
 	o obexftp-0.23
 	o objc-3.2.8
 	o ocamlduce-3.11.2.0
 	o ocamlnet-2.2.4
 	o ocsigen-1.1.0 [pkg/40761]
 	o octave-3.6.1
 	o olvwm-4.5
 	o oo2c-2.1.7
 	o opal-3.8.0 [pkg/42942]
 	o opal-3.8.3
 	o open-vm-tools-2010.09.19.301124
 	o openafs-1.7.2
 	o opendkim-2.5.0
 	o opengrok-0.11
 	o openh323-1.19.1
 	o openmortal-0.7.1
 	o openmpi-1.5.5
 	o openmsx-0.8.2
 	o openoffice3-3.3
 @@ -1155,30 +1160,31 @@ For possible perl packages updates, see
 	o py-simplejson-2.2.1
 	o py-sqlalchemy-0.6.8
 	o py-sybase-0.37
 	o py-urwid-1.0.1
 	o py-xcbgen-1.7.1
 	o python-3.2
 	o qbrew-0.3.9
 	o qemu-1.0.1 [wip]
 	o qiv-2.2.4 [pkg/46167]
 	o qnetwalk-1.3
 	o quilt-0.60
 	o qvplay-0.95
 	o radiance-3.7.2
-	o rails-3.0.7
+	o rails-3.2.3
 	o raine-0.51.8
 	o randrproto-1.3.2
 	o rapidsvn-0.12
 	o raptor2-2.0.7
 	o rat-4.2.25
 	o rc-1.7.1 [at ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/]
 	o rcs-5.8
 	o rdesktop-1.7.1
 	o rdp-1.6
 	o re-alpine-2.02 [pkg/46025]
 	o recordproto-1.14.2
 	o remind-3.1.12
 	o rendercheck-1.4
 	o renderproto-0.11.1
 	o rep-gtk-0.90.8
 	o resize_image-0.7
 	o resourceproto-1.2.0
 @@ -1250,27 +1256,27 @@ For possible perl packages updates, see
 	o sope-4.6
 	o sound-juicer-2.32.0
 	o source-highlight-3.1.6
 	o spcaview-20060501
 	o spidermonkey-1.8.5
 	o spl-1.0pre6
 	o squidclamav-6.5
 	o srp_client-1.7.5
 	o ssh-askpass-1.2.4.1
 	o ssmtp-2.64 [security]
 	o stalin-0.11
 	o star-1.5.1
 	o statist-1.3.0
-	o stella-3.6
+	o stella-3.6.1
 	o stgit-0.16
 	o stlport-4.6.2
 	o stow-2.2.0
 	o strace-4.5.16
 	o stratagus-2.2.5.5
 	o streamripper-1.63.0
 	o subtitleeditor-0.33.0
 	o subversion-1.7.4
 	o sudo-1.8.4p4
 	o supertuxkart-0.7.3
 	o swfdec-gnome-2.30.1
 	o sympa-6.1.9
 	o sysinfo-4.2.2
 @@ -1369,27 +1375,27 @@ For possible perl packages updates, see
 	o wbm-cyrus-imapd-1.6.2
 	o wcalc-2.4
 	o webalizer-2.23.05
 	o webkit-gtk-1.8.0
 	o webmin-1.550 [security] [pkg/45066]
 	o webmin-1.580 [security]
 	o websvn-2.3.2
 	o weechat-0.3.7
 	o wesnoth-1.10.1
 	o whohas-0.29
 	o windowlab-1.40
 	o windowmaker-0.95.2 [wip]
 	o wine-1.4
-	o wine-devel-1.5.0
+	o wine-devel-1.5.1
 	o wmi-11
 	o wml-2.0.11
 	o wmnd-0.4.13
 	o wmweather-2.4.4
 	o wmx-7
 	o worker-2.19.2
 	o wpi-firmware-1.14.2
 	o wwwoffle-2.9h
 	o wxGTK28-2.8.12
 	o wxRemind-101
 	o wyrd-1.4.4 [pkg/43792]
 	o wyrd-1.4.5
 	o x11perf-1.5.4
 @@ -1525,37 +1531,38 @@ For possible perl packages updates, see
 	o xsoldier-1.4
 	o xterm-278
 	o xtraceroute-0.9.1
 	o xtrans-1.2.7
 	o xtu-1.3
 	o xtux-20030306
 	o xvidcap-1.1.7
 	o xview-3.2.1.4.25.5
 	o xvinfo-1.1.1
 	o xvkbd-3.3
 	o xwd-1.0.5
 	o xwininfo-1.1.2
 	o xwpe-1.5.30a
-	o xwud-1.0.3
+	o xwud-1.0.4
 	o xye-0.12.1
 	o xzip-182
 	o yafc-1.1
 	o yaz-4.1.7
 	o yodl-2.14.3
 	o yorick-2.1.05
 	o z26-2.14
 	o zenicb-1.31 (needs merge with lots of local changes)
 	o zephyr-20070719
 	o zile-2.4.7
 	o zim-0.56
 	o zircon-1.18.256
 	o zoom-1.1.3
 	o zopeedit-0.8
 Infrastructure problems which need addressing
 =============================================
 	o Correct and consistent handling of file names containing
 	  white-space and other special characters.
 	o bootstrap building of gcc2/gcc3.
 Licenses of packages

 @@ -1,14 +1,14 @@
-$NetBSD: CHANGES-2012,v 1.1057 2012/04/04 13:22:39 obache Exp $
+$NetBSD: CHANGES-2012,v 1.1058 2012/04/04 14:28:04 wiz Exp $
 Changes to the packages collection and infrastructure in 2012:
 	Updated net/xnap to 2.0nb2 [ryoon 2012-01-01]
 	Updated cross/h8300-hms-gcc to 3.1nb6 [dholland 2012-01-02]
 	Updated security/cy2-gssapi to 2.1.25nb1 [obache 2012-01-02]
 	Updated audio/alsa-lib to 1.0.22 [sbd 2012-01-02]
 	Updated devel/cutter to 1.2.0 [obache 2012-01-02]
 	Updated www/contao210-translations to 20111231 [taca 2012-01-02]
 	Updated pkgtools/port2pkg to 1.12 [joerg 2012-01-02]
 	Updated textproc/mdoclint to 1.14 [wiz 2012-01-02]
 	Updated net/ldns to 1.6.11nb1 [pettai 2012-01-02]
 	Updated math/ntl to 5.5.2 [dholland 2012-01-02]
 @@ -1712,13 +1712,14 @@ Changes to the packages collection and i
 	Updated x11/kdelibs4 to 4.8.0nb2 [dholland 2012-04-02]
 	Updated print/teTeX3-texmf to 3.0nb34 [minskim 2012-04-02]
 	Updated net/tightvnc to 1.3.10nb5 [obache 2012-04-03]
 	Updated textproc/p5-Text-BibTeX to 0.48 [markd 2012-04-03]
 	Updated textproc/libxml2 to 2.7.8nb9 [obache 2012-04-03]
 	Updated sysutils/cdrtools to 3.01alpha07nb1 [wiz 2012-04-04]
 	Updated www/apache-tomcat55 to 5.5.35 [obache 2012-04-04]
 	Updated www/contao211-translations to 201204040 [taca 2012-04-04]
 	Updated chat/libpurple to 2.10.3 [obache 2012-04-04]
 	Updated chat/finch to 2.10.3 [obache 2012-04-04]
 	Updated chat/pidgin to 2.10.3 [obache 2012-04-04]
 	Updated chat/pidgin-sametime to 2.10.3 [obache 2012-04-04]
 	Updated chat/pidgin-silc to 2.10.3 [obache 2012-04-04]
 	Updated mail/rss2email to 2.71nb2 [wiz 2012-04-04]