diff --git a/infrastructure/plist/amd64 b/infrastructure/plist/amd64
index eac8ed8e281..928930a5a22 100644
--- a/infrastructure/plist/amd64
+++ b/infrastructure/plist/amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: amd64,v 1.2 2004/03/15 07:24:38 pvalchev Exp $
+# $OpenBSD: amd64,v 1.3 2004/03/23 22:09:46 pvalchev Exp $
 # This is the master list of subdirs used to choose i386 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
@@ -21,7 +21,7 @@ shells/tcsh,static
 devel/autoconf/2.59
 devel/automake
 #books/autobook
-#devel/bison
+devel/bison
 mail/mutt/stable
 audio/libao,-esd
 audio/vorbis-tools
@@ -36,21 +36,21 @@ x11/kde/base3
 #x11/kde/office3
 #x11/kde/pim3
 #x11/kde/edu3
-#x11/windowmaker
+x11/windowmaker
 #x11/windowmaker-extra
 x11/rxvt
 x11/xpostit
 x11/xdaliclock
 x11/xkeycaps
-#textproc/antiword
+textproc/antiword
 textproc/xpdf
-#lang/python/2.3 XXX
-#lang/python/2.3,-tools XXX
+lang/python/2.3
+lang/python/2.3,-tools
 graphics/gqview
 sysutils/pftop
-#net/snort
-#net/ethereal
-#security/stunnel
+net/snort
+net/ethereal
+security/stunnel
 #net/gaim
-#devel/gmake
-#net/ntop
+devel/gmake
+net/ntop
diff --git a/infrastructure/plist/i386 b/infrastructure/plist/i386
index b82b9b8e9e8..70a602c5f44 100644
--- a/infrastructure/plist/i386
+++ b/infrastructure/plist/i386
@@ -1,4 +1,4 @@
-# $OpenBSD: i386,v 1.3 2004/03/15 07:24:38 pvalchev Exp $
+# $OpenBSD: i386,v 1.4 2004/03/23 22:09:46 pvalchev Exp $
 # This is the master list of subdirs used to choose i386 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
@@ -55,7 +55,7 @@ x11/windowmaker
 x11/windowmaker-extra
 www/tidy
 editors/nedit
-#databases/openldap,-server
+databases/openldap,-server
 x11/rxvt
 x11/xpostit
 x11/xdaliclock
@@ -64,7 +64,7 @@ audio/mp3cddb
 editors/nano
 textproc/antiword
 textproc/xpdf
-#editors/ted
+editors/ted
 lang/python/2.3
 lang/python/2.3,-tools
 mail/exim,no_x11
@@ -72,21 +72,21 @@ www/mod_perl
 games/xkobo,harder
 games/xlife
 devel/ddd
-#cad/qcad
+cad/qcad
 x11/p5-Tk
 x11/xglobe
 graphics/mpeg_play
 benchmarks/tcpblast
 www/links
 graphics/gqview
-#net/epic4
+net/epic4
 net/irssi
 sysutils/pftop
 security/bsd-airtools
 editors/abiword
 archivers/zip
 net/snort
-#x11/aterm
+x11/aterm
 net/ettercap
 net/ethereal
 security/stunnel
@@ -97,14 +97,14 @@ mail/sylpheed
 net/gaim
 devel/gmake
 sysutils/proctools
-#www/squid
+www/squid
 www/transproxy
 security/aide
 security/dsniff
 net/ntop
 news/slrn
 security/gnupg
-#print/lyx
+print/lyx
 net/libdnet
 net/nsd
 graphics/ImageMagick
@@ -112,5 +112,7 @@ audio/abcde
 www/php4/core
 www/php4/core,-pear
 www/php4/extensions,-mysql
-#www/php4/extensions,-ldap
+www/php4/extensions,-ldap
 www/php4/extensions,-gd
+devel/smpeg
+mail/mozilla-thunderbird
diff --git a/infrastructure/plist/powerpc b/infrastructure/plist/powerpc
index d60a7ac12dd..5c43959b361 100644
--- a/infrastructure/plist/powerpc
+++ b/infrastructure/plist/powerpc
@@ -1,4 +1,4 @@
-# $OpenBSD: powerpc,v 1.3 2004/03/15 07:24:38 pvalchev Exp $
+# $OpenBSD: powerpc,v 1.4 2004/03/23 22:09:46 pvalchev Exp $
 # This is the master list of subdirs used to choose powerpc packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
