 @@ -1,14 +1,14 @@
-$NetBSD: TODO,v 1.8849 2010/01/16 16:35:16 wiz Exp $
+$NetBSD: TODO,v 1.8850 2010/01/16 16:40:44 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
 @@ -326,27 +326,27 @@ Suggested new packages
 	font-micro-misc, font-misc-cyrillic, font-misc-ethiopic,
 	font-misc-meltho, font-schumacher-misc, font-screen-cyrillic,
 	font-sun-misc, font-winitzki-cyrillic, font-xfree86-type1,
 	libWindowsWM, libXfontcache, util-macros, viewres, windowswmproto,
 	xcmsdb, xf86-input-acecad, xf86-input-aiptek, xf86-input-evdev,
 	xf86-input-joystick, xf86-input-synaptics, xf86-input-wacom,
 	xf86-video-dummy, xf86-video-fbdev, xf86-video-glide,
 	xf86-video-impact, xf86-video-newport, xf86-video-sisusb,
 	xf86-video-sunbw2, xf86-video-suncg14, xf86-video-suncg3,
 	xf86-video-suncg6, xf86-video-sunffb, xf86-video-sunleo,
 	xf86-video-suntcx, xf86-video-v4l, xf86-video-vermilion,
 	xf86-video-voodoo, xf86-video-xgi, xf86-video-xgixp, xf86dga,
 	xgc, xkbevd, xkbprint, xkbutils, xlsatoms, xorg-sgml-doctools,
-	xpr, xpyb, mkcomposecache, xscope
+	xpr, xpyb, mkcomposecache, xscope, xf86-video-qxl
 Suggested package updates
 =========================
 For possible perl packages updates, see http://www.pkgbox.org/p2c/
 	o 9base-20060125
 	o CSP-0.34
 	o Canna-3.7p3
 	o Chinput-3.0.1
 	o Coin-2.4.5
 	o DatLib-2.35
 	o DatUtil-2.45
 @@ -458,84 +458,85 @@ For possible perl packages updates, see
 	o blur6ex-0.3.462
 	o bmon-2.1.0
 	o bochs-2.4.2 [pkg/42443]
 	o bonnie++-1.96
 	o bos-2.5
 	o boson-0.13
 	o bugzilla-3.4.4
 	o byacc-20080824
 	o bzr-2.0.3
 	o c4-1.10 [schmonz]
 	o cadaver-0.23.0
 	o cal3d-0.11.0
 	o calamaris-2.59
-	o calibre-0.6.32
+	o calibre-0.6.33
 	o camlimages-3.0.2
 	o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/]
 	o cddbd-1.5.2
 	o cdif-1.19
 	o cdlabelgen-4.1.0
-	o cdrtools-2.01.01alpha71
+	o cdrtools-2.01.01alpha72
 	o cfitsio-3210
 	o cgdb-0.6.5
 	o cgicc-3.2.9
 	o cheese-2.28.1 [GNOME 2.28]
 	o cherokee-0.99.39
 	o cinepaint-0.23
 	o cint-5.16
 	o cjk-lyx-1.4.4
 	o classpath-0.98
 	o claws-mail-3.7.3
 	o climm-0.6.4
 	o cln-1.3.1
 	o clutter-1.0.10
 	o colorize-0.3.4
 	o cone-0.78 [pkg/41623]
 	o cone-0.80
 	o connect-1.96
 	o conserver-8.1.17
 	o consolekit-0.4.0
 	o cook-2.31
 	o coreutils-7.5
 	o courier-0.62.0
 	o courier-imap-4.5.0
 	o covered-0.7.7
 	o covered-current-20090802
 	o cpio-2.9
 	o cpmtools-2.6
 	o cppunit-1.12.0
 	o cross-h8300-hms-binutils-2.17
 	o cryptopp-5.6.0
 	o cssc-1.2.0
 	o cups-1.4.2
 	o cvs2p4-2.5.5 [schmonz]
