remove commented out SUBDIR += lines for packages that never got

converted from FreeBSD, or have been disabled since. Sorted lines
alphabetically, added some missing directories.

29 files changed, 82 insertions, 608 deletions

diff --git a/Makefile b/Makefile
index 696814a54e7..933cbb2d4c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/02/09 03:51:12 hubertf Exp $
+# $NetBSD: Makefile,v 1.31 2000/02/25 01:04:11 wiz Exp $
 # FreeBSD Id: Makefile,v 1.35 1997/08/19 07:10:01 fenner Exp
 #
 
@@ -10,14 +10,11 @@ SUBDIR+=	${HOST_SPECIFIC_PKGS}
 SUBDIR+=	${GROUP_SPECIFIC_PKGS}
 SUBDIR+=	${USER_SPECIFIC_PKGS}
 .else
-#SUBDIR += ai
 SUBDIR += archivers
-#SUBDIR += astro
 SUBDIR += audio
 SUBDIR += benchmarks
 SUBDIR += biology
 SUBDIR += cad
-#SUBDIR += chinese
 SUBDIR += comms
 SUBDIR += converters
 SUBDIR += corba
@@ -27,11 +24,9 @@ SUBDIR += devel
 SUBDIR += editors
 SUBDIR += emulators
 SUBDIR += games
-#SUBDIR += german
 SUBDIR += graphics
 SUBDIR += ham
 SUBDIR += japanese
-#SUBDIR += korean
 SUBDIR += lang
 SUBDIR += mail
 SUBDIR += math
@@ -44,12 +39,10 @@ SUBDIR += parallel
 SUBDIR += pkgtools
 SUBDIR += plan9
 SUBDIR += print
-#SUBDIR += russian
 SUBDIR += security
 SUBDIR += shells
 SUBDIR += sysutils
 SUBDIR += textproc
-#SUBDIR += vietnamese
 SUBDIR += www
 SUBDIR += x11
 .endif
diff --git a/archivers/Makefile b/archivers/Makefile
index 8c0c7d9a00f..46170025a84 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2000/02/01 16:41:48 rh Exp $
+# $NetBSD: Makefile,v 1.23 2000/02/25 01:04:11 wiz Exp $
 # FreeBSD Id: Makefile,v 1.18 1997/05/16 01:42:31 asami Exp 
 #
 
     SUBDIR += arc
-    SUBDIR += bzip2
     SUBDIR += bunzip
+    SUBDIR += bzip2
     SUBDIR += fastjar
     SUBDIR += freeze
     SUBDIR += gcpio
@@ -21,8 +21,6 @@
     SUBDIR += liblzo
     SUBDIR += lzop
     SUBDIR += macutil
-#    SUBDIR += nulib
-#    SUBDIR += p5-Compress-Zlib
     SUBDIR += ppunpack
     SUBDIR += rar
     SUBDIR += squsq
diff --git a/audio/Makefile b/audio/Makefile
index e2f09998382..a31dad31f0b 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2000/02/17 22:47:51 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2000/02/25 01:04:11 wiz Exp $
 #
 
     SUBDIR += ac3dec
@@ -22,21 +22,21 @@
     SUBDIR += festvox-aec
     SUBDIR += festvox-don
     SUBDIR += festvox-el11
+    SUBDIR += festvox-en1
     SUBDIR += festvox-hvs
     SUBDIR += festvox-jph
     SUBDIR += festvox-kal16
     SUBDIR += festvox-kal8
     SUBDIR += festvox-ked16
     SUBDIR += festvox-ked8
-    SUBDIR += festvox-en1
     SUBDIR += festvox-mwm
     SUBDIR += festvox-ogirab
     SUBDIR += festvox-rab16
     SUBDIR += festvox-rab8
+    SUBDIR += festvox-tll
     SUBDIR += festvox-us1
     SUBDIR += festvox-us2
     SUBDIR += festvox-us3
-    SUBDIR += festvox-tll
     SUBDIR += freezetag
     SUBDIR += gdcd
     SUBDIR += gnome-audio
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index c6ee8c4ea9a..f6d7237d487 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/12/06 19:03:32 rh Exp $
+# $NetBSD: Makefile,v 1.15 2000/02/25 01:04:12 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/02/16 13:32:59 andreas Exp
 #
 
@@ -16,12 +16,9 @@ PKG_MISC_TARGETS?=	benchmark results
     SUBDIR += iozone
     SUBDIR += linpack
     SUBDIR += lmbench
-#    SUBDIR += netperf
     SUBDIR += nsieve
     SUBDIR += paranoia
     SUBDIR += postmark
-#    SUBDIR += tcpblast
     SUBDIR += whetstone
-#    SUBDIR += xengine
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/biology/Makefile b/biology/Makefile
index 4b43dd657cc..5cca9c2e448 100644
--- a/biology/Makefile
+++ b/biology/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1999/07/28 20:20:39 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/02/25 01:04:12 wiz Exp $
 #
 
     SUBDIR += bioperl
     SUBDIR += clustalw
-#    SUBDIR += clustalx
-#    SUBDIR += dnagui
     SUBDIR += fastDNAml
-#    SUBDIR += ncbi
+    SUBDIR += nut
     SUBDIR += phylip
     SUBDIR += puzzle
-#    SUBDIR += xylem
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/cad/Makefile b/cad/Makefile
index 05a82bae937..7915e8cb4bd 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2000/02/16 20:56:41 rh Exp $
+# $NetBSD: Makefile,v 1.22 2000/02/25 01:04:12 wiz Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/11/17 10:53:52 tg Exp
 #
 
     SUBDIR += acs
-#    SUBDIR += chipmunk
     SUBDIR += cascade
     SUBDIR += fastcap
     SUBDIR += fasthenry
-#    SUBDIR += felt
-    SUBDIR += libgeda
     SUBDIR += geda
     SUBDIR += geda-docs
     SUBDIR += geda-symbols
@@ -16,10 +13,7 @@
     SUBDIR += gnetlist
     SUBDIR += gschem
     SUBDIR += gsymcheck
-#    SUBDIR += irsim
-#    SUBDIR += kaskade
-#    SUBDIR += magic
-#    SUBDIR += mars
+    SUBDIR += libgeda
     SUBDIR += ntesla
     SUBDIR += oregano
     SUBDIR += pcb
diff --git a/comms/Makefile b/comms/Makefile
index e5b06c6d0e4..5111e35a0c9 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2000/01/04 11:22:44 fredb Exp $
+# $NetBSD: Makefile,v 1.25 2000/02/25 01:04:12 wiz Exp $
 # FreeBSD Id: Makefile,v 1.26 1997/10/13 04:41:06 max Exp
 #
 
     SUBDIR += binkd
-#    SUBDIR += bpl+
-#    SUBDIR += ecu
     SUBDIR += fidogate
     SUBDIR += gkermit
     SUBDIR += hylafax
@@ -20,12 +18,8 @@
     SUBDIR += plp
     SUBDIR += plptools
     SUBDIR += qpage
-#    SUBDIR += rzsz
-#    SUBDIR += seyon
     SUBDIR += snooper
     SUBDIR += tkhylafax
-#    SUBDIR += xcept
     SUBDIR += xisp
-#    SUBDIR += zmtx-zmrx
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/converters/Makefile b/converters/Makefile
index 863ddbdbb0b..e21ba99a1b2 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,22 +1,15 @@
-# $NetBSD: Makefile,v 1.13 1999/12/06 01:59:22 sakamoto Exp $
+# $NetBSD: Makefile,v 1.14 2000/02/25 01:04:12 wiz Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/11/16 22:45:25 jseger Exp
 #
 
     SUBDIR += base64
-#    SUBDIR += btoa
-#    SUBDIR += c2html
     SUBDIR += cbmconvert
-#    SUBDIR += ish
     SUBDIR += kdesupport
-#    SUBDIR += mimepp
     SUBDIR += mpack
-#    SUBDIR += p5-Convert-UU
     SUBDIR += p5-MIME-Base64
     SUBDIR += psiconv
     SUBDIR += recode
-#    SUBDIR += trans
     SUBDIR += uudeview
-#    SUBDIR += uudx
     SUBDIR += uulib
     SUBDIR += xdeview
 
