Fix some entries' spelling or version to be easier to parse.

Move blackdown-{jdk,jre}14, lablgtk2, and coda6 to suggested packages.
Add version number to alee-ttf entry.
Remove some entries that are duplicates of other entries under different
names.
Remove foomatic [jlam] and pgplot [grant] entries, since we don't
have packages for those yet.

+ dvipng-1.3, gcpio-2.5.90, gst-plugins-0.8.6, liferea-0.6.3,
  nut-10.11, obexftp-0.10.6, py-TPG-3.0.4,

1 files changed, 67 insertions, 66 deletions

diff --git a/doc/TODO b/doc/TODO
index 982ed5bb237..2b8e1c41c8a 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2492 2004/11/26 22:00:38 snj Exp $
+$NetBSD: TODO,v 1.2493 2004/11/26 22:06:56 wiz Exp $
 
 Suggested new packages
 ======================
@@ -243,6 +243,18 @@ Suggested new packages
 	http://www.memtest.org/
 	Updated version of memtest86 memory tester
 
+	lablgtk2
+	GTK2 interface for ocaml
+	http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
+
+	coda6
+	Version 6 of coda
+	http://www.coda.cs.cmu.edu/
+
+	Blackdown JDK/JRE 1.4
+	1.4 version of Blackdown's Java for Linux
+	http://www.blackdown.org/java-linux/java2-status/jdk1.4-status.html
+
 
 Suggested package updates
 =========================
@@ -257,12 +269,11 @@ Suggested package updates
 	o GUIlib-1.1.1
 	o GridSim-3.1
 	o GutenMark-20040320
-	o ImageMagick-6.1.5-5
+	o ImageMagick-6.1.5.5
 	o LPRng-3.8.28
 	o Ngraph-6.3.30
 	o ORBit-0.5.17
 	o PAM-0.78
-	o TPG-3.0.4
 	o TeXmacs-1.0.4.4
 	o Xaw3d-1.5E
 	o YoSucker-63
@@ -276,7 +287,7 @@ Suggested package updates
 	o aiksaurus-1.2.1
 	o aim-1.5.286
 	o ald-0.1.6 [pkg/26431]
-	o alee-ttf
+	o alee-ttf-3.1
 	o algae-4.3.6
 	o amavis-0.3.12
 	o amavisd-new-2.1.2 [pkg/26843]
@@ -311,12 +322,12 @@ Suggested package updates
 	o asc-1.15.1.0
 	o aspell-0.60.1.1
 	o aspell-czech-0.51
-	o aspell-english-0.51-1
-	o aspell-fo-0.51-0
-	o aspell-italian-0.53-0
-	o aspell-polish-0.51-0
-	o aspell-svenska-0.51-0
-	o aspell-ukrainian-0.51-0
+	o aspell-english-0.51.1
+	o aspell-faroese-0.51.0
+	o aspell-italian-0.53.0
+	o aspell-polish-0.51.0
+	o aspell-svenska-0.51.0
+	o aspell-ukrainian-0.51.0
 	o ast-ksh-20040229
 	o astyle-1.15.3
 	o atlc-4.2.11
@@ -335,8 +346,6 @@ Suggested package updates
 	o binkd-098
 	o bins-1.1.27
 	o bioperl-1.4
-	o blackdown-jdk14-1.4.2
-	o blackdown-jre14-1.4.2
 	o blender-2.35
 	o blitz++-0.8
 	o boaconstructor-0.3.1
@@ -381,7 +390,6 @@ Suggested package updates
 	o cmake-2.0.5
 	o cmp3-2.0pre6
 	o cocoon-2.1.6
-	o coda-6.0.7
 	o codeville-0.1.9
 	o columba-1.0RC1
 	o common-mml-1.2.16
@@ -390,15 +398,14 @@ Suggested package updates
 	o controlcenter-1.4.0.5
 	o cooledit-3.17.12
 	o corewars-0.9.13
-	o courier-0.47
 	o courier-auth-0.47
 	o courier-imap-3.0.8
 	o covered-0.3
 	o covered-current-20040325
-	o cpio-2.5.90
 	o crafty-19.5
 	o criticalmass-0.99
-	o crossfire-1.5.0
+	o crossfire-cli-1.5.0
+	o crossfire-srv-1.5.0
 	o crypto++-52
 	o cscope-15.5
 	o cstream-2.5
