diff --git a/infrastructure/plist/amd64 b/infrastructure/plist/amd64
index aebce4209ea..bf2e5b6a8a3 100644
--- a/infrastructure/plist/amd64
+++ b/infrastructure/plist/amd64
@@ -1,130 +1,9 @@
-# $OpenBSD: amd64,v 1.46 2013/04/02 14:27:59 naddy Exp $
+# $OpenBSD: amd64,v 1.47 2013/08/15 15:09:18 naddy Exp $
 # This is the master list of subdirs used to choose amd64 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
-net/cvsync
-editors/vim,no_x11
-editors/emacs21
-editors/emacs21,-leim
-archivers/unzip
 archivers/bzip2
+archivers/unzip
 archivers/xz
-#print/texlive/base
-net/nmap
-sysutils/cdrtools
-sysutils/dvd+rw-tools
-mail/procmail
-mail/fetchmail
-#net/samba
-shells/zsh
-shells/bash
-shells/tcsh
-#devel/autoconf/2.62
-#devel/automake/1.9
-#devel/metaauto
-#devel/libtool
-#books/autobook
-devel/bison
-sysutils/colorls
-archivers/gtar
-mail/mutt/stable
-audio/vorbis-tools
-audio/mpg123
-net/curl
-net/wget
-print/ghostscript/gnu
-print/gv
-audio/cdparanoia
-net/ircII
-www/mozilla-firefox
-#textproc/xpdf
-#x11/kde/base3
-#x11/kde/office3
-#x11/kde/edu3
-#x11/kde/games3
-#graphics/digikam
-x11/windowmaker
-x11/windowmaker-extra
-www/tidyp
-#editors/nedit
-databases/openldap,-server
-x11/xpostit
-x11/xdaliclock
-x11/xkeycaps
-audio/mp3cddb
-editors/nano
-textproc/antiword
-#editors/ted
-lang/python/2.7
-lang/python/2.7,-tools
-www/mod_perl
-games/xkobo,harder
-x11/p5-Tk
-x11/xglobe
-www/links
-graphics/gpicview
-net/epic4
-net/irssi
-security/bsd-airtools
-editors/abiword
-archivers/zip
-#net/snort
-net/ettercap
-security/stunnel
-net/silc-client
-#graphics/xfig
-x11/xautolock
-#mail/sylpheed
-net/pidgin
-security/pidgin-otr
-devel/gmake
-#!misc/tpwireless
-#!sysutils/tphdisk
-www/squid
-security/aide
-security/dsniff
-net/ntop
-news/slrn
 security/gnupg
-#print/lyx
-#net/scapy
-graphics/ImageMagick
-audio/abcde
-mail/mozilla-thunderbird
-graphics/gimp/stable
-misc/xcdroast
-misc/magicpoint
-audio/xmms
-audio/xmms,-mp3
-audio/xmms,-vorbis
-graphics/jhead
-#graphics/gphoto2
-#x11/blackbox
-#x11/icewm
-#x11/rdesktop
-#textproc/ispell
-#textproc/ispell,-french
-#textproc/ispell,-spanish
-#net/unbound
-#net/ldns/libldns
-x11/spectrwm
-#fonts/terminus-font
-#fonts/liberation-fonts
-#math/moo
-net/ipcalc
-net/ladvd
-#sysutils/pkg_mgr
-math/gnuplot
-#games/crack-attack
-#emulators/qemu
-databases/sqlitebrowser
-#print/cups
-#x11/tk/8.5
-#lang/ruby/1.8
-#lang/gfortran
-#devel/git
-devel/subversion
-net/openvpn
-#net/rtorrent
-#www/lighttpd
diff --git a/infrastructure/plist/hppa b/infrastructure/plist/hppa
new file mode 100644
index 00000000000..85d95c24840
--- /dev/null
+++ b/infrastructure/plist/hppa
@@ -0,0 +1,9 @@
+# $OpenBSD: hppa,v 1.1 2013/08/15 15:09:18 naddy Exp $
+# This is the master list of subdirs used to choose hppa packages.
+# Use with ${PORTSDIR}/infrastructure/package/check-plist
+# to create actual SUBDIRLIST to pass to ports main Makefile.
+net/rsync
+archivers/bzip2
+archivers/unzip
+archivers/xz
+security/gnupg
diff --git a/infrastructure/plist/i386 b/infrastructure/plist/i386
index 5d197afbf6a..d3f620493cb 100644
--- a/infrastructure/plist/i386
+++ b/infrastructure/plist/i386
@@ -1,130 +1,9 @@
-# $OpenBSD: i386,v 1.56 2013/04/02 14:27:59 naddy Exp $
+# $OpenBSD: i386,v 1.57 2013/08/15 15:09:18 naddy 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.
 net/rsync