diff --git a/databases/Makefile b/databases/Makefile
index 15c33fcce2e..5948b55de8f 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,28 +1,22 @@
-# $NetBSD: Makefile,v 1.29 2000/02/19 23:46:26 jwise Exp $
+# $NetBSD: Makefile,v 1.30 2000/02/25 01:04:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/30 11:47:51 tg Exp 
 #
 
     SUBDIR += db
     SUBDIR += db3
     SUBDIR += gdbm
-#    SUBDIR += gnats
     SUBDIR += gtksql
     SUBDIR += gtranscript
     SUBDIR += iodbc
     SUBDIR += jdb
     SUBDIR += jdbc-postgresql
-#    SUBDIR += msql
     SUBDIR += mysql-client
     SUBDIR += mysql-server
     SUBDIR += openldap
     SUBDIR += oraedit
     SUBDIR += p5-DBD-mysql
     SUBDIR += p5-DBD-postgresql
-#    SUBDIR += p5-DBD-Pg
     SUBDIR += p5-DBI
-#    SUBDIR += p5-Msql
-#    SUBDIR += p5-Mysql
-#    SUBDIR += p5-Pg
     SUBDIR += p5-gdbm
     SUBDIR += p5-perl-ldap
     SUBDIR += p5-pgsql
@@ -31,10 +25,9 @@
     SUBDIR += py-gdbm
     SUBDIR += py-mysql
     SUBDIR += py-postgresql
-    SUBDIR += sdbm
     SUBDIR += rrdtool
+    SUBDIR += sdbm
     SUBDIR += tcl-gdbm
-#    SUBDIR += typhoon
     SUBDIR += xmysql
     SUBDIR += xmysqladmin
     SUBDIR += zope-mysql
diff --git a/devel/Makefile b/devel/Makefile
index 878fe242d2d..c20f11de463 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.106 2000/02/23 20:38:57 jlam Exp $
+# $NetBSD: Makefile,v 1.107 2000/02/25 01:04:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.78 1997/10/01 08:32:59 cracauer Exp
 #
 
-#    SUBDIR += SWIG
-#    SUBDIR += asl
-    SUBDIR += avltree
     SUBDIR += autoconf
     SUBDIR += automake
+    SUBDIR += avltree
     SUBDIR += bcc
     SUBDIR += bison
     SUBDIR += boehm-gc
@@ -14,29 +12,18 @@
     SUBDIR += cdecl
     SUBDIR += cdk
     SUBDIR += cervisia
-#    SUBDIR += cflow
     SUBDIR += chkpt
-#    SUBDIR += crossgo32
-#    SUBDIR += crossgo32-djgpp2
-#    SUBDIR += crossgo32-djgpp2-pdcurses
-#    SUBDIR += crosssco
-#    SUBDIR += cs
-#    SUBDIR += cutils
     SUBDIR += cvs
+#   SUBDIR += cvs-current
     SUBDIR += cvs2cl
     SUBDIR += cvslock
     SUBDIR += cxref
     SUBDIR += ddd
     SUBDIR += diffutils
-#    SUBDIR += dmake
     SUBDIR += electricfence
     SUBDIR += ffcall
     SUBDIR += flex
-#    SUBDIR += f77flow
-#    SUBDIR += fpp
-#    SUBDIR += gcc11
     SUBDIR += gdb
-#    SUBDIR += gdbtk
     SUBDIR += gettext
     SUBDIR += gindent
     SUBDIR += glade
@@ -51,18 +38,15 @@
     SUBDIR += guile-gtk
     SUBDIR += guile-slib
     SUBDIR += id-utils
-#    SUBDIR += ilu
     SUBDIR += ipv6socket_scrub
     SUBDIR += isect
     SUBDIR += its4
     SUBDIR += kdbg
     SUBDIR += kdevelop
-#    SUBDIR += lclint
     SUBDIR += ldapsdk
-#    SUBDIR += libdlmalloc
     SUBDIR += libg++
-    SUBDIR += libglade
     SUBDIR += libgetopt
+    SUBDIR += libglade
     SUBDIR += libgtop
     SUBDIR += libhfs
     SUBDIR += libnet
@@ -73,15 +57,10 @@
     SUBDIR += libsmi
     SUBDIR += libstroke
     SUBDIR += libtool
-#    SUBDIR += linux_devel
-#    SUBDIR += linuxgdb
     SUBDIR += lwp
     SUBDIR += m4
-#    SUBDIR += makedepend
     SUBDIR += maketool
     SUBDIR += mit-pthreads
-#    SUBDIR += mkmf
-#    SUBDIR += mprof
     SUBDIR += nana
     SUBDIR += nasm
     SUBDIR += ncurses
@@ -89,51 +68,23 @@
     SUBDIR += newmkdep
     SUBDIR += noweb
     SUBDIR += nqc
-#    SUBDIR += omniBroker
-#    SUBDIR += omniORB
     SUBDIR += p5-AtExit
-#    SUBDIR += p5-B
     SUBDIR += p5-Bit-Vector
-#    SUBDIR += p5-BSD-Resource
-#    SUBDIR += p5-C-Scan
-#    SUBDIR += p5-ConfigReader
     SUBDIR += p5-Curses
     SUBDIR += p5-Data-Dumper
-#    SUBDIR += p5-Data-Flow
     SUBDIR += p5-Data-ShowTable
     SUBDIR += p5-Date-Calc
-#    SUBDIR += p5-Date-Manip
     SUBDIR += p5-Devel-DProf
     SUBDIR += p5-Devel-SmallProf
-#    SUBDIR += p5-Devel-Peek
     SUBDIR += p5-Devel-Symdump
-#    SUBDIR += p5-Errno
-#    SUBDIR += p5-File-BasicFlock
-#    SUBDIR += p5-File-Lock
     SUBDIR += p5-File-PathConvert
-#    SUBDIR += p5-File-Slurp
-#    SUBDIR += p5-File-Tools
     SUBDIR += p5-FileKGlob
-#    SUBDIR += p5-Filter
-#    SUBDIR += p5-FreezeThaw
-#    SUBDIR += p5-Include
-#    SUBDIR += p5-IniConf
-#    SUBDIR += p5-Ioctl
     SUBDIR += p5-IO-stringy
+    SUBDIR += p5-LDAP
     SUBDIR += p5-MLDBM
     SUBDIR += p5-PV
-#    SUBDIR += p5-Penguin
-#    SUBDIR += p5-Penguin-Easy
-#    SUBDIR += p5-Proc-Simple
-#    SUBDIR += p5-Religion
-#    SUBDIR += p5-Resources
-#    SUBDIR += p5-Sort-Versions
-#    SUBDIR += p5-Storable
-#    SUBDIR += p5-Term-ReadKey
-#    SUBDIR += p5-Time
-    SUBDIR += p5-TimeDate
     SUBDIR += p5-Time-HiRes
-#    SUBDIR += p5-TraceFuncs
+    SUBDIR += p5-TimeDate
     SUBDIR += patch
     SUBDIR += pccts
     SUBDIR += pcre
@@ -146,20 +97,14 @@
     SUBDIR += rdp
     SUBDIR += readline
     SUBDIR += rx
-#    SUBDIR += sawt
-#    SUBDIR += scogdb
     SUBDIR += sfio
     SUBDIR += slib
     SUBDIR += stooop
     SUBDIR += swig
-#    SUBDIR += tclcheck
     SUBDIR += tkcvs
     SUBDIR += tkdiff
-#    SUBDIR += tvision
-#    SUBDIR += vtcl
+    SUBDIR += unproven-pthreads
     SUBDIR += xdelta
-#    SUBDIR += xmake
-#    SUBDIR += xwpe
     SUBDIR += xxgdb
     SUBDIR += zlib
 
diff --git a/editors/Makefile b/editors/Makefile
index ee3f601a07f..13ac3dbd17a 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,43 +1,30 @@
-# $NetBSD: Makefile,v 1.28 2000/02/18 20:25:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.29 2000/02/25 01:04:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp
 #
 
     SUBDIR += abiword
-#    SUBDIR += asedit
-#    SUBDIR += axe
     SUBDIR += beav
-#    SUBDIR += bpatch
     SUBDIR += bvi
-#    SUBDIR += e93
     SUBDIR += emacs
     SUBDIR += framemaker