@@ -408,7 +415,7 @@ Suggested package updates
 	o cwtext-0.94
 	o cxref-1.6
 	o cy-login-1.5.28
-	o cygwin_lib-1.5.12-1
+	o cygwin_lib-1.5.12.1
 	o cyrus-imapd21-2.1.17
 	o cyrus-imapd22-2.2.10
 	o cyrus-sasl-1.5.28
@@ -445,6 +452,7 @@ Suggested package updates
 	o dvd+rw-tools-5.21.4.10.8
 	o dvdrip-0.51.2
 	o dvipng-1.2 [http://sourceforge.net/projects/dvipng/]
+	o dvipng-1.3
 	o dxpc-3.8.2
 	o dylan-compiler-2.4.0
 	o dylan-interpreter-2.4.0
@@ -467,8 +475,7 @@ Suggested package updates
 	o epic4-2.1.1
 	o epiphany-extensions-1.4.2
 	o epydoc-2.1
-	o erlang-9C-2
-	o erlang-r10b
+	o erlang-10b.1a
 	o esh-0.8.5
 	o etach-1.4.0
 	o ettercap-0.7.1 [wip/ettercap-NG|adrianp]
@@ -495,7 +502,6 @@ Suggested package updates
 	o fluxbox-0.9.10
 	o fmsx-28
 	o fondu-040927
-	o foomatic-3.0.1 [jlam]
 	o fop-0.20.5
 	o fort77-1.18
 	o fox-1.2.11
@@ -513,6 +519,7 @@ Suggested package updates
 	o gbib-0.1.2
 	o gcombust-0.1.55
 	o gconfmm26-2.8.0?
+	o gcpio-2.5.90
 	o gdb6-6.3.0
 	o gdeskcal-0.57.1
 	o gdm-2.6.0.6
@@ -547,7 +554,7 @@ Suggested package updates
 	o gnome-mag-0.11.9
 	o gnome-pilot-2.0.12
 	o gnome-print-0.37
-	o gnome-themes-extra-0.8
+	o gnome-themes-extras-0.8
 	o gnome-utils-1.4.1.3
 	o gnome-vfs-2.8.3
 	o gnome-vfsmm26-2.8.0?
@@ -573,8 +580,9 @@ Suggested package updates
 	o gsasl-0.2.1
 	o gsed-4.1.2
 	o gss-0.0.15
+	o gst-plugins-0.8.6
 	o gtk-send-pr-0.4
-	o gtk-systrace-2003-06-23
+	o gtk-systrace-2003.06.23
 	o gtksee-0.5.6 [pkg/26372]
 	o gtkspell-2.0.8
 	o gtkyahoo-0.18.3
@@ -600,7 +608,7 @@ Suggested package updates
 	o hp2xx-3.4.4
 	o httperf-0.8
 	o httptunnel-3.3
-	o hugu-3.1.01
+	o hugo-3.1.01
 	o hydrogen-0.9.0
 	o hylafax-4.2.0
 	o i2ocfg-1.1
@@ -621,7 +629,7 @@ Suggested package updates
 	o inform-6.30.2
 	o intercal-0.24 [dillo]
 	o intltool-0.32.1
-	o ion3-20041104
+	o ion3-devel-20041104
 	o ipcheck-0.219
 	o iperf-2.0.1
 	o ircd-hybrid-7.0.4
@@ -629,7 +637,7 @@ Suggested package updates
 	o iroffer-1.309
 	o irrd-2.2.2
 	o iselect-1.3.0
-	o ispell-3.2.06
+	o ispell-base-3.2.06
 	o ispell-gaeilge-3.5
 	o ispman-1.1.1
 	o isync-1.0.0
@@ -664,7 +672,6 @@ Suggested package updates
 	o ksi-3.4.2
 	o kth-krb4-1.2.2
 	o lablgtk-1.2.7
-	o lablgtk2-2.4.0
 	o larswm-7.5.3
 	o latd-1.21
 	o latex2rtf-1.9.16a
@@ -700,8 +707,8 @@ Suggested package updates
 	o libsmi-0.4.3
 	o libtcl-nothread-8.4.8
 	o libtecla-1.6.1
-	o libtiff-3.7.0 [reed]
-	o licq-1.3.0
+	o licq-core-1.3.0
+	o liferea-0.6.3
 	o lilypond-2.4
 	o linuxsms-0.77
 	o lmbench-2.0.4
@@ -713,7 +720,8 @@ Suggested package updates
 	o ltris-1.0.7
 	o lv-451
 	o lwp-1.12
-	o lyx-1.3.5
+	o lyx-qt-1.3.5
+	o lyx-xforms-1.3.5
 	o maelstrom-x11-2.0.7
 	o mail-notification-1.0
 	o maildrop-1.5.3 [pkg/22369]
@@ -727,12 +735,12 @@ Suggested package updates
 	o malsync-2.2.0
 	o maradns-1.0.23
 	o marbles-1.0.6
+	o mc-4.6.0 [pkgsrc-wip]
 	o memtest86-3.2
 	o mergeant-0.52
 	o mew-4.1
-	o mgetty-1.1.31
+	o mgetty+sendfax-1.1.31
 	o micq-0.4.12
-	o midnight-commander-4.6.0 [pkgsrc-wip]
 	o milter-greylist-1.5.12
 	o mini_sendmail-1.3.5
 	o minicom-2.1
@@ -743,7 +751,7 @@ Suggested package updates
 	o mlview-0.7.1
 	o mmix-20041014
 	o molden-4.2
-	o monafont-2.90
+	o monafonts-2.90
 	o monotone-0.15
 	o most-4.9.5
 	o mowitz-0.3.0
@@ -760,7 +768,7 @@ Suggested package updates
 	o multi-gnome-terminal-1.6.2
 	o multitail-3.4.0
 	o mummer-3.15
-	o namazu-2.0.13
+	o namazu2-2.0.13
 	o nano-1.3.5
 	o nap-1.5.3
 	o napshare-1.2
@@ -782,22 +790,22 @@ Suggested package updates
 	o newmat-11
 	o newscache-1.1.92
 	o ng-1.4.4
-	o ngspice-15c
+	o ng-spice-15c
 	o nhc98-1.17
-	o nkf-204-2004.11.03
+	o nkf-204.2004.11.03
 	o nn-6.6.5
 	o nosefart-2.1
 	o nrg2iso-0.4
 	o ns-flash-6.0.79
-	o ns-plugger-5.1.3
+	o ns-plugger-common-5.1.3
 	o nsca-1.2.0
 	o nsd-2.1.4
 	o nslint-2.1a3
 	o ntop-3.0
 	o nulib2-2.0.3
-	o nut-10.9
+	o nut-10.11
 	o nxtvepg-2.7.2
-	o obexftp-0.10.5
+	o obexftp-0.10.6
 	o objc-3.2.6
 	o ocaml-3.08
 	o octave-forge-2004.11.16
@@ -808,14 +816,14 @@ Suggested package updates
 	o oo2c-2.1.5
 	o open2300-1.8
 	o openal-20040816
-	o opencm-0.1.2alpha8-2
+	o opencm-0.1.2alpha8.2
 	o opencobol-0.30
 	o openoffice-1.1.3
 	o openslp-1.2.0
 	o openssl-0.9.7e [http://www.cs.stevens-tech.edu/~jschauma/netbsd/openssl.diff]
 	o openvpn-1.6.0
 	o oregano-0.21
-	o oroborus-2.0.13-1
+	o oroborus-2.0.13.1
 	o osh-041028
 	o oss-3.99.1i
 	o p5-Algorithm-Merge-0.05
@@ -841,14 +849,14 @@ Suggested package updates
 	o p5-CGI-3.05
 	o p5-CGI-Application-3.31
 	o p5-CGI-FormBuilder-2.13
-	o p5-CGI-Lite-2.02
+	o p5-CGI_Lite-2.02
 	o p5-CGI-Minimal-1.16
 	o p5-Cache-Cache-1.03
 	o p5-Carp-Assert-0.18
 	o p5-Class-Accessor-0.19
 	o p5-Class-Container-0.11
 	o p5-Class-Factory-1.03
-	o p5-Class-MethodMaker-2.04-1
+	o p5-Class-MethodMaker-2.04.1
 	o p5-Class-ObjectTemplate-0.7
 	o p5-Class-ReturnValue-0.52
 	o p5-Compress-Bzip2-1.02
@@ -860,7 +868,7 @@ Suggested package updates
 	o p5-Crypt-Random-1.23
 	o p5-Curses-1.06
 	o p5-DBD-Oracle-1.16
-	o p5-DBD-Postgresql-1.32
+	o p5-DBD-postgresql-1.32
 	o p5-DBD-Sybase-1.04
 	o p5-DBI-1.46
 	o p5-DBI-Shell-11.93
@@ -873,7 +881,7 @@ Suggested package updates
 	o p5-Devel-SmallProf-1.15
 	o p5-Device-Gsm-1.36
 	o p5-Device-Modem-1.43
-	o p5-Device-Serialport-1.002
+	o p5-Device-SerialPort-1.002
 	o p5-Digest-1.10
 	o p5-Digest-MD4-1.5
 	o p5-Digest-SHA-5.28
@@ -902,13 +910,13 @@ Suggested package updates
 	o p5-HTTP-Request-Form-0.952
 	o p5-HTTPD-User-Manage-1.62
 	o p5-Heap-0.71
-	o p5-Html-Parser-3.38
+	o p5-HTML-Parser-3.38
 	o p5-I18N-LangTags-0.35
 	o p5-INET6-2.01
 	o p5-IO-Interface-0.98
 	o p5-IO-Socket-SSL-0.96
 	o p5-IO-String-1.06
-	o p5-IO-ZLib-1.04
+	o p5-IO-Zlib-1.04
 	o p5-IPC-Run-0.78
 	o p5-Lchown-1.00
 	o p5-Locale-Codes-2.07
@@ -919,7 +927,7 @@ Suggested package updates
 	o p5-Log-Dispatch-Config-1.01
 	o p5-MARC-1.38
 	o p5-MIME-Base64-3.05
-	o p5-MIME-Tools-6.200_02
+	o p5-MIME-tools-6.200_02
 	o p5-MIME-Types-1.13
 	o p5-MLDBM-Sync-0.30
 	o p5-MP3-Info-1.02
@@ -968,7 +976,6 @@ Suggested package updates
 	o p5-Storable-2.13
 	o p5-Sys-Hostname-Long-1.2
 	o p5-Template-Extract-0.38
-	o p5-Term-Readline-Gnu-1.15
 	o p5-Test-Cmd-1.05
 	o p5-Test-Harness-2.43_01
 	o p5-Test-Inline-0.16
@@ -977,13 +984,12 @@ Suggested package updates
 	o p5-Text-Autoformat-1.12
 	o p5-Text-Balanced-1.95
 	o p5-Text-BibTeX-0.34
-	o p5-Text-FormatTable-1.01
 	o p5-Text-Kakasi-1.05
 	o p5-Text-Quoted-1.8
 	o p5-Text-Template-1.44
 	o p5-Tie-EncryptedHash-1.21
 	o p5-Time-HiRes-1.65
-	o p5-Time-Piece-2.00-01
+	o p5-Time-Piece-2.00.01
 	o p5-TimeDate-1.16
 	o p5-Tree-Simple-1.14
 	o p5-URI-1.35
@@ -1001,8 +1007,7 @@ Suggested package updates
 	o p5-XML-Twig-3.15
 	o p5-XML-Writer-0.520
 	o p5-XML-Xerces-2.5.0
-	o p5-XML-Xupdate-LibXML-0.5.0
-	o p5-YAML-Active-1.00
+	o p5-XML-XUpdate-LibXML-0.5.0
 	o p5-gettext-1.03
 	o p5-glib2-1.070
 	o p5-gtk2-1.070
@@ -1013,6 +1018,7 @@ Suggested package updates
 	o p5-libxml-0.08
 	o p5-perl-ldap-0.3202
 	o p5-razor-agents-2.61
+	o p5-sybperl-2.17
 	o pari-2.2.7
 	o pdmenu-1.2.85
 	o pear-Date-1.4.3
@@ -1021,7 +1027,6 @@ Suggested package updates
 	o pear-Net_URL-1.0.14
 	o pen-0.15.0
 	o pfstat-1.8
-	o pgplot-5.2 [grant]
 	o phoon-20030120
 	o photopc-3.05
 	o php-jpgraph-1.16
@@ -1071,7 +1076,7 @@ Suggested package updates
 	o py-Pmw-1.2
 	o py-Scientific-2.4.9
 	o py-Scientific-doc-2.4.6
-	o py-TPG-3.0.2
+	o py-TPG-3.0.4
 	o py-TTFQuery-1.0.0
 	o py-ZODB-3.2.3
 	o py-amkCrypto-2.0
@@ -1104,7 +1109,6 @@ Suggested package updates
 	o pyslsk-1.2.5
 	o pysol-4.82
 	o qDecoder-7.1
-	o qcalculate-0.7.1
 	o qiv-2.0
 	o qmail-qfilter-2.0
 	o qt1-1.45
@@ -1140,7 +1144,7 @@ Suggested package updates
 	o robodoc-4.99.6
 	o root-4.01.04
 	o root-tail-1.2
-	o rosegarden4-0.9.9 [replacing audio/rosegarden]
+	o rosegarden-4.0.9.9 [replacing audio/rosegarden|pkgsrc-wip]
 	o roundup-0.7.8
 	o rox-2.1.3
 	o rox-session-0.1.25
@@ -1150,7 +1154,7 @@ Suggested package updates
 	o rpc2-1.23
 	o rpm-4.1
 	o rrdtool-1.0.49 [pkg/26353]
-	o rtcw-1.41-3
+	o rtcw-1.41.3
 	o ruby-1.8.1 [taca]
 	o ruby-bigfloat-1.2.1
 	o ruby-digest-1.8.1
@@ -1184,7 +1188,6 @@ Suggested package updates
 	o scribus-1.2
 	o scrollz-1.9.4
 	o sdig-0.40
-	o sed-4.1.2
 	o semantic-1.4.4
 	o sendfile-20010424
 	o ser-0.8.14
@@ -1201,8 +1204,8 @@ Suggested package updates
 	o slib-3a1
 	o sma-1.4
 	o smartmontools-5.33
-	o sml-nj-110.50 [pkgsrc-wip]
-	o sml-nj-110.51
+	o smlnj-110.50 [pkgsrc-wip]
+	o smlnj-110.51
 	o smokeping-1.31
 	o snd-7.8
 	o snes9x-1.42
@@ -1221,7 +1224,7 @@ Suggested package updates
 	o stellarium-0.6.1
 	o stlport-4.6.2
 	o strace-4.5.8
-	o subtitleripper-0.3-4
+	o subtitleripper-0.3.4
 	o sunclock-1.5
 	o swfdec-0.3.2
 	o swi-prolog-5.4.4
@@ -1231,7 +1234,6 @@ Suggested package updates
 	o swig-perl-1.3.23
 	o swig-python-1.3.23
 	o swish-e-2.4.2
-	o sybperl-2.17
 	o sylpheed-claws-ghostscript-viewer-0.8
 	o sysinfo-4.2.2
 	o tc-2.3.1
@@ -1241,7 +1243,7 @@ Suggested package updates
 	o tcpdpriv-0.9
 	o tcpdstat-0.9
 	o tcpdump-3.8.3
-	o tcpflow-.21
+	o tcpflow-0.21
 	o tcpick-0.2.0
 	o tcpreplay-2.3.2
 	o tcptrace-6.6.7
@@ -1254,6 +1256,7 @@ Suggested package updates
 	o texi2html-1.70
 	o tfmxplay-1.1.6
 	o thunderbird-0.9
+	o tiff-3.7.0 [reed]
 	o tileworld-1.2.1
 	o tinc-1.0.3
 	o tinyproxy-1.7.0
@@ -1340,7 +1343,6 @@ Suggested package updates
 	o xfce4-taskbar-plugin-0.2.2
 	o xfe-0.72
 	o xfmail-1.5.4
-	o xine-1-rc6a
 	o xine-lib-1-rc7
 	o xkbset-0.5
 	o xlispstat-3.52.20
@@ -1352,12 +1354,12 @@ Suggested package updates
 	o xmess-0.88
 	o xmlstarlet-0.9.5
 	o xmms-crossfade-0.3.7
+	o xmms-dspectogram-1.2.1
 	o xmms-fmradio-1.5
 	o xmms-gdancer-0.4.6
 	o xmms-infinity-0.6.0
 	o xmms-iris-0.12
 	o xmms-mad-0.5.7
-	o xmms-spectogram-1.2.1
 	o xmmsctrl-1.8
 	o xmon-1.5.6
 	o xnap-2.5r3
@@ -1382,7 +1384,6 @@ Suggested package updates
 	o zenicb-1.31 (needs merge with lots of local changes)
 	o zircon-1.18.256
 	o zopeedit-0.8
-	o zxgv-0.8
 	o zziplib-0.13.37
 
 Infrastructure problems which need addressing