-net/cvsync
-editors/vim,no_x11
-editors/emacs21
-editors/emacs21,-leim
-archivers/unzip
 archivers/bzip2
+archivers/unzip
 archivers/xz
-#print/texlive/base
-net/nmap
-sysutils/cdrtools
-sysutils/dvd+rw-tools
-mail/procmail
-mail/fetchmail
-net/samba
-shells/zsh
-shells/bash
-shells/tcsh
-#devel/autoconf/2.62
-#devel/automake/1.9
-#devel/metaauto
-#devel/libtool
-#books/autobook
-devel/bison
-sysutils/colorls
-archivers/gtar
-mail/mutt/stable
-audio/vorbis-tools
-audio/mpg123
-net/curl
-net/wget
-print/ghostscript/gnu
-print/gv
-audio/cdparanoia
-net/ircII
-www/mozilla-firefox
-#textproc/xpdf
-#x11/kde/base3
-#x11/kde/office3
-#x11/kde/edu3
-#x11/kde/games3
-#graphics/digikam
-x11/windowmaker
-x11/windowmaker-extra
-www/tidyp
-#editors/nedit
-databases/openldap,-server
-x11/xpostit
-#x11/xdaliclock
-x11/xkeycaps
-audio/mp3cddb
-editors/nano
-textproc/antiword
-#editors/ted
-lang/python/2.7
-lang/python/2.7,-tools
-www/mod_perl
-games/xkobo,harder
-x11/p5-Tk
-x11/xglobe
-www/links
-graphics/gpicview
-net/epic4
-net/irssi
-security/bsd-airtools
-editors/abiword
-archivers/zip
-#net/snort
-net/ettercap
-security/stunnel
-net/silc-client
-#graphics/xfig
-x11/xautolock
-#mail/sylpheed
-net/pidgin
-security/pidgin-otr
-devel/gmake
-misc/tpwireless
-sysutils/tphdisk
-www/squid
-security/aide
-security/dsniff
-net/ntop
-news/slrn
 security/gnupg
-#print/lyx
-#net/scapy
-graphics/ImageMagick
-audio/abcde
-mail/mozilla-thunderbird
-graphics/gimp/stable
-misc/xcdroast
-misc/magicpoint
-audio/xmms
-audio/xmms,-mp3
-audio/xmms,-vorbis
-graphics/jhead
-graphics/gphoto2
-x11/blackbox
-#x11/icewm
-x11/rdesktop
-textproc/ispell
-#textproc/ispell,-french
-#textproc/ispell,-spanish
-net/unbound
-net/ldns/libldns
-x11/spectrwm
-#fonts/terminus-font
-#fonts/liberation-fonts
-#math/moo
-net/ipcalc
-net/ladvd
-#sysutils/pkg_mgr
-math/gnuplot
-#games/crack-attack
-#emulators/qemu
-databases/sqlitebrowser
-#print/cups
-x11/tk/8.5
-#lang/ruby/1.8
-#lang/gfortran
-devel/git
-devel/subversion
-net/openvpn
-#net/rtorrent
-#www/lighttpd
diff --git a/infrastructure/plist/mips64el b/infrastructure/plist/mips64el
index 1be653d32e1..87479e655d5 100644
--- a/infrastructure/plist/mips64el
+++ b/infrastructure/plist/mips64el
@@ -1,41 +1,7 @@
-# $OpenBSD: mips64el,v 1.2 2012/04/26 19:18:50 jasper Exp $
+# $OpenBSD: mips64el,v 1.3 2013/08/15 15:09:18 naddy Exp $
 # This is the master list of subdirs used to choose mips64el packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