-#    SUBDIR += gvim
     SUBDIR += hexedit
     SUBDIR += jed
     SUBDIR += joe
     SUBDIR += jove
     SUBDIR += leim
-#    SUBDIR += mule
-#    SUBDIR += mule-common
     SUBDIR += ne
     SUBDIR += nedit
-#    SUBDIR += nvi
     SUBDIR += nvi-m17n
     SUBDIR += pico
     SUBDIR += ssam
-#    SUBDIR += staroffice
-#    SUBDIR += thoteditor
-#    SUBDIR += uemacs
-#    SUBDIR += uzap
+    SUBDIR += vigor
     SUBDIR += vile
     SUBDIR += vilearn
-    SUBDIR += vigor
     SUBDIR += vim
     SUBDIR += vim-gtk
     SUBDIR += vim-share
     SUBDIR += vim-xaw
     SUBDIR += xcoral
-#    SUBDIR += xed
     SUBDIR += xemacs
     SUBDIR += xemacs-packages
     SUBDIR += xvile
diff --git a/emulators/Makefile b/emulators/Makefile
index 0df52d77aad..9790aef5074 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,28 +1,17 @@
-# $NetBSD: Makefile,v 1.33 2000/02/13 23:28:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2000/02/25 01:04:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/31 07:23:58 max Exp
 #
 
-#    SUBDIR += aftp
     SUBDIR += atari800
     SUBDIR += bochs
-#    SUBDIR += bsvc
     SUBDIR += compat12
     SUBDIR += compat13
-#    SUBDIR += cpmemu
-#    SUBDIR += cpmtools
     SUBDIR += darcnes
     SUBDIR += doscmd
-#    SUBDIR += fmsx
-#    SUBDIR += hfs
+    SUBDIR += freebsd_lib
     SUBDIR += ia64sim
-#    SUBDIR += ines
     SUBDIR += linux-locale
-#    SUBDIR += macutils
-#    SUBDIR += mastergear
-#    SUBDIR += mtools
     SUBDIR += pcemu
-#    SUBDIR += prodosemu
-#    SUBDIR += sim6811
     SUBDIR += simh
     SUBDIR += spim
     SUBDIR += stella
@@ -33,16 +22,11 @@
     SUBDIR += suse_linux
     SUBDIR += suse_x11
     SUBDIR += suse_xforms
-#    SUBDIR += tkhfs
     SUBDIR += uae
-#    SUBDIR += vgb
     SUBDIR += vice
-#    SUBDIR += vmsbackup
     SUBDIR += wine
     SUBDIR += wine-current
-#    SUBDIR += x48
     SUBDIR += xcopilot
-#    SUBDIR += xgs
     SUBDIR += xmame
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/games/Makefile b/games/Makefile
index 7703cc221fc..9b79f5dafd5 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,49 +1,34 @@
-# $NetBSD: Makefile,v 1.80 2000/02/19 22:34:56 rh Exp $
+# $NetBSD: Makefile,v 1.81 2000/02/25 01:04:13 wiz Exp $
 # FreeBSD Id: Makefile,v 1.87 1997/10/15 04:58:31 max Exp
 #
 
     SUBDIR += abuse
-#    SUBDIR += acm
-#    SUBDIR += agm
-#    SUBDIR += an
     SUBDIR += amor
     SUBDIR += angband-tty
     SUBDIR += angband-x11
     SUBDIR += baduki
     SUBDIR += battalion
     SUBDIR += battleball
-#    SUBDIR += block
-#    SUBDIR += blue
-#    SUBDIR += bs
     SUBDIR += cbzone
     SUBDIR += cgoban
-#    SUBDIR += connect4
-#    SUBDIR += cosmo
     SUBDIR += craft
     SUBDIR += crossfire
-#    SUBDIR += dontspace
-#    SUBDIR += doom
     SUBDIR += dopewars
-#    SUBDIR += empire
     SUBDIR += finalbattle
-#    SUBDIR += flying
     SUBDIR += freeciv
     SUBDIR += frotz
     SUBDIR += galaxa
-#    SUBDIR += galaxis
     SUBDIR += gemdropx
     SUBDIR += gnome-chess
     SUBDIR += gnome-games
     SUBDIR += gnuchess
     SUBDIR += gnugo
-#    SUBDIR += gnushogi
     SUBDIR += golddig
     SUBDIR += icbm3d
     SUBDIR += imaze
     SUBDIR += jetpack
     SUBDIR += kdegames
     SUBDIR += kdetoys
-#    SUBDIR += klondike
     SUBDIR += koth
     SUBDIR += lincity
     SUBDIR += maelstrom
@@ -55,98 +40,50 @@
     SUBDIR += nethack-tty
     SUBDIR += nethack-x11
     SUBDIR += nighthawk
-#    SUBDIR += netris
-#    SUBDIR += oneko
-#    SUBDIR += oonsoo
     SUBDIR += omega
     SUBDIR += pacman
     SUBDIR += plib
     SUBDIR += pysol
-#    SUBDIR += qcc
 #    SUBDIR += quake
-#    SUBDIR += quakedata
 #    SUBDIR += quake6
-#    SUBDIR += quakeserver
+#    SUBDIR += quakedata
     SUBDIR += rocksndiamonds
     SUBDIR += rollemup
-#    SUBDIR += sokoban
     SUBDIR += spellcast
-#    SUBDIR += spider
-#    SUBDIR += starlanes
     SUBDIR += svb
     SUBDIR += tanked
-#    SUBDIR += tksol
     SUBDIR += wormz
     SUBDIR += xarchon
-#    SUBDIR += xasteroids
     SUBDIR += xbat
-#    SUBDIR += xbattle
     SUBDIR += xbill
-#    SUBDIR += xbl
-#    SUBDIR += xblackjack
     SUBDIR += xblast
     SUBDIR += xboard
     SUBDIR += xboing
     SUBDIR += xbomber
-#    SUBDIR += xchomp
     SUBDIR += xconq
-#    SUBDIR += xcubes
-#    SUBDIR += xdeblock
     SUBDIR += xdemineur
-#    SUBDIR += xdino
     SUBDIR += xdoom
     SUBDIR += xemeraldia
     SUBDIR += xevil
-#    SUBDIR += xeyesplus
-#    SUBDIR += xfrisk
     SUBDIR += xgalaga
-#    SUBDIR += xgammon
-#    SUBDIR += xgolgo
     SUBDIR += xgospel
-#    SUBDIR += xinvaders
     SUBDIR += xjewel
     SUBDIR += xjig
     SUBDIR += xkobo
-#    SUBDIR += xlife
     SUBDIR += xmahjongg
-#    SUBDIR += xmille
-#    SUBDIR += xmine
-#    SUBDIR += xminehunter
-#    SUBDIR += xminesweep
-#    SUBDIR += xmj
     SUBDIR += xmris
-#    SUBDIR += xneko
-     SUBDIR += xnibbles
-#    SUBDIR += xonix
-#    SUBDIR += xpacman
-#    SUBDIR += xpat2
+    SUBDIR += xnibbles
     SUBDIR += xpilot
     SUBDIR += xpipeman
-#    SUBDIR += xpuyo
     SUBDIR += xpuyopuyo
-#    SUBDIR += xpuzzletama
-#    SUBDIR += xripple
-#    SUBDIR += xrisk
     SUBDIR += xroach
     SUBDIR += xroads
-#    SUBDIR += xrobots
-#    SUBDIR += xrubik
     SUBDIR += xscavenger
     SUBDIR += xscrabble
-#    SUBDIR += xshisen
-#    SUBDIR += xshogi
     SUBDIR += xskat
-#    SUBDIR += xsokoban
-#    SUBDIR += xsol
     SUBDIR += xsoldier
-#    SUBDIR += xspringies
-#    SUBDIR += xtic
-#    SUBDIR += xtriangles
     SUBDIR += xworm
     SUBDIR += xzip
-#    SUBDIR += yahtzee
-#    SUBDIR += yamsweeper
     SUBDIR += zombies
-#    SUBDIR += ztrack
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/graphics/Makefile b/graphics/Makefile
index 0643b3ad4c1..dbcecb9e5b3 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.72 2000/02/09 17:37:53 itojun Exp $
+# $NetBSD: Makefile,v 1.73 2000/02/25 01:04:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.53 1997/09/28 13:25:40 markm Exp
 #
 
     SUBDIR += CompuPic
     SUBDIR += ImageMagick
     SUBDIR += Mesa