@@ -11,12 +11,12 @@ archivers/unzip
 archivers/bzip2
 print/teTeX/base
 net/nmap,no_x11
-#net/pptp
+net/pptp
 sysutils/cdrtools
 mail/procmail
 mail/fetchmail
 misc/screen
-#sysutils/mtools
+sysutils/mtools
 graphics/gif2png
 shells/zsh/stable,static
 shells/bash2,static
@@ -28,11 +28,11 @@ devel/bison
 sysutils/colorls
 archivers/gtar,static
 mail/mutt/stable
-#audio/libao,-esd
-#audio/vorbis-tools
-#audio/mpg321
+audio/libao,-esd
+audio/vorbis-tools
+audio/mpg321
 net/curl
-#net/wget
+net/wget
 print/ghostscript/gnu
 print/gv
 audio/cdparanoia
@@ -44,26 +44,26 @@ x11/qt3,-base
 x11/kde/base3
 www/tidy
 x11/rxvt
-#x11/xpostit
-#x11/xdaliclock
-#x11/xkeycaps
-#audio/mp3cddb
+x11/xpostit
+x11/xdaliclock
+x11/xkeycaps
+audio/mp3cddb
 x11/xloadimage
 textproc/antiword
 textproc/xpdf
-#lang/python/2.3 XXX
-#lang/python/2.3,-tools
+lang/python/2.3
+lang/python/2.3,-tools
 sysutils/pftop
-#archivers/zip
-#net/snort
-#x11/aterm
+archivers/zip
+net/snort
+x11/aterm
 #net/ettercap
 net/ethereal
 security/stunnel
-#net/silc-client
+net/silc-client
 #graphics/xfig
-#x11/xautolock
-#devel/gmake
-#sysutils/proctools
-#security/dsniff
-#security/gnupg
+x11/xautolock
+devel/gmake
+sysutils/proctools
+security/dsniff
+security/gnupg
diff --git a/infrastructure/plist/sparc b/infrastructure/plist/sparc
index b04d3166bdc..4fde151cf49 100644
--- a/infrastructure/plist/sparc
+++ b/infrastructure/plist/sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: sparc,v 1.2 2004/03/15 07:24:38 pvalchev Exp $
+# $OpenBSD: sparc,v 1.3 2004/03/23 22:09:46 pvalchev Exp $
 # This is the master list of subdirs used to choose i386 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
@@ -12,7 +12,7 @@ archivers/bzip2
 print/teTeX/base
 net/nmap,no_x11
 #net/pptp
-sysutils/cdrtools
+#sysutils/cdrtools
 mail/procmail
 mail/fetchmail
 misc/screen
@@ -21,7 +21,7 @@ shells/zsh/stable,static
 shells/bash2,static
 shells/tcsh,static
 mail/mutt/stable
-net/curl
+#net/curl
 print/ghostscript/gnu
 print/gv
 devel/id-utils
diff --git a/infrastructure/plist/sparc64 b/infrastructure/plist/sparc64
index 7f7c726c245..e5c4e72113d 100644
--- a/infrastructure/plist/sparc64
+++ b/infrastructure/plist/sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: sparc64,v 1.2 2004/03/15 07:24:38 pvalchev Exp $
+# $OpenBSD: sparc64,v 1.3 2004/03/23 22:09:46 pvalchev Exp $
 # This is the master list of subdirs used to choose i386 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
@@ -28,14 +28,14 @@ print/gv
 devel/id-utils
 x11/openmotif
 www/mozilla-firefox
-#x11/qt3,-base
-#x11/kde/base3
+x11/qt3,-base
+x11/kde/base3
 #x11/kde/office3
 #x11/kde/pim3
 #x11/kde/edu3
 #x11/windowmaker
 #x11/windowmaker-extra
-#textproc/xpdf XXX
+#textproc/xpdf
 #graphics/gqview
-sysutils/pftop
-security/stunnel
+#sysutils/pftop
+#security/stunnel