-databases/pkglocatedb
-net/cvsync
-net/curl
-net/irssi
-net/irssi-icb
 net/rsync
-net/wget
-#editors/emacs21,no_x11
-#editors/emacs22,no_x11
-editors/nano
-editors/nedit
-editors/vim,no_x11
-graphics/feh
-graphics/xv
-misc/screen
 archivers/bzip2
 archivers/unzip
-archivers/zip
-x11/wmi
-x11/xautolock
-www/elinks
-www/links+
-www/links+,no_x11
-games/xbomber
-shells/zsh
-shells/bash
-shells/tcsh
-sysutils/colorls
-sysutils/e2fsprogs
-sysutils/ncdu
-archivers/gtar
-audio/mpc
-audio/ncmpc
-mail/fetchmail
-mail/procmail
-lang/lua
-productivity/calcurse
diff --git a/infrastructure/plist/powerpc b/infrastructure/plist/powerpc
new file mode 100644
index 00000000000..dfebebc2cdb
--- /dev/null
+++ b/infrastructure/plist/powerpc
@@ -0,0 +1,9 @@
+# $OpenBSD: powerpc,v 1.40 2013/08/15 15:09:18 naddy 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.
+net/rsync
+archivers/bzip2
+archivers/unzip
+archivers/xz
+security/gnupg
diff --git a/infrastructure/plist/sparc b/infrastructure/plist/sparc
index 44c8e031280..3665582880d 100644
--- a/infrastructure/plist/sparc
+++ b/infrastructure/plist/sparc
@@ -1,12 +1,7 @@
-# $OpenBSD: sparc,v 1.25 2010/01/09 02:48:04 sthen Exp $
+# $OpenBSD: sparc,v 1.26 2013/08/15 15:09:18 naddy Exp $
 # This is the master list of subdirs used to choose sparc packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
-databases/pkglocatedb
 net/rsync
-#textproc/gdiff
-#editors/vim,no_x11 XXX
-editors/emacs21
-misc/screen
-#archivers/unzip
-#archivers/bzip2
+archivers/bzip2
+archivers/unzip
diff --git a/infrastructure/plist/sparc64 b/infrastructure/plist/sparc64
index cdff4b9c4ff..84a15c19e3f 100644
--- a/infrastructure/plist/sparc64
+++ b/infrastructure/plist/sparc64
@@ -1,130 +1,7 @@
-# $OpenBSD: sparc64,v 1.44 2013/04/02 14:27:59 naddy Exp $
+# $OpenBSD: sparc64,v 1.45 2013/08/15 15:09:18 naddy Exp $
 # This is the master list of subdirs used to choose sparc64 packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
 net/rsync
-#net/cvsync
-editors/vim,no_x11
-editors/emacs21
-#editors/emacs21,-leim
-archivers/unzip
 archivers/bzip2