+    SUBDIR += Mesa-glx
     SUBDIR += Ngraph
-#    SUBDIR += aero
     SUBDIR += camediaplay
     SUBDIR += cdlabelgen
     SUBDIR += clanlib
     SUBDIR += cqcam
-#    SUBDIR += dc3play
-#    SUBDIR += dore
     SUBDIR += dx
     SUBDIR += dxsamples
     SUBDIR += ee
@@ -20,18 +18,13 @@
     SUBDIR += fnlib
     SUBDIR += freetype
     SUBDIR += fujiplay
-#    SUBDIR += fxtv
     SUBDIR += g3d
     SUBDIR += gd
     SUBDIR += gdk-pixbuf
-#    SUBDIR += geomview
     SUBDIR += get_ds7
-#    SUBDIR += gfont
     SUBDIR += gif2png
     SUBDIR += gif320
     SUBDIR += giflib
-#    SUBDIR += gifmerge
-#    SUBDIR += giftool
     SUBDIR += giftrans
     SUBDIR += gimp
 #   SUBDIR += gimp-current		# Not built by default
@@ -40,11 +33,8 @@
     SUBDIR += gphoto
     SUBDIR += gqview
     SUBDIR += hermes
-#    SUBDIR += hobbes-icons-xpm
     SUBDIR += hp2xx
-#    SUBDIR += hpscan
     SUBDIR += imlib
-#    SUBDIR += jbigkit
     SUBDIR += jpeg
     SUBDIR += kdegraphics
     SUBDIR += libgdgeda
@@ -54,23 +44,15 @@
     SUBDIR += magicpoint
     SUBDIR += mpeg-lib
     SUBDIR += mpeg2codec
-#    SUBDIR += mpeg2play
-#    SUBDIR += mpeg_encode
     SUBDIR += mpeg_play
-#    SUBDIR += mpeg_stat
-#    SUBDIR += mpegedit
-#    SUBDIR += mplex
     SUBDIR += mtv
     SUBDIR += netpbm
     SUBDIR += ns-flash
     SUBDIR += openptc
     SUBDIR += p5-GD
     SUBDIR += p5-Image-Size
-#    SUBDIR += pgperl
-#    SUBDIR += pgplot
     SUBDIR += photopc
     SUBDIR += pixmap
-#    SUBDIR += plotmtv
     SUBDIR += ploticus
     SUBDIR += plotutils
     SUBDIR += png
@@ -82,33 +64,19 @@
     SUBDIR += qvplay
     SUBDIR += rayshade
     SUBDIR += sane
-#    SUBDIR += sced
     SUBDIR += sketch
-#    SUBDIR += spigot
-#    SUBDIR += splitmpg
     SUBDIR += tgif
     SUBDIR += tiff
-#    SUBDIR += tiff34
     SUBDIR += tkpiechart
-#    SUBDIR += txtmerge
     SUBDIR += urt
     SUBDIR += vcg
     SUBDIR += viewfax
-#    SUBDIR += whirlgif
     SUBDIR += xanim
-#    SUBDIR += xaos
     SUBDIR += xart
     SUBDIR += xbmbrowser
-#    SUBDIR += xdl
     SUBDIR += xfig
-#    SUBDIR += xfractint
     SUBDIR += xgraph
-#    SUBDIR += xgrasp
     SUBDIR += xli
-#    SUBDIR += xmandel
-#    SUBDIR += xmfract
-#    SUBDIR += xmorph
-#    SUBDIR += xmountains
     SUBDIR += xpaint
     SUBDIR += xpdf
     SUBDIR += xpdf-crypto
diff --git a/lang/Makefile b/lang/Makefile
index 50c1a6c27ea..b0ab1177058 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,84 +1,49 @@
-# $NetBSD: Makefile,v 1.42 2000/02/15 19:45:22 pooka Exp $
+# $NetBSD: Makefile,v 1.43 2000/02/25 01:04:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.82 1997/09/30 07:49:24 asami Exp
 #
 
-#    SUBDIR += Gofer
     SUBDIR += STk
-#    SUBDIR += Sather
     SUBDIR += bwbasic
-#    SUBDIR += cim
     SUBDIR += cint
     SUBDIR += clisp
-#    SUBDIR += cmucl
-#    SUBDIR += eiffel
     SUBDIR += egcs
     SUBDIR += elisp-manual
     SUBDIR += elk
-#    SUBDIR += eperl
     SUBDIR += expect
     SUBDIR += f2c
     SUBDIR += fort77
-#    SUBDIR += forth
-#    SUBDIR += g77
     SUBDIR += gawk
-#    SUBDIR += gcl
     SUBDIR += gforth
     SUBDIR += ghc
-#    SUBDIR += gnat
     SUBDIR += guavac
     SUBDIR += guile
     SUBDIR += hugs
     SUBDIR += icon
-#    SUBDIR += idl4
-#    SUBDIR += itcl
     SUBDIR += japhar
-#    SUBDIR += javac_netscape
     SUBDIR += jdk
     SUBDIR += jikes
     SUBDIR += kaffe
-#    SUBDIR += lcc
     SUBDIR += libperl
     SUBDIR += librep
-#    SUBDIR += logo
     SUBDIR += mawk
-#    SUBDIR += mit-scheme
-#    SUBDIR += mixal
-#    SUBDIR += mocka
-#    SUBDIR += modula-3
-#    SUBDIR += modula-3-lib
-#    SUBDIR += modula-3-socks
     SUBDIR += moscow_ml
     SUBDIR += mzscheme
     SUBDIR += nawk
-#    SUBDIR += ocaml
     SUBDIR += p2c
-#    SUBDIR += p5-Tcl
-#    SUBDIR += p5-ePerl
-#    SUBDIR += pbasic
     SUBDIR += perl5
-#    SUBDIR += pgcc
-#    SUBDIR += pgcc-current
+#    SUBDIR += perl5-currrent		# disabled by default
     SUBDIR += py-extclass
     SUBDIR += py-html-docs
     SUBDIR += python
-#    SUBDIR += rexx-imc
     SUBDIR += ruby
     SUBDIR += scheme48
-#    SUBDIR += schemetoc
-#    SUBDIR += scm
     SUBDIR += siod
     SUBDIR += smalleiffel
     SUBDIR += sml-nj
-#    SUBDIR += smalltalk
     SUBDIR += squeak
-#    SUBDIR += sr
-#    SUBDIR += swi-pl
-#    SUBDIR += tcl75
-#    SUBDIR += tcl76
     SUBDIR += tcl80
     SUBDIR += tclX80
+    SUBDIR += tclman80
     SUBDIR += ucblogo
-#    SUBDIR += vast_f90
-#    SUBDIR += xpl
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/mail/Makefile b/mail/Makefile
index 24e97358dd4..1941ef7345b 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,12 +1,11 @@
- $NetBSD: Makefile,v 1.39 2000/02/13 00:16:23 tron Exp $
+ $NetBSD: Makefile,v 1.40 2000/02/25 01:04:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.45 1997/08/13 18:35:22 andreas Exp 
 #
 
     SUBDIR += balsa
-#    SUBDIR += bulk_mailer
     SUBDIR += coolmail
     SUBDIR += cucipop
-#    SUBDIR += cyrus
+#    SUBDIR += cyrus		# incomplete package
     SUBDIR += distribute
     SUBDIR += elm
     SUBDIR += exim
@@ -19,41 +18,26 @@
     SUBDIR += imap-uw
     SUBDIR += mailagent
     SUBDIR += mailwrapper
-#    SUBDIR += majorcool
     SUBDIR += majordomo
     SUBDIR += metamail
-#    SUBDIR += mew
-#    SUBDIR += mh
     SUBDIR += mhonarc
     SUBDIR += mush
     SUBDIR += mutt
     SUBDIR += nmh
      SUBDIR += p5-MIME-tools
-#    SUBDIR += p5-Mail-Folder
     SUBDIR += p5-Mail-IMAPClient
-#    SUBDIR += p5-Mail-POP3Client
-#    SUBDIR += p5-Mail-Tools
-     SUBDIR += p5-MailTools
-#    SUBDIR += pgpsendmail
+    SUBDIR += p5-MailTools
     SUBDIR += pine