-	o cvsd-1.0.17
+	o cvsd-1.0.18
 	o cygwin_lib-1.5.24.2
 	o cyrus-imapd-2.3.13
 	o dansguardian-2.10.0.3
 	o dante-1.2.0
 	o dap-3.7
 	o dar-2.3.9
 	o darcs-2.1.2
 	o db4-4.8.24
 	o dbench-4.0
 	o dbus-1.2.16 [don't update until https://bugs.freedesktop.org/show_bug.cgi?id=18980 is fixed]
 	o dbxml-2.5.13
 	o dc_gui2-0.80
 	o dctc-0.85.9
 	o ddclient-3.7.3
 	o ddrescue-1.11
 	o defendguin-0.0.11
 	o delegate-9.9.6
-	o denemo-0.8.10
+	o denemo-0.8.12
 	o dhid-5.3
 	o dinotrace-9.3e
 	o dinotrace-mode-9.3e
 	o dircproxy-devel-1.2.0.2
 	o dnstracer-1.9
 	o doxygen-1.6.2
 	o dpkg-1.14.25
 	o dri2proto-2.2
 	o drivel-3.0.0
 	o drscheme-4.0.2
 	o dspam-3.9.0
 	o easymenu-0.7.2p1
 	o ec-fonts-mftraced-1.0.12
 @@ -547,41 +548,38 @@ For possible perl packages updates, see
 	o ejabberd-2.1.1
 	o electric-8.10
 	o electricfence-2.4.16
 	o elf-0.5.4p1
 	o elfsh-0.65 [pkg/33959]
 	o elfsh-0.78
 	o elm-me-2.4pl124d
 	o elscreen-1.4.6
 	o emacs-wiki-2.72
 	o emech-2.8.5.1
 	o empathy-2.28.2 [GNOME 2.28]
 	o enca-1.12
 	o enlightenment-1.0.0
 	o eog-2.28.2
 	o eog-plugins-2.28.1 [GNOME 2.28]
 	o epic4-2.6
 	o epiphany-2.28.2 [GNOME 2.28]
 	o epiphany-extensions-2.28.1 [GNOME 2.28]
 	o epsg-7.4 [portions in pkg/42419]
 	o epstool-3.08
 	o eric3-4.4.0 [now called eric4]
 	o erubis-2.6.2
 	o esh-0.8.5
 	o esmtp-1.0
 	o espeak-1.40
 	o et-2.60
 	o etach-1.4.1
-	o etm-465
+	o etm-474
 	o evolution-exchange-2.28.2
 	o evolution-mapi-0.28.2 [GNOME 2.28]
 	o ex-20050325
 	o exempi-2.0.2 [broken on NetBSD]
 	o exempi-2.1.1
 	o exiftool-7.67
 	o exiv2-0.19
 	o ezmlm-idx-5.1.2 [schmonz]
 	o ezxml-0.8.6
 	o faces-1.7.7
 	o fakeroot-1.6.5
 	o farsight2-0.0.17
 	o fbreader-0.12.1
 @@ -618,27 +616,27 @@ For possible perl packages updates, see
 	o font-bitstream-100dpi-1.0.1
 	o font-bitstream-75dpi-1.0.1
 	o font-bitstream-type1-1.0.1
 	o font-cursor-misc-1.0.1
 	o font-daewoo-misc-1.0.1
 	o font-dec-misc-1.0.1
 	o font-ibm-type1-1.0.1
 	o font-isas-misc-1.0.1
 	o font-jis-misc-1.0.1
 	o font-misc-misc-1.1.0
 	o font-mutt-misc-1.0.1
 	o font-sony-misc-1.0.1
 	o font-util-1.1.1
-	o fotoxx-9.2
+	o fotoxx-9.3
 	o freeciv-2.1.10
 	o freeglut-2.4.0
 	o freenet-0.7
 	o freeradius-1.1.8
 	o freesci-0.6.4
 	o freetype-lib-1.5.20050518
 	o freetype-utils-1.5.20050518
 	o freewais-sf-2.2.14
 	o frozen-bubble-2.2.0
 	o ftplibpp-2.0.2
 	o fugu-1.2.3
 	o fuse-archivemount-0.6.0
 	o fuse-encfs-1.5.2
 @@ -676,36 +674,36 @@ For possible perl packages updates, see
 	o gifsicle-1.48
 	o gimp-docs-2.4.2
 	o gkrellm-2.3.1
 	o gkrellm-multiping-2.0.13
 	o gkrellm-snmp-1.0
 	o gkrellm-xmms-2.1.22
 	o glade3-3.6.7 [GNOME 2.26]
 	o glchess-1.0.5
 	o gle-4.2.1
 	o glib2-2.22.4
 	o global-5.7.2 [pkg/39760]
 	o global-5.7.3
 	o glom-1.10.0 [GNOME 2.26]
-	o glpk-4.41
+	o glpk-4.42
 	o glproto-1.4.11
 	o gmime24-2.4.12
 	o gmp-5.0.0
 	o gnash-0.8.6
 	o gnet1-1.1.9
 	o gnetman-20050429
 	o gnome-bluetooth-2.28.3 [GNOME 2.28]
 	o gnome-desktop-2.28.2
 	o gnome-devel-docs-2.28.1 [GNOME 2.28]
-	o gnome-games-2.28.2
+	o gnome-media-2.28.5
 	o gnome-netstatus-2.28.0 [GNOME 2.28]
 	o gnome-nettool-2.28.0 [GNOME 2.28]
 	o gnome-packagekit-2.28.2 [GNOME 2.28]
 	o gnome-power-manager-2.28.2 [GNOME 2.28, wants DeviceKit-power]
 	o gnome-session-2.28.0 [GNOME 2.28, wants DeviceKit-power]
 	o gnome-subtitles-0.9.1 [pkg/42582]
 	o gnome-system-tools-2.28.2 [GNOME 2.28]
 	o gnome-user-docs-2.28.2 [GNOME 2.28]
 	o gnome-user-share-2.28.2 [GNOME 2.28]
 	o gnome-web-photo-0.6 [GNOME 2.26]
 	o gnomeicu-0.99.14
 	o gnopernicus-1.1.2
 	o gnu-crypto-2.1.0
 @@ -721,26 +719,27 @@ For possible perl packages updates, see
 	o gpsdrive-2.09
 	o gramofile-1.6P
 	o granulate-0.2
 	o graphviz-2.26.0
 	o grep-2.5.4
 	o gsasl-1.4.0
 	o gsharutils-4.7
 	o gss-0.1.0
 	o gssdp-0.7.1
 	o gst-plugins0.10-ffmpeg-0.10.7
 	o gtick-0.4.2
 	o gtk-doc-1.13
 	o gtk-systrace-20030623
 	o gtk2+-2.18.6
 	o gtk2-engines-2.18.5
 	o gtkglarea-2.0.1
 	o gtkimageview-1.6.4
 	o gtkmm-documentation-2.16.0 [GNOME 2.26]
 	o gtksourceview-2.8.2
 	o gtkyahoo-0.18.3
 	o gtodo-0.16.0rc2
 	o gtodo-applet-0.16.2
 	o gtranscript-0.2.0
 	o gtranslator-1.9.6
 	o guile-gtk-2.0
 	o gupnp-0.13.2
 	o gupnp-igd-0.1.5 [needs gupnp-1.0 >= 0.13.2]
 @@ -758,27 +757,27 @@ For possible perl packages updates, see
 	o help2man-1.37.1
 	o hercules-3.04.1
 	o hesiod-3.1.0
 	o heyu-2.8.0
 	o hiawatha-6.19
 	o highlight-2.13
 	o hobbitmon-4.0.4 [pkg/30484]
 	o honeyd-1.5c
 	o host-20070128
 	o hpijs-2.1.7 - note: hplip-0.9.7.tar.gz includes hpijs-2.1.7 in prnt
 	o html2ps-1.0b5
 	o html2wml-0.4.11
 	o htop-0.8.3
-	o httping-1.40
+	o httping-1.41
 	o httptunnel-3.3
 	o hydrogen-0.9.3 [pkg/37424]
 	o hylafax-5.3.0
 	o ical-2.3.2
 	o icdprog-0.5
 	o icsi-finger-1.0.29
 	o ifile-1.3.8
 	o ifp-line-0.3 [pkg/38038]
 	o ike-2.0.1 [pkg/37032]
 	o imapproxy-1.2.5 [see http://horde.org/imapproxy/ -> www.imapproxy.org]
 	o imp-4.3.6
 	o ingo-1.2.3
 	o inputproto-2.0 [xorg-server 1.7]
 @@ -812,30 +811,31 @@ For possible perl packages updates, see
 	o jools-1.0
 	o jpeg-8
 	o jpilot-1.6.2
 	o kadu-0.6.5
 	o kaffe-1.1.9
 	o kaffeine-0.8.7
 	o kapooka-0.3
 	o kasumi-2.5
 	o kbibtex-0.2.2
 	o kdbg-2.2.0
 	o kdrill-6.5
 	o kid3-1.3
 	o kinput2-3.1
-	o kismet-2009.11.01 (kismet-2009.11.r1)
+	o kismet-2010.01r1
 	o kmess-1.5.1
 	o kmp-0.5
 	o kodos-2.4.5
 	o koffice-2.1.1
 	o koffice-l10n-de-2.0.2
 	o konversation-1.2.1
 	o kphotobook-0.0.7
 	o kronolith-2.3.3
 	o krusader-2.0
 	o ktorrent3-3.3.2
 	o lablgtk-2.14.0
 	o lapack-3.2.1
 	o latd-1.21
 	o latex2rtf-1.9.19
 	o lbreakout2-2.6.1
 	o lcc-4.2
 	o ldapsdk-6.0.2
 @@ -845,57 +845,59 @@ For possible perl packages updates, see
 	o lftp-4.0.5
 	o libXext-1.1.1 [xorg-server 1.7]
 	o libXfixes-4.0.4 [xorg-server 1.7]
 	o libXi-1.3 [xorg-server 1.7]
 	o libXinerama-1.1 [xorg-server 1.7]
 	o libXt-1.0.7
 	o libXtst-1.1.0 [xorg-server 1.7]
 	o libarchive-2.7.0
 	o libassuan-2.0.0
 	o libcares-1.7.0
 	o libdockapp-0.6.1
 	o libdrm-2.4.16
 	o libev-3.9
-	o libextractor-0.5.23
+	o libextractor-0.6.0
 	o libflash-0.4.13
 	o libgda-4.0.5 [GNOME 2.28]
 	o libgdiplus-2.6
 	o libgee-0.5.0
 	o libggi-2.2.2
 	o libggigcp-1.0.2
 	o libggimisc-2.2.2
 	o libggiwmh-0.3.2
 	o libgii-1.0.2
 	o libgiigic-1.1.2
 	o libgnomedb-3.1.2
 	o libhydrogen-0.9.2
 	o libiconv-1.13.1
 	o libidn-1.16
 	o libixp-0.5 [breaks wmii-3.6, wait for compatible version]
 	o libjit-1.0.2
 	o liblbxutil-1.1.0
 	o liblinebreak-2.0
 	o liblzo-2.02
 	o libmatheval-1.1.6
 	o libmp3splt-0.5.8
 	o libnasl-2.3.1
 	o libntlm-1.1
 	o libole2-2.2.8
 	o libpciaccess-0.11.0
 	o librep-0.90.5
 	o libssh-0.4.0
 	o libstree-0.4.2
 	o libtcl-nothread-8.5.1
 	o libusb-1.0
 	o libv4l-0.6.3
 	o libxklavier-5.0
 	o licq-1.3.8
 	o lighttpd-1.4.25
 	o listres-1.0.2
 	o lincvs-2.1.3 [now called CrossVC]
 	o listres-1.0.2
 	o lmbench-2.5 [http://lmbench.sourceforge.net/]
 	o lmms-0.4.5
 	o lout-3.38
 	o lpairs-1.0.4
 	o lq-sp-1.3.4.13
 	o lsh-2.0.3
 	o lsof-4.81
 	o ltris-1.0.14
 @@ -953,27 +955,27 @@ For possible perl packages updates, see
 	o mknmz-wwwoffle-0.7.2
 	o mkvtoolnix-3.0.0
 	o mlterm-2.9.4
 	o moc-2.4.4
 	o modular-xorg-server-1.7.4
 	o molden-4.8 [after which PR 40252 can be closed]
 	o mono-2.6.1
 	o mono-tools-2.4.3
 	o mono-xsp-2.4.3
 	o monodevelop-2.2
 	o moserial-2.28.0 [GNOME 2.28]
 	o mousetweaks-2.28.2
 	o mp3blaster-3.2.3
-	o mp3diags-1.0.01
+	o mp3diags-1.0.02
 	o mp3splt-2.2.7
 	o mpc-0.19
 	o mpeg4ip-1.6.1
 	o mpg123-1.10.0
 	o mpop-1.0.19
 	o mserv-devel-0.41
 	o msf-2.7
 	o msmtp-1.4.19
 	o mtools-4.0.11
 	o multitail-5.2.2
 	o munin-1.4.3
 	o muse-0.9.2
 	o musicpd-0.15.7
 @@ -982,27 +984,27 @@ For possible perl packages updates, see
 	o mysqlcc-0.9.8
 	o nagios-3.2.0
 	o nano-2.2.0
 	o nap-1.5.3
 	o nautilus-sendto-2.28.2
 	o navi2ch-1.8.1
 	o nawk-20071023
 	o ncftp3-3.2.1 [pkg/37859]
 	o ncftp3-3.2.2
 	o ncmpc-0.16
 	o ncview-1.93b
 	o ne-2.01
 	o nelma-3.1
-	o neon-0.29.2
+	o neon-0.29.3
 	o nessus-3.2.0
 	o netcdf-4.0.1
 	o netpbm-10.45.04
 	o netperf-2.4.4
 	o netpipe-3.6.2
 	o netramet-50
 	o newmail-1.0.2
 	o newmat-11
 	o newt-0.52.2 (ubuntu)
 	o ng-1.4.4
 	o nikto-2.0.1
 	o ns-3.5
 	o ns-flash-10
 @@ -1053,27 +1055,27 @@ For possible perl packages updates, see
 	o p5-Digest-SHA-5.48
 	o p5-Error-0.17016
 	o p5-FCGI-1.3.0
 	o p5-IMDB-Film-0.43
 	o p5-IO-Compress-2.024
 	o p5-Image-Info-1.30
 	o p5-JSON-2.17
 	o p5-MailTools-2.05
 	o p5-Module-CoreList-2.24
 	o p5-Mouse-0.46
 	o p5-Net-DNS-0.66
 	o p5-Pod-Simple-3.13
 	o p5-Regexp-Common-2010010201
-	o p5-Spreadsheet-WriteExcel-2.34
+	o p5-Spreadsheet-WriteExcel-2.35
 	o p5-WWW-Curl-4.11
 	o p5-XML-Atom-0.37
 	o p5-YAML-0.71
 	o p5-ispman-1.2
 	o p5-sybperl-2.18
 	o packagekit-0.5.1
 	o pam-smbpass-3.0.13
 	o pango-1.26.2
 	o paprefs-0.9.8
 	o pari-2.3.3 [pkg/38116]
 	o pari-galdata-2.2 [pkg/38117]
 	o parrot-1.9.0
 	o patch-2.6.1
 @@ -1099,65 +1101,64 @@ For possible perl packages updates, see
 	o pear-Numbers_Roman-1.0.1
 	o pear-Numbers_Words-0.15.0
 	o pear-SOAP-0.10.1
 	o pen-0.17.3
 	o pessulus-2.28.0 [GNOME 2.28]
 	o pgadmin3-1.10.0
 	o pgpool-3.1.1
 	o phoon-20050629
 	o photopc-3.05
 	o php4-domxml-5.2.1
 	o php4-filepro-5.2.1
 	o php4-xslt-5.2.1
 	o php4-yp-5.2.1
 	o php5-5.2.12 [taca is working]
 	o php5-5.3.0
 	o php-jpgraph-3.0.6
-	o phpmyadmin-3.2.4
+	o phpmyadmin-3.2.5
 	o phylip-3.68
 	o picp-0.6.8
 	o pim6dd-20040819a
 	o pim6sd-20040824a
 	o pinfo-0.6.9
 	o pioneers-0.12.2
 	o pircbot-1.4.6
 	o pixman-0.16.4
 	o pks-0.9.6
 	o plone-3.2.3 [should make plone-32?]
 	o plone3-3.3.3
 	o ploticus-2.41
 	o ploticus-examples-230
 	o plotutils-2.5
 	o plptools-1.0.9
 	o pngcheck-2.3.0
 	o po4a-0.36.3
 	o poedit-1.4.3
 	o polkit-qt-0.9.3
 	o polsms-2.1.0
 	o poppass-4.0.14
 	o poppler-0.12.3
 	o poppy-4.01
 	o posh-0.5.5
 	o postal-0.70
 	o pptp-1.7.1 [pkg/38038]
 	o profit-2.5.3
 	o projclock-0.9
 	o proxsmtp-1.6
 	o psmisc-21.9
 	o puf-0.93.3
 	o pulseaudio-0.9.21
-	o puppet-0.25.2
+	o puppet-0.25.3
 	o pure-ftpd-1.0.27
 	o puzzle-5.2
-	o puzzles-8824
+	o puzzles-8841
 	o pv-1.1.4
 	o pwlib-1.11.1
 	o py-FourSuite-1.0.2
 	o py-Gnosis-Utils-1.2.1
 	o py-HappyDoc-3.0
 	o py-Optik-1.5.3 [pkg/41674]
 	o py-Scientific-2.5.5
 	o py-Scientific-doc-2.5.5
 	o py-TPG-3.0.5
 	o py-TTFQuery-1.0.0
 	o py-ZODB-3.2.10
 	o py-ZopeInterface-3.3.0
 	o py-bdb-xml-2.1.8
 @@ -1165,27 +1166,27 @@ For possible perl packages updates, see
 	o py-checker-0.8.17
 	o py-cups-1.9.47
 	o py-fpconst-0.7.2 [pkg/42556]
 	o py-game-1.9.1
 	o py-gnosis-1.2.2
 	o py-gnosis-utils-1.2.1
 	o py-gnutls-0.2.1
 	o py-html2text-2.37
 	o py-icalendar-2.1
 	o py-karaoke-0.7.2
 	o py-kenosis-0.96 [pkg/42561]
 	o py-logging-0.4.9.6 [pkg/41675]
 	o py-m2crypto-0.20.2
-	o py-moin-1.9.0
+	o py-moin-1.9.0 [pkg/42602]
 	o py-psycopg-2.0.13
 	o py-pytz-2009u
 	o py-subversion-1.6.6
 	o py-sybase-0.37
 	o py-twisted-9.0.0
 	o py-urwid-0.9.9
 	o py-zconfig-2.6.1 [pkg/42563]
 	o python-3.1.1
 	o qbrew-0.3.9
 	o qemu-0.12.1
 	o qnetwalk-1.3
 	o qpopper-4.0.14
 	o qt3-qscintilla-2.4
 @@ -1249,40 +1250,40 @@ For possible perl packages updates, see
 	o ruby-parsetree-3.0.3
 	o ruby-racc-1.4.6
 	o ruby-rgl-0.4.0
 	o ruby-rspec-1.1.12
 	o ruby-rttool-1.0.3.0
 	o ruby-sequel-2.9.0
 	o ruby-sequel-core-2.2.0
 	o ruby-will-paginate-2.2.3
 	o rudiments-0.30
 	o rxvt-unicode-9.07
 	o sabayon-2.28.1 [GNOME 2.28]
 	o sablecc-3.2
 	o samba-3.2.15
-	o samba-3.3.9
+	o samba-3.3.10
 	o samba-3.4.4
 	o sarg-2.2.5
 	o sawfish-1.6.1
 	o saxon-9.2
 	o sbcl-1.0.34
 	o scamper-20070201
 	o scapy-2.1.0
 	o scew-0.4.0
 	o sch-3.8.3
 	o scilab-5.2.0
 	o scm-5e5
 	o scrollz-1.9.99
-	o scrotwm-0.9.21
+	o scrotwm-0.9.22
 	o scsh-1.3.0
 	o sdcc-2.9.0
 	o sdlmame-0.136
 	o sendfile-20010424
 	o ser-0.9.6
 	o sessreg-1.0.5
 	o sharity-3.7
 	o sharity-light-1.3
 	o shc-3.8
 	o shmux-1.0.2
 	o sign-1.0.7
 	o silc-server-1.1.18
 	o silc-toolkit-1.1.10
 @@ -1291,26 +1292,27 @@ For possible perl packages updates, see
 	o sitecopy-0.16.5
 	o sitescooper-3.1.2
 	o sj3-lib-2.0.1.21 [http://code.google.com/p/sj3/]
 	o sjeng-11.2
 	o skipstone-1.0.1
 	o skype-2.1.0.47
 	o smalleiffel-0.90
 	o smproxy-1.0.3
 	o smtpfeed-1.20
 	o snd-10.6
 	o snes9x-1.51
 	o snort-2.8.5.2
 	o snownews-1.5.12
 	o socat-1.7.1.2
 	o solfege-3.14.10
 	o sope-4.6
 	o source-highlight-3.1.2
 	o sox-14.2.0
 	o spcaview-20060501
 	o spim-7.4
 	o sqlitemanager-1.2.2
 	o srp_client-1.7.5 [jlam]
 	o ssh-askpass-1.2.4.1
 	o star-1.5.1
 	o statist-1.3.0
 	o stlport-4.6.2
 	o strace-4.5.16
 @@ -1350,27 +1352,26 @@ For possible perl packages updates, see
 	o tig-0.15
 	o tile-0.7.4
 	o tinc-1.0.11
 	o tinyproxy-1.7.0
 	o tk-8.5.8
 	o tk83-8.3.5
 	o tkcvs-8.2
 	o tkgate-1.8.7
 	o tkhylafax-3.2
 	o tkpasman-2.2b
 	o tn5250-0.17.3 [at http://tn5250.sourceforge.net/]
 	o tob-0.26
 	o top-3.8beta1
 	o totem-2.28.5
 	o tpasm-1.2
 	o tpb-0.6.4
 	o trio-1.12
 	o tripwire-2.3.1 [see also pkg/22362]
 	o tsclient-0.140
 	o ttf2pk-1.5.20050518
 	o turba-2.3.3
 	o tuxpaint-0.9.21
 	o twelf-1.5r1
 	o txt2html-2.51
 	o uae-0.8.29
 	o ubs-0.20
 	o ucarp-1.5.1
 @@ -1404,27 +1405,27 @@ For possible perl packages updates, see
 	o vsftpd-2.2.2
 	o vttest-20071216
 	o wMosaic-3.8.22
 	o wap-utils-1.4.1
 	o warzone2100-2.2.4
 	o wbm-cyrus-imapd-1.6.2
 	o wcalc-2.4
 	o webby-0.9.3
 	o webkit-1.1.15.4
 	o webmin-1.500
 	o weewm-0.01
 	o whohas-0.23
 	o windowlab-1.39
-	o wine-devel-1.1.35
+	o wine-devel-1.1.36
 	o wml-2.0.11
 	o wmnd-0.4.13
 	o wmweather-2.4.4
 	o wmx-7
 	o wordpress-2.9.1
 	o worker-2.17.5
 	o wpi-firmware-1.14.2
 	o wwwoffle-2.9e
 	o wxRemind-101
 	o wyrd-1.4.4
 	o x11vnc-0.9.9
 	o x264-devel-20100109
 	o xanalyser-1.30
 @@ -1497,42 +1498,44 @@ For possible perl packages updates, see
 	o xmms-dspectogram-1.2.1
 	o xmms-fmradio-1.5
 	o xmms-gdancer-0.4.6
 	o xmms-infinity-0.6.1
 	o xmms-iris-0.12
 	o xmms-musepack-1.8.0 [http://dl.slik.org/musepack/xmms-musepack-1.8.0.tar.gz]
 	o xmmsctrl-1.8
 	o xmon-1.5.6
 	o xmp-3.1.0
 	o xmule-1.12.2
 	o xnap-2.5r3
 	o xorg-cf-files-1.0.3
 	o xorg-docs-1.5
 	o xorg-util-macros-1.4.2
 	o xpad-2.13
 	o xpr-1.0.3 [unpackaged]
 	o xpuyopuyo-0.9.8
 	o xrmap-anthems-1.2
 	o xrmap-base-2.33.1
 	o xrn-9.02
 	o xsane-0.99.6
 	o xscope-1.2 [unpackaged]
 	o xskat-4.0
 	o xsoldier-1.4
 	o xterm-254
 	o xtraceroute-0.9.1
 	o xtrans-1.2.5
 	o xtu-1.3
 	o xtux-20030306
 	o xvidcap-1.1.7
 	o xvidtune-1.0.2
 	o xview-3.2.1.4.21.8
 	o xwpe-1.5.30a
 	o xzip-182
 	o yafc-1.1
 	o yodl-2.14.3
 	o youtube-dl-20100106
 	o ysm-2.9.9.1
 	o yudit-2.9.0
 	o yorick-2.1.05
 	o zebra-0.95a
 	o zenicb-1.31 (needs merge with lots of local changes)
 	o zephyr-20070719
 	o zile-2.3.14