-archivers/xz
-#print/texlive/base
-#net/nmap
-sysutils/cdrtools
-#sysutils/dvd+rw-tools
-mail/procmail
-mail/fetchmail
-net/samba
-shells/zsh
-shells/bash
-shells/tcsh
-#devel/autoconf/2.62
-#devel/automake/1.9
-#devel/metaauto
-#devel/libtool
-#books/autobook
-#devel/bison
-sysutils/colorls
-#archivers/gtar
-mail/mutt/stable
-#audio/vorbis-tools
-audio/mpg123
-net/curl
-net/wget
-#print/ghostscript/gnu
-#print/gv
-#audio/cdparanoia
-net/ircII
-#!www/mozilla-firefox
-#textproc/xpdf
-#x11/kde/base3
-#x11/kde/office3
-#x11/kde/edu3
-#x11/kde/games3
-#graphics/digikam
-#x11/windowmaker
-#x11/windowmaker-extra
-www/tidyp
-#editors/nedit
-#databases/openldap,-server
-x11/xpostit
-#x11/xdaliclock
-x11/xkeycaps
-#audio/mp3cddb
-editors/nano
-textproc/antiword
-#editors/ted
-lang/python/2.7
-lang/python/2.7,-tools
-www/mod_perl
-#games/xkobo,harder
-#x11/p5-Tk
-#x11/xglobe
-#www/links
-graphics/gpicview
-#net/epic4
-#net/irssi
-#security/bsd-airtools
-#editors/abiword
-archivers/zip
-#net/snort
-net/ettercap
-security/stunnel
-net/silc-client
-#graphics/xfig
-x11/xautolock
-#mail/sylpheed
-#net/pidgin
-#security/pidgin-otr
-#devel/gmake
-#!misc/tpwireless
-#!sysutils/tphdisk
-#www/squid
-#security/aide
-#security/dsniff
-#net/ntop
-#news/slrn
-#security/gnupg
-#print/lyx
-#net/scapy
-#graphics/ImageMagick
-#audio/abcde
-#mail/mozilla-thunderbird
-#graphics/gimp/stable
-#misc/xcdroast
-#misc/magicpoint
-#audio/xmms
-#audio/xmms,-mp3
-#audio/xmms,-vorbis
-#graphics/jhead
-#graphics/gphoto2
-#x11/blackbox
-#x11/icewm
-#x11/rdesktop
-#textproc/ispell
-#textproc/ispell,-french
-#textproc/ispell,-spanish
-net/unbound
-net/ldns/libldns
-#x11/spectrwm
-#fonts/terminus-font
-#fonts/liberation-fonts
-#math/moo
-#net/ipcalc
-#net/ladvd
-#sysutils/pkg_mgr
-#math/gnuplot
-#games/crack-attack
-#emulators/qemu
-#databases/sqlitebrowser
-#print/cups
-#x11/tk/8.5
-#lang/ruby/1.8
-#lang/gfortran
-#devel/git
-#devel/subversion
-#net/openvpn
-#net/rtorrent
-#www/lighttpd
+archivers/unzip
diff --git a/infrastructure/plist/vax b/infrastructure/plist/vax
index 9e516c76f04..7ab095da604 100644
--- a/infrastructure/plist/vax
+++ b/infrastructure/plist/vax
@@ -1,69 +1,7 @@
-# $OpenBSD: vax,v 1.21 2010/09/20 07:56:27 sthen Exp $
+# $OpenBSD: vax,v 1.22 2013/08/15 15:09:18 naddy Exp $
 # This is the master list of subdirs used to choose vax packages.
 # Use with ${PORTSDIR}/infrastructure/package/check-plist
 # to create actual SUBDIRLIST to pass to ports main Makefile.
-databases/pkglocatedb
 net/rsync
-net/cvsync
-editors/vim,no_x11
-editors/emacs21
-archivers/unzip
 archivers/bzip2
-print/texlive/base
-mail/procmail
-mail/fetchmail
-misc/screen
-graphics/gif2png
-shells/zsh
-#shells/bash
-shells/tcsh
-shells/zoidberg
-devel/autoconf/2.59
-devel/automake
-books/autobook
-#devel/bison
-sysutils/colorls
-archivers/gtar
-mail/mutt/stable
-audio/libao
-#audio/vorbis-tools
-#net/curl
-#net/wget
-#print/ghostscript/gnu
-#audio/cdparanoia
-net/ircII
-devel/perltidy
-editors/nedit
-x11/xpostit
-audio/p5-cddb
-editors/nano
-textproc/antiword
-games/xkobo,harder
-games/xlife
-graphics/mpeg_play
-benchmarks/tcpblast
-net/epic4
-sysutils/pftop
-archivers/zip
-security/stunnel
-#net/silc-client
-#graphics/xfig
-x11/xautolock
-devel/gmake
-www/transproxy
-#news/slrn
-#security/gnupg
-#misc/magicpoint
-graphics/jhead
-sysutils/autossh
-archivers/xz
-audio/mpc
-www/elinks
-x11/wmi
-www/links+,no_x11
-audio/madplay
-sysutils/monit
-mail/msmtp
-www/privoxy
-www/nostromo
-graphics/xv
+archivers/unzip