-#    SUBDIR += popclient
-#    SUBDIR += poppassd
-#    SUBDIR += popper
     SUBDIR += postfix
-#    SUBDIR += premail
     SUBDIR += procmail
     SUBDIR += qpopper
     SUBDIR += rblcheck
     SUBDIR += sendmail
     SUBDIR += sendmail88
-#    SUBDIR += smail
     SUBDIR += smtpfeed
     SUBDIR += spruce
     SUBDIR += wmmail
-#    SUBDIR += xfaces
     SUBDIR += xfmail
-#    SUBDIR += xlbiff
     SUBDIR += xmailbox
-#    SUBDIR += youbin
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/math/Makefile b/math/Makefile
index 3e5f37b5b7a..2b4cdd80505 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,54 +1,27 @@
-# $NetBSD: Makefile,v 1.21 2000/02/20 14:41:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.22 2000/02/25 01:04:14 wiz Exp $
 # FreeBSD Id: Makefile,v 1.38 1998/04/13 00:51:58 jseger Exp
 #
 
     SUBDIR += R
     SUBDIR += abacus
     SUBDIR += abs
-#    SUBDIR += apc
-#    SUBDIR += blas
-#    SUBDIR += calc
-#    SUBDIR += calctool
     SUBDIR += cassowary
-#    SUBDIR += eispack
-#    SUBDIR += femlab
-#    SUBDIR += fftpack
     SUBDIR += fftw
-#    SUBDIR += freefem
-#    SUBDIR += fudgit
     SUBDIR += geg
-#    SUBDIR += gnuplot
     SUBDIR += gnumeric
     SUBDIR += grace
     SUBDIR += grpn
     SUBDIR += gsl
-#    SUBDIR += hexcalc
-#    SUBDIR += lapack
-#    SUBDIR += libranlib
-#    SUBDIR += linpack
-#    SUBDIR += numpy
+    SUBDIR += libffm
     SUBDIR += octave
-#    SUBDIR += oleo
-#    SUBDIR += p5-MatrixReal
-#    SUBDIR += pari
-#    SUBDIR += plplot
     SUBDIR += pspp
     SUBDIR += py-Numeric
     SUBDIR += sc
     SUBDIR += scilab
-#    SUBDIR += siag
-#    SUBDIR += simpack
-#    SUBDIR += ss
-#    SUBDIR += umatrix
     SUBDIR += vista
-#    SUBDIR += wingz
-#    SUBDIR += xgfe
-#    SUBDIR += xgraph
     SUBDIR += xldlas
     SUBDIR += xlispstat
     SUBDIR += xmgr
-#    SUBDIR += xplot
-#    SUBDIR += xspread
     SUBDIR += yacas
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/mbone/Makefile b/mbone/Makefile
index da3b871d6e8..fb2f4f35a13 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.7 1998/04/15 10:38:32 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/25 01:04:14 wiz Exp $
 # Id: Makefile,v 1.5 1996/12/03 10:41:49 asami Exp
 #
 
     SUBDIR += imm
-#    SUBDIR += mbone_vcr
     SUBDIR += nte
     SUBDIR += rat
-#    SUBDIR += rtpmon
     SUBDIR += sdr
-#    SUBDIR += speak_freely
     SUBDIR += vat
     SUBDIR += vic
-#    SUBDIR += wb
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/misc/Makefile b/misc/Makefile
index b62307ddd9b..bd4090a810b 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.57 2000/01/13 16:17:51 wiz Exp $
+#	$NetBSD: Makefile,v 1.58 2000/02/25 01:04:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/10/13 04:41:07 max Exp
 
     SUBDIR += astrolog
@@ -7,18 +7,16 @@
     SUBDIR += chipmunk
     SUBDIR += chord
     SUBDIR += colorls
-#   SUBDIR += ctk		# broken w/ tcl/tk V8.0 - HF
-#   SUBDIR += dejagnu		# needs expect - HF
     SUBDIR += dgpsip
     SUBDIR += dialog
     SUBDIR += dotfile
     SUBDIR += dt
     SUBDIR += dync
-#   SUBDIR += ecc		# broken - HF
-#   SUBDIR += estic		# left for someone w/ an Istec - HF
+    SUBDIR += emma
     SUBDIR += fd
     SUBDIR += fep
     SUBDIR += figlet
+#    SUBDIR += freewnn-common		# base package only
     SUBDIR += git
     SUBDIR += gnofin
     SUBDIR += gnome-pim
@@ -36,10 +34,7 @@
     SUBDIR += linuxls
     SUBDIR += logsurfer
     SUBDIR += lv
-#   SUBDIR += mmv
     SUBDIR += most
-#   SUBDIR += mshell		# displays nothing, needs debugging - HF
-#   SUBDIR += nwrite
     SUBDIR += p5-Array-PrintCols
     SUBDIR += p5-Business-CreditCard
     SUBDIR += p5-Locale-Codes
@@ -48,9 +43,10 @@
     SUBDIR += pty-redir
     SUBDIR += py-mxDateTime
     SUBDIR += py-readline
-    SUBDIR += quicklist
     SUBDIR += qterm
+    SUBDIR += quicklist
     SUBDIR += remind
+    SUBDIR += root
     SUBDIR += rpm
     SUBDIR += sci
     SUBDIR += screen
@@ -61,15 +57,10 @@
     SUBDIR += tclticker
     SUBDIR += team
     SUBDIR += vfu
-#    SUBDIR += viz
     SUBDIR += watch
-#    SUBDIR += xcalendar
     SUBDIR += xfinans
-#    SUBDIR += xmaddressbook	# needs Motif/Lesstif - HF
     SUBDIR += xinvest
-#    SUBDIR += xopps		# needs Motif/Lesstif - HF
     SUBDIR += xrolodex
-#    SUBDIR += xtar		# needs Motif/Lesstif - HF
     SUBDIR += zorro
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/net/Makefile b/net/Makefile
index 8c829ff039d..126dfa99376 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2000/02/22 04:41:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.115 2000/02/25 01:04:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.117 1997/08/16 03:11:52 gpalmer Exp 
 #
 
@@ -6,15 +6,11 @@
 
     SUBDIR += archie
     SUBDIR += arpwatch
-#    SUBDIR += ascend-radius
     SUBDIR += batchftp
-#    SUBDIR += bb
-#   SUBDIR += beroftpd		# Superceded by latest wu-ftpd
     SUBDIR += bind4
     SUBDIR += bind8
     SUBDIR += bind9
     SUBDIR += bing
-#    SUBDIR += cap
     SUBDIR += cftp
     SUBDIR += choparp
     SUBDIR += coda5_client
@@ -23,57 +19,34 @@
     SUBDIR += coda_doc
     SUBDIR += coda_intro
     SUBDIR += coda_server
-#    SUBDIR += curl
-#    SUBDIR += cvsup
-#    SUBDIR += cvsup-mirror
     SUBDIR += delegate
-#    SUBDIR += dgd
-#    SUBDIR += dgd-lpmud
-#    SUBDIR += dgd-net
     SUBDIR += dhid
     SUBDIR += dip
     SUBDIR += dlint
-#    SUBDIR += echoping
     SUBDIR += eggdrop
     SUBDIR += ethereal
-#    SUBDIR += fping
     SUBDIR += freewais-sf
-#    SUBDIR += fspclient
-#    SUBDIR += ftpsearch
-#    SUBDIR += ftptool
     SUBDIR += gaim
     SUBDIR += gated
     SUBDIR += gnapster
-#    SUBDIR += gnu-finger
-#    SUBDIR += gopher
     SUBDIR += gtksamba
     SUBDIR += icb
-#    SUBDIR += icmpinfo
     SUBDIR += icsi-finger
-#    SUBDIR += irc
     SUBDIR += ircII
-#    SUBDIR += ircii-epic
     SUBDIR += ircu
     SUBDIR += irrd
-#    SUBDIR += isc-dhcp
-#    SUBDIR += ivs
     SUBDIR += jwhois
     SUBDIR += kdenetwork
     SUBDIR += kmap
-#    SUBDIR += ldap
     SUBDIR += lftp
     SUBDIR += libirc
     SUBDIR += libpcap
-#    SUBDIR += libsocket++
     SUBDIR += lukemftp
     SUBDIR += micq
     SUBDIR += mirror
     SUBDIR += mouse-pppoe
-#    SUBDIR += mpd
     SUBDIR += mrtg
-#    SUBDIR += moxftp
     SUBDIR += mtr
-#    SUBDIR += ncftp
     SUBDIR += ncftp2
     SUBDIR += netatalk
     SUBDIR += netcat
@@ -84,30 +57,21 @@
     SUBDIR += nocol
     SUBDIR += ntop
     SUBDIR += ntp4
-#    SUBDIR += p5-Archie
     SUBDIR += p5-Net
     SUBDIR += p5-Net-DNS
-#    SUBDIR += p5-Net-Whois
     SUBDIR += p5-SNMP
     SUBDIR += p5-Wais
     SUBDIR += pchar
-#    SUBDIR += pcnfsd
     SUBDIR += pfnet
     SUBDIR += pload
-#    SUBDIR += pmf
     SUBDIR += poptop
     SUBDIR += ppp-mppe
     SUBDIR += ra-pna-proxy
     SUBDIR += ra-rtsp-proxy
     SUBDIR += radius
-#    SUBDIR += ratoolset
     SUBDIR += rdist6
-#    SUBDIR += ripetools
-#    SUBDIR += rmsg
-#    SUBDIR += rshell
     SUBDIR += rsync
     SUBDIR += rumba
-#    SUBDIR += rwhois
     SUBDIR += samba
     SUBDIR += scotty
     SUBDIR += sdist
@@ -116,26 +80,18 @@
     SUBDIR += sirc
     SUBDIR += sniffit
     SUBDIR += snort
-#    SUBDIR += slirp
     SUBDIR += socks4
     SUBDIR += socks5
     SUBDIR += speakfreely
     SUBDIR += spegla
     SUBDIR += srsh
     SUBDIR += ssync
-#    SUBDIR += strobe
-#    SUBDIR += sup
-#    SUBDIR += tac_plus
     SUBDIR += tcptrace
-#    SUBDIR += telnetx
-#    SUBDIR += tintin++
     SUBDIR += tinyfugue
     SUBDIR += tkicb
     SUBDIR += tkirc
     SUBDIR += tn5250
     SUBDIR+= totd
-#    SUBDIR += traceroute
-#    SUBDIR += trafshow
     SUBDIR+= ttcp
     SUBDIR += ucd-snmp
     SUBDIR += ucd-snmp-current
@@ -143,19 +99,14 @@
     SUBDIR += vnc
     SUBDIR += vtun
     SUBDIR += wakeup
-#    SUBDIR += wais
-#    SUBDIR += wide-dhcp
     SUBDIR += wget
     SUBDIR += wmpload
     SUBDIR += wu-ftpd
-#    SUBDIR += wu-ftpd-vr		# Superceded by latest wu-ftpd
     SUBDIR += xarchie
     SUBDIR += xchat
     SUBDIR += xipdump
-#    SUBDIR += xipmsg
     SUBDIR += xspeakfree
     SUBDIR += xtraceroute
-#    SUBDIR += yale-tftpd
     SUBDIR += ytalk
     SUBDIR += ywho
     SUBDIR += zebra
diff --git a/news/Makefile b/news/Makefile
index c9c9efaa79f..3bd2e56027e 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,29 +1,17 @@
-# $NetBSD: Makefile,v 1.15 1999/08/22 13:46:27 rh Exp $
+# $NetBSD: Makefile,v 1.16 2000/02/25 01:04:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.28 1997/06/27 23:02:54 brian Exp 
 #
 
-#    SUBDIR += cnews
-#    SUBDIR += diablo
-#    SUBDIR += dnews
     SUBDIR += inn
     SUBDIR += knews
-#    SUBDIR += leafnode
     SUBDIR += newscache
     SUBDIR += nn
-#    SUBDIR += nn-current
-#    SUBDIR += nntp
-#    SUBDIR += nntpbtr
     SUBDIR += nntpcache
     SUBDIR += nntpclnt
-#    SUBDIR += plor
-#    SUBDIR += rkive
-#    SUBDIR += slnr
     SUBDIR += slrn
-#    SUBDIR += slurp
     SUBDIR += suck
     SUBDIR += tin
     SUBDIR += trn
     SUBDIR += xrn
-#    SUBDIR += xvnews
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/pkgtools/Makefile b/pkgtools/Makefile
index fb6582280ba..057ae50f199 100644
--- a/pkgtools/Makefile
+++ b/pkgtools/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2000/02/14 02:07:42 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2000/02/25 01:04:15 wiz Exp $
 #
 
-SUBDIR+= gensolpkg
-#SUBDIR+= pax			# only needed on 1.3 systems
-#SUBDIR+= pkg_install		# only install on demand of bsd.pkg.mk
-SUBDIR+= pkg_tarup
-SUBDIR+= pkgdep
-SUBDIR+= pkglibtool
-SUBDIR+= pkglint
-SUBDIR+= pkgmanpages
-SUBDIR+= port2pkg
-SUBDIR+= url2pkg
-#SUBDIR+= xpkgwedge		# broken
+    SUBDIR+= gensolpkg
+#    SUBDIR+= pax			# only needed on 1.3 systems
+#    SUBDIR+= pkg_install		# only install on demand of bsd.pkg.mk
+    SUBDIR+= pkg_tarup
+    SUBDIR+= pkgdep
+    SUBDIR+= pkglibtool
+    SUBDIR+= pkglint
+    SUBDIR+= pkgmanpages
+    SUBDIR+= port2pkg
+    SUBDIR+= url2pkg
+#    SUBDIR+= xpkgwedge		# broken
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/print/Makefile b/print/Makefile
index 33da2dd8011..80a63e1e32d 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2000/01/14 15:21:22 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.32 2000/02/25 01:04:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.52 1997/12/14 00:58:08 asami Exp
 #
 
@@ -6,42 +6,19 @@
     SUBDIR += a2ps
     SUBDIR += acroread
     SUBDIR += acroread3
-#    SUBDIR += afm
-#    SUBDIR += apsfilter
-#    SUBDIR += asprint
-#    SUBDIR += bibcard
-#    SUBDIR += bibview
-#    SUBDIR += c2ps
     SUBDIR += cups
-#    SUBDIR += detex
-#    SUBDIR += dvi2tty
-#    SUBDIR += dvi2xx
-#    SUBDIR += dvips
-#    SUBDIR += dvips2ascii
-#    SUBDIR += dviselect
     SUBDIR += enscript
     SUBDIR += ggv
-#    SUBDIR += ghostscript
-#    SUBDIR += ghostscript3
-#    SUBDIR += ghostscript4
     SUBDIR += ghostscript5
-#    SUBDIR += ghostview
     SUBDIR += gnome-print
     SUBDIR += gv
-#    SUBDIR += html2latex
-#    SUBDIR += latex
     SUBDIR += lgrind
-#    SUBDIR += lout
-#    SUBDIR += lprps
     SUBDIR += lyx
     SUBDIR += magicfilter
-#    SUBDIR += makeindex
     SUBDIR += mp
     SUBDIR += mpage
-#    SUBDIR += musixtex
     SUBDIR += papersize
     SUBDIR += pdflib
-#    SUBDIR += pkfonts
     SUBDIR += psify
     SUBDIR += psutils
     SUBDIR += rtf2latex
@@ -50,13 +27,6 @@
     SUBDIR += teTeX-bin
     SUBDIR += teTeX-share
     SUBDIR += teTeX-sharesrc
-#    SUBDIR += tex
-#    SUBDIR += texinfo
-#    SUBDIR += tr2latex
     SUBDIR += transfig
-#    SUBDIR += virtualpaper
-#    SUBDIR += xdvi
-#    SUBDIR += xmbibtex
-#    SUBDIR += xmgr
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/security/Makefile b/security/Makefile
index 207558b541c..cafeb94d8c5 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,41 +1,29 @@
-# $NetBSD: Makefile,v 1.25 2000/02/11 10:48:20 agc Exp $
+# $NetBSD: Makefile,v 1.26 2000/02/25 01:04:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/11/09 10:17:02 asami Exp
 #
 
-#    SUBDIR += cfs
-#    SUBDIR += cops
     SUBDIR += crack
-#    SUBDIR += donkey
     SUBDIR += ddos-scan
     SUBDIR += fortify
     SUBDIR += fsh
-#    SUBDIR += fwtk
-#    SUBDIR += john
     SUBDIR += gnupg
     SUBDIR += libident
     SUBDIR += nessus
     SUBDIR += nfsbug
+    SUBDIR += openssh
     SUBDIR += openssl
-#    SUBDIR += p5-Authen-Radius
-#    SUBDIR += p5-Crypt-DES
-#    SUBDIR += p5-Crypt-IDEA
     SUBDIR += p5-Digest-MD5
     SUBDIR += p5-MD5
-#    SUBDIR += p5-PGP
     SUBDIR += pgp2
     SUBDIR += pgp5
-#    SUBDIR += pidentd
     SUBDIR += portsentry
     SUBDIR += py-crypto
     SUBDIR += rc5des
     SUBDIR += rsaref
+    SUBDIR += srp_client
     SUBDIR += ssh
     SUBDIR += ssh-ip-tunnel
     SUBDIR += sudo
-#    SUBDIR += super
-#    SUBDIR += swatch
     SUBDIR += tripwire
-#    SUBDIR += vscan
-#    SUBDIR += xinetd
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/shells/Makefile b/shells/Makefile
index 72614efa4a3..f1b369c3207 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 1998/04/15 10:38:47 agc Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/25 01:04:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/01/03 00:40:55 max Exp
 #
 
-#    SUBDIR += bash
     SUBDIR += bash2
     SUBDIR += es
     SUBDIR += scsh
-#    SUBDIR += pdksh
     SUBDIR += tcsh
     SUBDIR += zsh
 
diff --git a/sysutils/Makefile b/sysutils/Makefile
index ec5cf37fe36..201b0cecdd7 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile,v 1.56 2000/02/21 16:46:14 pooka Exp $
+# $NetBSD: Makefile,v 1.57 2000/02/25 01:04:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/09/30 06:14:59 asami Exp
 #
 
-#    SUBDIR += LPRng
     SUBDIR += addnerd
-#    SUBDIR += afio
     SUBDIR += amanda
-    SUBDIR += amanda-common
-    SUBDIR += amanda-server
     SUBDIR += amanda-client
+    SUBDIR += amanda-common
     SUBDIR += amanda-plot
+    SUBDIR += amanda-server
     SUBDIR += apcupsd
     SUBDIR += aperture
     SUBDIR += asapm
     SUBDIR += bchunk
     SUBDIR += cdrdao
     SUBDIR += cdrecord
+#    SUBDIR += cdrecord-current		# disabled by default
     SUBDIR += cfengine
-#    SUBDIR += cd-write
-#    SUBDIR += contool
-    SUBDIR += crashme
     SUBDIR += cpogm
+    SUBDIR += crashme
     SUBDIR += depot
     SUBDIR += fileutils
     SUBDIR += findutils
@@ -29,7 +26,6 @@
     SUBDIR += gmc
     SUBDIR += gtop
     SUBDIR += hfsutils
-#    SUBDIR += idled
     SUBDIR += kapm
     SUBDIR += kdf
     SUBDIR += klavg
@@ -37,43 +33,29 @@
     SUBDIR += logrot
     SUBDIR += logtime
     SUBDIR += lsof
-#    SUBDIR += manck
     SUBDIR += mc
-#    SUBDIR += mei
     SUBDIR += mkhybrid
     SUBDIR += mkisofs
     SUBDIR += mtools
     SUBDIR += osname
-#    SUBDIR += pib
     SUBDIR += psmisc
     SUBDIR += roller
     SUBDIR += rtty
-#    SUBDIR += setquota
     SUBDIR += sh-utils
     SUBDIR += skill
     SUBDIR += socket
     SUBDIR += sshsh
-#    SUBDIR += star
-#    SUBDIR += stat
-#    SUBDIR += su2
     SUBDIR += sux
     SUBDIR += sysinfo
-#    SUBDIR += tcplist
     SUBDIR += tload
     SUBDIR += top
     SUBDIR += toshutils
-#    SUBDIR += tua
     SUBDIR += usbutil
     SUBDIR += user
     SUBDIR += xbatt
-#    SUBDIR += xcpustate
     SUBDIR += xdu
     SUBDIR += xhfs
-#    SUBDIR += xloadface
     SUBDIR += xosview
-#    SUBDIR += xperfmon
     SUBDIR += xps
-#    SUBDIR += xsysinfo
-#    SUBDIR += xsysstats
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/textproc/Makefile b/textproc/Makefile
index 08b0de69271..a71c4709387 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2000/01/16 14:03:45 wulf Exp $
+# $NetBSD: Makefile,v 1.35 2000/02/25 01:04:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/10/13 11:11:32 itojun Exp
 #
 
-#    SUBDIR += agrep
     SUBDIR += catdoc
     SUBDIR += dict-client
     SUBDIR += dict-server
@@ -10,28 +9,22 @@
     SUBDIR += dsssl-docbook-modular
     SUBDIR += eperl
     SUBDIR += glimpse
-#    SUBDIR += html
     SUBDIR += html2text
-#    SUBDIR += info2html
-#    SUBDIR += isearch
     SUBDIR += iso12083
     SUBDIR += iso8879
     SUBDIR += ispell
     SUBDIR += jade
     SUBDIR += kdoc
     SUBDIR += libxml
-#    SUBDIR += linuxdoc
     SUBDIR += lout
-#    SUBDIR += mgdiff
     SUBDIR += mminstance
     SUBDIR += mswordview
-    SUBDIR += par
     SUBDIR += p5-Convert-BER
     SUBDIR += p5-Filter
     SUBDIR += p5-XML-Parser
-#    SUBDIR += pilot_makedoc
+    SUBDIR += par
+    SUBDIR += py-dtml
     SUBDIR += rman
-#    SUBDIR += sgmlformat
     SUBDIR += sp
     SUBDIR += t1lib
     SUBDIR += t1utils
@@ -51,6 +44,5 @@
     SUBDIR += texi2html
     SUBDIR += textutils
     SUBDIR += unroff
-#    SUBDIR += wdiff
 
 .include "../mk/bsd.pkg.subdir.mk"
diff --git a/www/Makefile b/www/Makefile
index 49cd390792d..cd8724ffd8e 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2000/02/09 17:45:28 abs Exp $
+# $NetBSD: Makefile,v 1.72 2000/02/25 01:04:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp
 #
 
@@ -11,32 +11,21 @@
     SUBDIR += ap-dtcl
     SUBDIR += ap-fastcgi
 #    SUBDIR += ap-jserv		# depends on disabled jsdk0
-    SUBDIR += ap-ssl
     SUBDIR += ap-perl
     SUBDIR += ap-php3
+    SUBDIR += ap-ssl
     SUBDIR += apache
     SUBDIR += apache6
-#    SUBDIR += apache-current
     SUBDIR += arena
-#    SUBDIR += ashe           # requires Motif
     SUBDIR += asp2php
-#    SUBDIR += aswedit
     SUBDIR += bozohttpd
     SUBDIR += cgilib
-#    SUBDIR += cgiparse
-#    SUBDIR += chimera
-#    SUBDIR += comline
     SUBDIR += communicator
-#    SUBDIR += fxhtml
-#    SUBDIR += gn
     SUBDIR += galway
     SUBDIR += grail
-#    SUBDIR += gwstat
-#    SUBDIR += harvest
     SUBDIR += htdig
     SUBDIR += htmldoc
     SUBDIR += hypermail
-#    SUBDIR += http-analyze
     SUBDIR += ijb
     SUBDIR += jakarta-tomcat
 # jsdk20 is disabled because the distfile must be manually downloaded.
@@ -44,33 +33,20 @@
 # disabled because it depends on jsdk20
 #    SUBDIR += jssi
     SUBDIR += libghttp
-#    SUBDIR += libpics
     SUBDIR += libwww
-#    SUBDIR += linemode
     SUBDIR += links
-#    SUBDIR += linux-netscape4
     SUBDIR += lynx
-#    SUBDIR += mapedit
-#    SUBDIR += mhonarc
-#    SUBDIR += mmm
-#    SUBDIR += momspider
     SUBDIR += mozilla
     SUBDIR += navigator
     SUBDIR += navigator3
     SUBDIR += ns-remote
     SUBDIR += p5-Apache-ASP
     SUBDIR += p5-Apache-ePerl
-#    SUBDIR += p5-CGI
     SUBDIR += p5-CGI_Lite
     SUBDIR += p5-FCGI
-#    SUBDIR += p5-HTML
     SUBDIR += p5-HTML-Parser
-#    SUBDIR += p5-HTML-QuickCheck
-#    SUBDIR += p5-HTML-Stream
-#    SUBDIR += p5-HTTPD-Tools
     SUBDIR += p5-URI
     SUBDIR += p5-VRML
-#    SUBDIR += p5-WWW-Search
     SUBDIR += p5-libwww
     SUBDIR += php3
     SUBDIR += php3-gd
@@ -85,20 +61,13 @@
     SUBDIR += swish-e
     SUBDIR += tcl-cgi
     SUBDIR += thttpd
-#    SUBDIR += vrweb
-#    SUBDIR += w3
     SUBDIR += w3c-httpd
     SUBDIR += w3m
     SUBDIR += web500gw
-     SUBDIR += webalizer
-#    SUBDIR += webcopy
+    SUBDIR += webalizer
     SUBDIR += weblint
-#    SUBDIR += webstone
-#    SUBDIR += wml
-#    SUBDIR += wn
     SUBDIR += wwwcount
     SUBDIR += wwwoffle
-#    SUBDIR += wwwstat
     SUBDIR += zope
     SUBDIR += zope-confera
 
diff --git a/x11/Makefile b/x11/Makefile
index 2def1172440..5463612f55d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.144 2000/02/06 00:42:30 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2000/02/25 01:04:17 wiz Exp $
 # FreeBSD Id: Makefile,v 1.156 1997/09/30 07:54:42 asami Exp
 #
 
-#    SUBDIR += FWF
     SUBDIR += XF86Setup
-#    SUBDIR += XFree86
-#    SUBDIR += XFree86-contrib
     SUBDIR += Xaw-Xpm
     SUBDIR += Xaw3d
     SUBDIR += Xbae
@@ -16,12 +13,6 @@
     SUBDIR += asclock-gtk
     SUBDIR += asclock-xlib
     SUBDIR += ascp
-#    SUBDIR += auis
-#    SUBDIR += bclock
-#    SUBDIR += blast
-#    SUBDIR += blt
-#    SUBDIR += bricons
-#    SUBDIR += camltk41
     SUBDIR += catclock
     SUBDIR += controlcenter
     SUBDIR += ctwm
@@ -30,21 +21,16 @@
     SUBDIR += econf
     SUBDIR += egtk
     SUBDIR += emiclock
-#    SUBDIR += emu
     SUBDIR += enlightenment
     SUBDIR += eterm
-#    SUBDIR += etlfonts
-#    SUBDIR += explorer
-#    SUBDIR += fbsd-icons
+#    SUBDIR += ethemes
     SUBDIR += filerunner
     SUBDIR += fltk
-#    SUBDIR += freefonts
     SUBDIR += fvwm-wharf
     SUBDIR += fvwm1
     SUBDIR += fvwm2
     SUBDIR += fvwm95
     SUBDIR += gdm
-#    SUBDIR += getbdf
     SUBDIR += glclock
     SUBDIR += gnome
     SUBDIR += gnome-core
@@ -57,11 +43,9 @@
     SUBDIR += gtk10
     SUBDIR += gtkglarea
     SUBDIR += gtkstep
-#    SUBDIR += gwm
     SUBDIR += icewm
     SUBDIR += icewm-gnome
     SUBDIR += intlfonts
-#    SUBDIR += iv
     SUBDIR += jmk-fonts
     SUBDIR += kde
     SUBDIR += kdebase
@@ -71,51 +55,35 @@
     SUBDIR += kterm
     SUBDIR += kworldwatch
     SUBDIR += lesstif
-#    SUBDIR += libdnd
-#    SUBDIR += libsx
-#    SUBDIR += lupe
-     SUBDIR += lwm
-#    SUBDIR += mlvwm
-#    SUBDIR += mouseclock
-#    SUBDIR += neXtaw
-#    SUBDIR += olvwm
+    SUBDIR += lwm
     SUBDIR += oneko
-#    SUBDIR += p5-Tcl-Tk
     SUBDIR += p5-Tk
     SUBDIR += p5-gtk
-#    SUBDIR += piewm
     SUBDIR += polclock
-#    SUBDIR += pythonqt
     SUBDIR += py-Tk
     SUBDIR += qt
-#    SUBDIR += qvwm
     SUBDIR += qwspritefield
+    SUBDIR += qwt
     SUBDIR += rclock
+    SUBDIR += rep-gtk
     SUBDIR += ruby-Tk
     SUBDIR += ruby-gtk
     SUBDIR += rxvt
     SUBDIR += scwm
-#    SUBDIR += sliderule
-#    SUBDIR += slingshot
     SUBDIR += speyes
     SUBDIR += sunclock
     SUBDIR += swisswatch
-#    SUBDIR += sxpc
     SUBDIR += titrax
     SUBDIR += tix
-#    SUBDIR += tk41
-#    SUBDIR += tk42
     SUBDIR += tk80
     SUBDIR += tkcron
-#    SUBDIR += tkdesk
-#    SUBDIR += tkgoodstuff
     SUBDIR += tkinfo
     SUBDIR += tkman
     SUBDIR += tvtwm
     SUBDIR += unclutter
     SUBDIR += uwm
-#    SUBDIR += viewfax
     SUBDIR += windowmaker
+    SUBDIR += wm2
     SUBDIR += wmakerconf
     SUBDIR += wmavgload
     SUBDIR += wmcalclock
@@ -125,51 +93,37 @@
     SUBDIR += wmfstatus
     SUBDIR += wmthemes
     SUBDIR += wmtime
-    SUBDIR += wm2
     SUBDIR += wmx
     SUBDIR += wterm
     SUBDIR += x2x
     SUBDIR += x3270
-#    SUBDIR += xalarm
     SUBDIR += xaniroc
-#    SUBDIR += xantfarm
     SUBDIR += xautolock
     SUBDIR += xbanner
     SUBDIR += xbeats
-#    SUBDIR += xbuffy
     SUBDIR += xcb
-#    SUBDIR += xco
-#    SUBDIR += xcoloredit
     SUBDIR += xcolors
     SUBDIR += xcolorsel
     SUBDIR += xcruise
-    SUBDIR += xdaliclock
     SUBDIR += xdaemon
+    SUBDIR += xdaliclock
     SUBDIR += xdm3d
-#    SUBDIR += xdtm
     SUBDIR += xearth
     SUBDIR += xephem
     SUBDIR += xfce
-#    SUBDIR += xfed
-#    SUBDIR += xfedor
     SUBDIR += xfishtank
     SUBDIR += xflame
-#    SUBDIR += xfm
     SUBDIR += xforms
     SUBDIR += xgas
     SUBDIR += xglobe
-#    SUBDIR += xgrab
     SUBDIR += xhangglider
     SUBDIR += xkeycaps
     SUBDIR += xless
-#    SUBDIR += xloadimage
     SUBDIR += xlockmore
     SUBDIR += xlogout
     SUBDIR += xmascot
-#    SUBDIR += xmbdfed
     SUBDIR += xmeter
     SUBDIR += xmindpath
-#    SUBDIR += xmold
     SUBDIR += xmon
     SUBDIR += xmove
     SUBDIR += xmx
@@ -177,19 +131,13 @@
     SUBDIR += xp
     SUBDIR += xpmroot
     SUBDIR += xpns
-#    SUBDIR += xpostit
-#    SUBDIR += xpostitPlus
-#    SUBDIR += xprompt
     SUBDIR += xquote
     SUBDIR += xscreensaver
     SUBDIR += xscript
     SUBDIR += xsnow
-#    SUBDIR += xtacy
     SUBDIR += xteddy
     SUBDIR += xtermset
-#    SUBDIR += xtestpicture
     SUBDIR += xtimer
-#    SUBDIR += xtoolwait
     SUBDIR += xview
     SUBDIR += xview-clients
     SUBDIR += xview-config
@@ -197,6 +145,5 @@
     SUBDIR += xwatchwin
     SUBDIR += xworld
     SUBDIR += xwrits
-#    SUBDIR += xzoom
 
 .include "../mk/bsd.pkg.subdir.mk"