diff --git a/audio/faad/pkg/PFRAG.shared b/audio/faad/pkg/PFRAG.shared
index 4b67d464c0c..bd37f0c58d0 100644
--- a/audio/faad/pkg/PFRAG.shared
+++ b/audio/faad/pkg/PFRAG.shared
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2004/04/28 01:30:00 jolan Exp $
-lib/libfaad.so.0.0
-lib/libmp4ff.so.0.0
-lib/libmp4v2.so.0.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 00:52:44 espie Exp $
+@lib lib/libfaad.so.0.0
+@lib lib/libmp4ff.so.0.0
+@lib lib/libmp4v2.so.0.0
diff --git a/databases/mysql/pkg/PFRAG.shared b/databases/mysql/pkg/PFRAG.shared
index d3658059200..25a2f94ebd0 100644
--- a/databases/mysql/pkg/PFRAG.shared
+++ b/databases/mysql/pkg/PFRAG.shared
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2003/12/30 05:57:30 brad Exp $
-lib/libmysqlclient.so.12.0
-lib/libmysqlclient_r.so.12.0
-lib/mysql/libmysqlclient.so.12.0
-lib/mysql/libmysqlclient_r.so.12.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.7 2004/08/10 00:52:43 espie Exp $
+@lib lib/libmysqlclient.so.12.0
+@lib lib/libmysqlclient_r.so.12.0
+@lib lib/mysql/libmysqlclient.so.12.0
+@lib lib/mysql/libmysqlclient_r.so.12.0
diff --git a/databases/mysql/pkg/PLIST b/databases/mysql/pkg/PLIST
index 3437a9503c4..59a4ca08351 100644
--- a/databases/mysql/pkg/PLIST
+++ b/databases/mysql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.24 2003/12/30 20:07:27 brad Exp $
+@comment $OpenBSD: PLIST,v 1.25 2004/08/10 00:52:43 espie Exp $
 bin/mysql
 bin/mysql_config
 bin/mysqladmin
@@ -11,6 +11,7 @@ bin/mysqlmanager-pwgen
 bin/mysqlmanagerc
 bin/mysqlshow
 bin/mysqltest
+include/mysql/
 include/mysql/errmsg.h
 include/mysql/m_ctype.h
 include/mysql/m_string.h
@@ -35,14 +36,13 @@ include/mysql/raid.h
 include/mysql/sslopt-case.h
 include/mysql/sslopt-longopts.h
 include/mysql/sslopt-vars.h
+lib/mysql/
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.la
+@man man/man1/mysql.1
+@man man/man1/mysqladmin.1
+@man man/man1/mysqldump.1
+@man man/man1/mysqlshow.1
 %%SHARED%%
-man/man1/mysql.1
-man/man1/mysqladmin.1
-man/man1/mysqldump.1
-man/man1/mysqlshow.1
-@dirrm lib/mysql
-@dirrm include/mysql
diff --git a/databases/mysql/pkg/PLIST-server b/databases/mysql/pkg/PLIST-server
index 309656fa57c..702b615f33c 100644
--- a/databases/mysql/pkg/PLIST-server
+++ b/databases/mysql/pkg/PLIST-server
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.12 2004/05/16 04:30:39 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.13 2004/08/10 00:52:43 espie Exp $
 bin/comp_err
 bin/isamchk
 bin/isamlog
@@ -42,16 +42,18 @@ lib/mysql/libmysys.a
 lib/mysql/libnisam.a
 lib/mysql/libvio.a
 libexec/mysqld
-man/man1/isamchk.1
-man/man1/isamlog.1
-man/man1/mysql_fix_privilege_tables.1
-man/man1/mysql_zap.1
-man/man1/mysqlaccess.1
-man/man1/mysqld.1
-man/man1/mysqld_multi.1
-man/man1/mysqld_safe.1
-man/man1/perror.1
-man/man1/replace.1
+@man man/man1/isamchk.1
+@man man/man1/isamlog.1
+@man man/man1/mysql_fix_privilege_tables.1
+@man man/man1/mysql_zap.1
+@man man/man1/mysqlaccess.1
+@man man/man1/mysqld.1
+@man man/man1/mysqld_multi.1
+@man man/man1/mysqld_safe.1
+@man man/man1/perror.1
+@man man/man1/replace.1
+share/doc/mysql/
+share/doc/mysql/Flags/
 share/doc/mysql/Flags/argentina.gif
 share/doc/mysql/Flags/armenia.gif
 share/doc/mysql/Flags/australia.gif
@@ -105,11 +107,13 @@ share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
+share/mysql/
 @comment share/mysql/Description.plist
 @comment share/mysql/Info.plist
 @comment share/mysql/MySQL-shared-compat.spec
 @comment share/mysql/StartupParameters.plist
 share/mysql/binary-configure
+share/mysql/charsets/
 share/mysql/charsets/Index
 share/mysql/charsets/README
 share/mysql/charsets/cp1251.conf
@@ -134,28 +138,40 @@ share/mysql/charsets/usa7.conf
 share/mysql/charsets/win1250.conf
 share/mysql/charsets/win1251.conf
 share/mysql/charsets/win1251ukr.conf
+share/mysql/czech/
 share/mysql/czech/errmsg.sys
 share/mysql/czech/errmsg.txt
+share/mysql/danish/
 share/mysql/danish/errmsg.sys
 share/mysql/danish/errmsg.txt
+share/mysql/dutch/
 share/mysql/dutch/errmsg.sys
 share/mysql/dutch/errmsg.txt
+share/mysql/english/
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
+share/mysql/estonian/
 share/mysql/estonian/errmsg.sys
 share/mysql/estonian/errmsg.txt
+share/mysql/french/
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
+share/mysql/german/
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
+share/mysql/greek/
 share/mysql/greek/errmsg.sys
 share/mysql/greek/errmsg.txt
+share/mysql/hungarian/
 share/mysql/hungarian/errmsg.sys
 share/mysql/hungarian/errmsg.txt
+share/mysql/italian/
 share/mysql/italian/errmsg.sys
 share/mysql/italian/errmsg.txt
+share/mysql/japanese/
 share/mysql/japanese/errmsg.sys
 share/mysql/japanese/errmsg.txt
+share/mysql/korean/
 share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
 @comment share/mysql/make_binary_distribution
@@ -169,54 +185,38 @@ share/mysql/my-small.cnf
 share/mysql/mysql-${VERSION}.spec
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
+share/mysql/norwegian/
+share/mysql/norwegian-ny/
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
 share/mysql/norwegian/errmsg.sys
 share/mysql/norwegian/errmsg.txt
+share/mysql/polish/
 share/mysql/polish/errmsg.sys
 share/mysql/polish/errmsg.txt
+share/mysql/portuguese/
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
 @comment share/mysql/postinstall
 @comment share/mysql/preinstall
+share/mysql/romanian/
 share/mysql/romanian/errmsg.sys
 share/mysql/romanian/errmsg.txt
+share/mysql/russian/
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/slovak/
 share/mysql/slovak/errmsg.sys
 share/mysql/slovak/errmsg.txt
+share/mysql/spanish/
 share/mysql/spanish/errmsg.sys
 share/mysql/spanish/errmsg.txt
+share/mysql/swedish/
 share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
+share/mysql/ukrainian/
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
-@dirrm share/mysql/ukrainian
-@dirrm share/mysql/swedish
-@dirrm share/mysql/spanish
-@dirrm share/mysql/slovak
-@dirrm share/mysql/russian
-@dirrm share/mysql/romanian
-@dirrm share/mysql/portuguese
-@dirrm share/mysql/polish
-@dirrm share/mysql/norwegian-ny
-@dirrm share/mysql/norwegian
-@dirrm share/mysql/korean
-@dirrm share/mysql/japanese
-@dirrm share/mysql/italian
-@dirrm share/mysql/hungarian
-@dirrm share/mysql/greek
-@dirrm share/mysql/german
-@dirrm share/mysql/french
-@dirrm share/mysql/estonian
-@dirrm share/mysql/english
-@dirrm share/mysql/dutch
-@dirrm share/mysql/danish
-@dirrm share/mysql/czech
-@dirrm share/mysql/charsets
-@dirrm share/mysql
-@dirrm share/doc/mysql/Flags
-@dirrm share/doc/mysql
 @extraunexec userdel _mysql
 @extraunexec groupdel _mysql
 @extraunexec rm -rf ${DB_DIR}
diff --git a/databases/mysql/pkg/PLIST-tests b/databases/mysql/pkg/PLIST-tests
index 2c0408ebe83..3ba703e083a 100644
--- a/databases/mysql/pkg/PLIST-tests
+++ b/databases/mysql/pkg/PLIST-tests
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-tests,v 1.9 2004/05/22 11:39:10 brad Exp $
+@comment $OpenBSD: PLIST-tests,v 1.10 2004/08/10 00:52:43 espie Exp $
+share/mysql-test/
 share/mysql-test/README
+share/mysql-test/include/
 share/mysql-test/include/check_var_limit.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_crypt.inc
@@ -13,6 +15,7 @@ share/mysql-test/include/not_embedded.inc
 share/mysql-test/include/system_db_struct.inc
 share/mysql-test/install_test_db
 share/mysql-test/mysql-test-run
+share/mysql-test/r/
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
@@ -103,6 +106,7 @@ share/mysql-test/r/have_symlink.require
 share/mysql-test/r/having.result
 share/mysql-test/r/heap.result
 share/mysql-test/r/innodb-deadlock.result
+share/mysql-test/r/innodb-lock.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_handler.result
@@ -249,6 +253,7 @@ share/mysql-test/r/user_var.result
 share/mysql-test/r/varbinary.result
 share/mysql-test/r/variables.result
 share/mysql-test/r/warnings.result
+share/mysql-test/std_data/
 share/mysql-test/std_data/des_key_file
 share/mysql-test/std_data/init_file.dat
 share/mysql-test/std_data/loaddata1.dat
@@ -258,6 +263,7 @@ share/mysql-test/std_data/loaddata4.dat
 share/mysql-test/std_data/rpl_loaddata.dat
 share/mysql-test/std_data/rpl_loaddata2.dat
 share/mysql-test/std_data/words.dat
+share/mysql-test/t/
 share/mysql-test/t/alias.test
 share/mysql-test/t/alter_table.test
 share/mysql-test/t/analyse.test
@@ -350,6 +356,7 @@ share/mysql-test/t/heap.test
 share/mysql-test/t/init_file-master.opt
 share/mysql-test/t/init_file.test
 share/mysql-test/t/innodb-deadlock.test
+share/mysql-test/t/innodb-lock.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
@@ -530,8 +537,3 @@ share/mysql-test/t/varbinary.test
 share/mysql-test/t/variables-master.opt
 share/mysql-test/t/variables.test
 share/mysql-test/t/warnings.test
-@dirrm share/mysql-test/t
-@dirrm share/mysql-test/std_data
-@dirrm share/mysql-test/r
-@dirrm share/mysql-test/include
-@dirrm share/mysql-test
diff --git a/devel/binutils/stable/pkg/PFRAG.alpha b/devel/binutils/stable/pkg/PFRAG.alpha
index b16a82b8534..166a27e6266 100644
--- a/devel/binutils/stable/pkg/PFRAG.alpha
+++ b/devel/binutils/stable/pkg/PFRAG.alpha
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.alpha,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.alpha,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64alpha_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.amd64 b/devel/binutils/stable/pkg/PFRAG.amd64
index 33bec1d191b..8bd025a939a 100644
--- a/devel/binutils/stable/pkg/PFRAG.amd64
+++ b/devel/binutils/stable/pkg/PFRAG.amd64
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.amd64,v 1.1 2004/03/01 00:10:38 brad Exp $
+@comment $OpenBSD: PFRAG.amd64,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xc
@@ -17,4 +18,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_x86_64_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_x86_64_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_x86_64_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_x86_64_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.arm b/devel/binutils/stable/pkg/PFRAG.arm
index 1d9712059f3..ce5fe50c107 100644
--- a/devel/binutils/stable/pkg/PFRAG.arm
+++ b/devel/binutils/stable/pkg/PFRAG.arm
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.arm,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.arm,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelf_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelf_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelf_obsd.xc
@@ -17,4 +18,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelfb_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelfb_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelfb_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/armelfb_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.hppa b/devel/binutils/stable/pkg/PFRAG.hppa
index f751d287c8f..cc78ae199fd 100644
--- a/devel/binutils/stable/pkg/PFRAG.hppa
+++ b/devel/binutils/stable/pkg/PFRAG.hppa
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.hppa,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.hppa,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/hppaobsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.i386 b/devel/binutils/stable/pkg/PFRAG.i386
index a617fdd3b50..1415a3b099b 100644
--- a/devel/binutils/stable/pkg/PFRAG.i386
+++ b/devel/binutils/stable/pkg/PFRAG.i386
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.i386,v 1.1 2003/10/11 00:55:25 brad Exp $
+@comment $OpenBSD: PFRAG.i386,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf_i386_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.powerpc b/devel/binutils/stable/pkg/PFRAG.powerpc
index 339d2fdf8ab..1eee12a2498 100644
--- a/devel/binutils/stable/pkg/PFRAG.powerpc
+++ b/devel/binutils/stable/pkg/PFRAG.powerpc
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.powerpc,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.powerpc,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32ppc_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.sparc b/devel/binutils/stable/pkg/PFRAG.sparc
index 630e95be994..32223ac43ff 100644
--- a/devel/binutils/stable/pkg/PFRAG.sparc
+++ b/devel/binutils/stable/pkg/PFRAG.sparc
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.sparc,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.sparc,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf32_sparc_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PFRAG.sparc64 b/devel/binutils/stable/pkg/PFRAG.sparc64
index a97e1d7cb01..67379cb7c2c 100644
--- a/devel/binutils/stable/pkg/PFRAG.sparc64
+++ b/devel/binutils/stable/pkg/PFRAG.sparc64
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.sparc64,v 1.1 2003/10/11 00:52:22 brad Exp $
+@comment $OpenBSD: PFRAG.sparc64,v 1.2 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.x
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xbn
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xc
@@ -8,4 +9,3 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xs
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xsc
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xu
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts/elf64_sparc_obsd.xz
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/ldscripts
diff --git a/devel/binutils/stable/pkg/PLIST b/devel/binutils/stable/pkg/PLIST
index 63d2e8c5418..674cb2f4d12 100644
--- a/devel/binutils/stable/pkg/PLIST
+++ b/devel/binutils/stable/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/02/10 22:49:36 brad Exp $
+@comment $OpenBSD: PLIST,v 1.7 2004/08/10 00:52:44 espie Exp $
+${TARGET_ARCH}-unknown-openbsd${OSREV}/
+${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/addr2line
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/ar
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/as
@@ -11,21 +13,19 @@ ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/readelf
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/size
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/strings
 ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/strip
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/addr2line.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ar.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/as.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ld.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/nm.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/objcopy.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/objdump.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ranlib.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/readelf.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/size.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strings.1
-${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strip.1
+${TARGET_ARCH}-unknown-openbsd${OSREV}/lib/
+${TARGET_ARCH}-unknown-openbsd${OSREV}/man/
+${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/addr2line.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ar.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/as.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ld.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/nm.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/objcopy.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/objdump.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ranlib.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/readelf.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/size.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strings.1
+@man ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strip.1
 %%arch%%
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/man
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/lib
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin
-@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}
diff --git a/devel/boehm-gc/pkg/PFRAG.shared b/devel/boehm-gc/pkg/PFRAG.shared
index b28ffae9f22..853ccff2af2 100644
--- a/devel/boehm-gc/pkg/PFRAG.shared
+++ b/devel/boehm-gc/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2003/10/15 12:58:11 todd Exp $
-lib/libgc.so.1.2
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 00:52:44 espie Exp $
+@lib lib/libgc.so.1.2
diff --git a/devel/boehm-gc/pkg/PLIST b/devel/boehm-gc/pkg/PLIST
index 499a57a5dec..ce9be8bff0d 100644
--- a/devel/boehm-gc/pkg/PLIST
+++ b/devel/boehm-gc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/07/23 13:11:58 todd Exp $
+@comment $OpenBSD: PLIST,v 1.9 2004/08/10 00:52:44 espie Exp $
 include/gc/
 include/gc.h
 include/gc/gc.h
@@ -35,7 +35,7 @@ include/private/gc_priv.h
 include/private/gcconfig.h
 lib/libgc.a
 lib/libgc.la
-man/man3/gc.3
+@man man/man3/gc.3
 share/gc/
 share/gc/README
 share/gc/README.DGUX386
diff --git a/devel/gputils/pkg/PLIST b/devel/gputils/pkg/PLIST
index aa3724513ef..50847d3fe5a 100644
--- a/devel/gputils/pkg/PLIST
+++ b/devel/gputils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/01/30 01:01:11 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/10 00:52:44 espie Exp $
 bin/gpal
 bin/gpasm
 bin/gpdasm
@@ -6,17 +6,20 @@ bin/gplib
 bin/gplink
 bin/gpvc
 bin/gpvo
-man/man1/gpal.1
-man/man1/gpasm.1
-man/man1/gpdasm.1
-man/man1/gplib.1
-man/man1/gplink.1
-man/man1/gputils.1
-man/man1/gpvc.1
-man/man1/gpvo.1
+@man man/man1/gpal.1
+@man man/man1/gpasm.1
+@man man/man1/gpdasm.1
+@man man/man1/gplib.1
+@man man/man1/gplink.1
+@man man/man1/gputils.1
+@man man/man1/gpvc.1
+@man man/man1/gpvo.1
+share/doc/gputils/
 share/doc/gputils/gputils.lyx
 share/doc/gputils/gputils.pdf
 share/doc/gputils/gputils.ps
+share/gputils/
+share/gputils/header/
 share/gputils/header/mcp250xx.inc
 share/gputils/header/memory.inc
 share/gputils/header/migrate.inc
@@ -210,6 +213,7 @@ share/gputils/header/rf509ag.inc
 share/gputils/header/rf675f.inc
 share/gputils/header/rf675h.inc
 share/gputils/header/rf675k.inc
+share/gputils/lkr/
 share/gputils/lkr/12c508.lkr
 share/gputils/lkr/12c508a.lkr
 share/gputils/lkr/12c509.lkr
@@ -502,7 +506,3 @@ share/gputils/lkr/rf675h.lkr
 share/gputils/lkr/rf675hi.lkr
 share/gputils/lkr/rf675k.lkr
 share/gputils/lkr/rf675ki.lkr
-@dirrm share/gputils/lkr
-@dirrm share/gputils/header
-@dirrm share/gputils
-@dirrm share/doc/gputils
diff --git a/devel/guilib/pkg/PFRAG.shared b/devel/guilib/pkg/PFRAG.shared
index 2d34d095451..e2f9b652373 100644
--- a/devel/guilib/pkg/PFRAG.shared
+++ b/devel/guilib/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2002/09/03 04:20:28 mark Exp $
-lib/libGUI.so.0.1
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 00:52:44 espie Exp $
+@lib lib/libGUI.so.0.1
diff --git a/devel/guilib/pkg/PLIST b/devel/guilib/pkg/PLIST
index 15252f45965..dde28223821 100644
--- a/devel/guilib/pkg/PLIST
+++ b/devel/guilib/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/09/03 04:20:28 mark Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/08/10 00:52:44 espie Exp $
+include/GUI/
 include/GUI/GUI.h
 include/GUI/GUI_C.h
 include/GUI/GUI_area.h
@@ -16,4 +17,3 @@ include/GUI/GUI_widgets.h
 lib/libGUI.a
 lib/libGUI.la
 %%SHARED%%
-@dirrm include/GUI
diff --git a/devel/libdvdplay/pkg/PFRAG.shared b/devel/libdvdplay/pkg/PFRAG.shared
index cc63c0536a5..2b00095215d 100644
--- a/devel/libdvdplay/pkg/PFRAG.shared
+++ b/devel/libdvdplay/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/04/21 15:00:41 sturm Exp $
-lib/libdvdplay.so.0.1
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/10 00:52:44 espie Exp $
+@lib lib/libdvdplay.so.0.1
diff --git a/devel/libdvdplay/pkg/PLIST b/devel/libdvdplay/pkg/PLIST
index 86409139d2c..f054766cd7f 100644
--- a/devel/libdvdplay/pkg/PLIST
+++ b/devel/libdvdplay/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/04/21 15:00:41 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/08/10 00:52:44 espie Exp $
+include/dvdplay/
 include/dvdplay/dvdplay.h
 include/dvdplay/info.h
 include/dvdplay/nav.h
@@ -6,4 +7,3 @@ include/dvdplay/state.h
 lib/libdvdplay.a
 lib/libdvdplay.la
 %%SHARED%%
-@dirrm include/dvdplay
diff --git a/devel/libdvdread/pkg/PFRAG.shared b/devel/libdvdread/pkg/PFRAG.shared
index f65d527b5c5..f21639edd1e 100644
--- a/devel/libdvdread/pkg/PFRAG.shared
+++ b/devel/libdvdread/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/02/24 22:54:03 espie Exp $
-lib/libdvdread.so.3.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 00:52:44 espie Exp $
+@lib lib/libdvdread.so.3.0
diff --git a/devel/libdvdread/pkg/PLIST b/devel/libdvdread/pkg/PLIST
index 9c54f8c3de7..64ed82b9f1c 100644
--- a/devel/libdvdread/pkg/PLIST
+++ b/devel/libdvdread/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/02/24 22:54:03 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/10 00:52:44 espie Exp $
+include/dvdread/
 include/dvdread/dvd_reader.h
 include/dvdread/ifo_print.h
 include/dvdread/ifo_read.h
@@ -9,4 +10,3 @@ include/dvdread/nav_types.h
 lib/libdvdread.a
 lib/libdvdread.la
 %%SHARED%%
-@dirrm include/dvdread
diff --git a/devel/libslang/pkg/PFRAG.shared b/devel/libslang/pkg/PFRAG.shared
index f92680a0795..8a970de78d0 100644
--- a/devel/libslang/pkg/PFRAG.shared
+++ b/devel/libslang/pkg/PFRAG.shared
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2004/01/11 07:05:31 brad Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.10 2004/08/10 00:52:44 espie Exp $
 @comment lib/libslang.so
 @comment lib/libslang.so.14
-lib/libslang.so.14.9
-DYNLIBDIR(%D/lib)
+@lib lib/libslang.so.14.9
diff --git a/devel/libslang/pkg/PLIST b/devel/libslang/pkg/PLIST
index 721cd91f3dc..0df29ceca30 100644
--- a/devel/libslang/pkg/PLIST
+++ b/devel/libslang/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.12 2001/02/08 02:05:36 brad Exp $
+@comment $OpenBSD: PLIST,v 1.13 2004/08/10 00:52:44 espie Exp $
 include/slang.h
 include/slcurses.h
 lib/libslang.a
-%%SHARED%%
+share/doc/slang/
 share/doc/slang/COPYING
 share/doc/slang/COPYING.ART
 share/doc/slang/COPYING.GPL
@@ -13,4 +13,4 @@ share/doc/slang/cslang.txt
 share/doc/slang/slang.txt
 share/doc/slang/slangdoc.html
 share/doc/slang/slangfun.txt
-@dirrm share/doc/slang
+%%SHARED%%
diff --git a/devel/mico/pkg/PFRAG.shared b/devel/mico/pkg/PFRAG.shared
index 88ee9b39e14..3463883dc26 100644
--- a/devel/mico/pkg/PFRAG.shared
+++ b/devel/mico/pkg/PFRAG.shared
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/11/10 16:56:33 shell Exp $
-lib/libmico2.3.6.so.1.0
-lib/libmicoaux2.3.6.so.1.0
-lib/libmicocoss2.3.6.so.1.0
-lib/libmicoir2.3.6.so.1.0
-lib/libmicox2.3.6.so.1.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 00:52:44 espie Exp $
+@lib lib/libmico2.3.6.so.1.0
+@lib lib/libmicoaux2.3.6.so.1.0
+@lib lib/libmicocoss2.3.6.so.1.0
+@lib lib/libmicoir2.3.6.so.1.0
+@lib lib/libmicox2.3.6.so.1.0
diff --git a/devel/mico/pkg/PLIST b/devel/mico/pkg/PLIST
index 6962f9fd5cd..1c9dcdc4873 100644
--- a/devel/mico/pkg/PLIST
+++ b/devel/mico/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/03/31 00:53:58 margarida Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/10 00:52:44 espie Exp $
 bin/containmentd
 bin/eventd
 bin/idl
@@ -22,6 +22,7 @@ bin/traderd
 bin/traversald
 include/CORBA-SMALL.h
 include/CORBA.h
+include/mico/
 include/mico/CCM.h
 include/mico/CCM.idl
 include/mico/CCMContainer.h
@@ -214,6 +215,7 @@ include/mico/valuetype.idl
 include/mico/valuetype_impl.h
 include/mico/version.h
 include/mico/x11.h
+include/ministl/
 include/ministl/algo.h
 include/ministl/algorithm
 include/ministl/bool.h
@@ -241,41 +243,50 @@ lib/libmicoir2.3.6.a
 lib/libmicox2.3.6.a
 lib/mico-setup.csh
 lib/mico-setup.sh
-man/man1/idl.1
-man/man1/imr.1
-man/man1/ird.1
-man/man1/micod.1
-man/man1/nsadmin.1
-man/man1/nsd.1
-man/man5/micorc.5
+@man man/man1/idl.1
+@man man/man1/imr.1
+@man man/man1/ird.1
+@man man/man1/micod.1
+@man man/man1/nsadmin.1
+@man man/man1/nsd.1
+@man man/man5/micorc.5
+share/doc/mico/
+share/doc/mico/examples/
 share/doc/mico/examples/MakeVars
 share/doc/mico/examples/README
+share/doc/mico/examples/bench/
 share/doc/mico/examples/bench/Makefile
 share/doc/mico/examples/bench/bench
 share/doc/mico/examples/bench/bench.idl
 share/doc/mico/examples/bench/bench_impl.h
 share/doc/mico/examples/bench/client.cc
 share/doc/mico/examples/bench/server.cc
+share/doc/mico/examples/boa/
 share/doc/mico/examples/boa/Makefile
 share/doc/mico/examples/boa/README
+share/doc/mico/examples/boa/account/
 share/doc/mico/examples/boa/account/Makefile
 share/doc/mico/examples/boa/account/account.idl
 share/doc/mico/examples/boa/account/main.cc
+share/doc/mico/examples/boa/account2/
 share/doc/mico/examples/boa/account2/Makefile
 share/doc/mico/examples/boa/account2/account
 share/doc/mico/examples/boa/account2/account.idl
 share/doc/mico/examples/boa/account2/client.cc
 share/doc/mico/examples/boa/account2/server.cc
+share/doc/mico/examples/boa/account3/
 share/doc/mico/examples/boa/account3/Makefile
 share/doc/mico/examples/boa/account3/account
 share/doc/mico/examples/boa/account3/account.idl
 share/doc/mico/examples/boa/account3/client.cc
 share/doc/mico/examples/boa/account3/server.cc
+share/doc/mico/examples/boa/account4/
 share/doc/mico/examples/boa/account4/Makefile
 share/doc/mico/examples/boa/account4/account
 share/doc/mico/examples/boa/account4/account.idl
 share/doc/mico/examples/boa/account4/client.cc
 share/doc/mico/examples/boa/account4/server.cc
+share/doc/mico/examples/boa/activate//
 share/doc/mico/examples/boa/activate/Makefile
 share/doc/mico/examples/boa/activate/client.cc
 share/doc/mico/examples/boa/activate/hello-permethod
@@ -283,42 +294,52 @@ share/doc/mico/examples/boa/activate/hello-shared
 share/doc/mico/examples/boa/activate/hello-unshared
 share/doc/mico/examples/boa/activate/hello.idl
 share/doc/mico/examples/boa/activate/server.cc
+share/doc/mico/examples/codesets/
 share/doc/mico/examples/codesets/Makefile
 share/doc/mico/examples/codesets/client.cc
 share/doc/mico/examples/codesets/hello.idl
 share/doc/mico/examples/codesets/runit
 share/doc/mico/examples/codesets/server.cc
+share/doc/mico/examples/dispatcher/
 share/doc/mico/examples/dispatcher/Makefile
 share/doc/mico/examples/dispatcher/README
+share/doc/mico/examples/dispatcher/x11/
 share/doc/mico/examples/dispatcher/x11/Makefile
 share/doc/mico/examples/dispatcher/x11/client.cc
 share/doc/mico/examples/dispatcher/x11/hello.idl
 share/doc/mico/examples/dispatcher/x11/server.cc
 share/doc/mico/examples/dispatcher/x11/xhello
+share/doc/mico/examples/dynany/
 share/doc/mico/examples/dynany/Makefile
 share/doc/mico/examples/dynany/dynany.cc
 share/doc/mico/examples/dynany/dynanytest.cc
 share/doc/mico/examples/dynany/test.idl
+share/doc/mico/examples/externalization/
 share/doc/mico/examples/externalization/Makefile
 share/doc/mico/examples/externalization/client.cc
 share/doc/mico/examples/externalization/hello.idl
 share/doc/mico/examples/externalization/runit
 share/doc/mico/examples/externalization/server.cc
+share/doc/mico/examples/generic/
 share/doc/mico/examples/generic/Makefile
 share/doc/mico/examples/generic/client.cc
 share/doc/mico/examples/generic/run_test
 share/doc/mico/examples/generic/server.cc
 share/doc/mico/examples/generic/test.idl
 share/doc/mico/examples/generic/test_cases
+share/doc/mico/examples/henning/
 share/doc/mico/examples/henning/README
 share/doc/mico/examples/henning/diffs
+share/doc/mico/examples/interceptor/
 share/doc/mico/examples/interceptor/Makefile
 share/doc/mico/examples/interceptor/client.cc
 share/doc/mico/examples/interceptor/hello.idl
 share/doc/mico/examples/interceptor/runit
 share/doc/mico/examples/interceptor/server.cc
+share/doc/mico/examples/interop/
 share/doc/mico/examples/interop/Makefile
 share/doc/mico/examples/interop/README
+share/doc/mico/examples/interop/jacorb/
 share/doc/mico/examples/interop/jacorb/Account.idl
 share/doc/mico/examples/interop/jacorb/Client.java
 share/doc/mico/examples/interop/jacorb/ClientApplet.html.in
@@ -330,6 +351,7 @@ share/doc/mico/examples/interop/jacorb/account
 share/doc/mico/examples/interop/jacorb/client.cc
 share/doc/mico/examples/interop/jacorb/run_applet
 share/doc/mico/examples/interop/jacorb/server.cc
+share/doc/mico/examples/interop/jdk/
 share/doc/mico/examples/interop/jdk/Account.idl
 share/doc/mico/examples/interop/jdk/Client.java
 share/doc/mico/examples/interop/jdk/ClientApplet.html.in
@@ -339,10 +361,12 @@ share/doc/mico/examples/interop/jdk/README
 share/doc/mico/examples/interop/jdk/account
 share/doc/mico/examples/interop/jdk/main.cc
 share/doc/mico/examples/interop/jdk/run_applet
+share/doc/mico/examples/interop/orbix/
 share/doc/mico/examples/interop/orbix/Makefile
 share/doc/mico/examples/interop/orbix/README
 share/doc/mico/examples/interop/orbix/grid.idl
 share/doc/mico/examples/interop/orbix/main.cc
+share/doc/mico/examples/interop/visibroker/
 share/doc/mico/examples/interop/visibroker/Account.idl
 share/doc/mico/examples/interop/visibroker/Client.java
 share/doc/mico/examples/interop/visibroker/ClientApplet.html.in
@@ -352,18 +376,22 @@ share/doc/mico/examples/interop/visibroker/README
 share/doc/mico/examples/interop/visibroker/account
 share/doc/mico/examples/interop/visibroker/main.cc
 share/doc/mico/examples/interop/visibroker/run_applet
+share/doc/mico/examples/lifecycle/
 share/doc/mico/examples/lifecycle/Makefile
 share/doc/mico/examples/lifecycle/client.cc
 share/doc/mico/examples/lifecycle/hello.idl
 share/doc/mico/examples/lifecycle/runit
 share/doc/mico/examples/lifecycle/server.cc
+share/doc/mico/examples/mcast/
 share/doc/mico/examples/mcast/Makefile
 share/doc/mico/examples/mcast/client.cc
 share/doc/mico/examples/mcast/hello.idl
 share/doc/mico/examples/mcast/runit
 share/doc/mico/examples/mcast/server.cc
+share/doc/mico/examples/obv/
 share/doc/mico/examples/obv/Makefile
 share/doc/mico/examples/obv/README
+share/doc/mico/examples/obv/abstract/
 share/doc/mico/examples/obv/abstract/Makefile
 share/doc/mico/examples/obv/abstract/README
 share/doc/mico/examples/obv/abstract/abstract
@@ -371,6 +399,7 @@ share/doc/mico/examples/obv/abstract/abstract.idl
 share/doc/mico/examples/obv/abstract/abstract_impl.h
 share/doc/mico/examples/obv/abstract/client.cc
 share/doc/mico/examples/obv/abstract/server.cc
+share/doc/mico/examples/obv/custom/
 share/doc/mico/examples/obv/custom/Makefile
 share/doc/mico/examples/obv/custom/README
 share/doc/mico/examples/obv/custom/custom
@@ -378,6 +407,7 @@ share/doc/mico/examples/obv/custom/custom.idl
 share/doc/mico/examples/obv/custom/custom_impl.cc
 share/doc/mico/examples/obv/custom/custom_impl.h
 share/doc/mico/examples/obv/custom/test.cc
+share/doc/mico/examples/obv/date/
 share/doc/mico/examples/obv/date/Makefile
 share/doc/mico/examples/obv/date/calendar.idl
 share/doc/mico/examples/obv/date/client.cc
@@ -386,6 +416,7 @@ share/doc/mico/examples/obv/date/date.idl
 share/doc/mico/examples/obv/date/date_impl.cc
 share/doc/mico/examples/obv/date/date_impl.h
 share/doc/mico/examples/obv/date/server.cc
+share/doc/mico/examples/obv/tree/
 share/doc/mico/examples/obv/tree/Makefile
 share/doc/mico/examples/obv/tree/client.cc
 share/doc/mico/examples/obv/tree/server.cc
@@ -393,6 +424,7 @@ share/doc/mico/examples/obv/tree/tree
 share/doc/mico/examples/obv/tree/tree.idl
 share/doc/mico/examples/obv/tree/tree_impl.cc
 share/doc/mico/examples/obv/tree/tree_impl.h
+share/doc/mico/examples/obv/tricky/
 share/doc/mico/examples/obv/tricky/Makefile
 share/doc/mico/examples/obv/tricky/client.cc
 share/doc/mico/examples/obv/tricky/server.cc
@@ -400,70 +432,87 @@ share/doc/mico/examples/obv/tricky/tricky
 share/doc/mico/examples/obv/tricky/tricky.idl
 share/doc/mico/examples/obv/tricky/tricky_impl.cc
 share/doc/mico/examples/obv/tricky/tricky_impl.h
+share/doc/mico/examples/poa/
 share/doc/mico/examples/poa/Makefile
 share/doc/mico/examples/poa/README
+share/doc/mico/examples/poa/account-1/
 share/doc/mico/examples/poa/account-1/Makefile
 share/doc/mico/examples/poa/account-1/account
 share/doc/mico/examples/poa/account-1/account.idl
 share/doc/mico/examples/poa/account-1/client.cc
 share/doc/mico/examples/poa/account-1/server.cc
+share/doc/mico/examples/poa/account-2/
 share/doc/mico/examples/poa/account-2/Makefile
 share/doc/mico/examples/poa/account-2/account
 share/doc/mico/examples/poa/account-2/account.idl
 share/doc/mico/examples/poa/account-2/client.cc
 share/doc/mico/examples/poa/account-2/server.cc
+share/doc/mico/examples/poa/account-3/
 share/doc/mico/examples/poa/account-3/Makefile
 share/doc/mico/examples/poa/account-3/account
 share/doc/mico/examples/poa/account-3/account.idl
 share/doc/mico/examples/poa/account-3/client.cc
 share/doc/mico/examples/poa/account-3/server.cc
+share/doc/mico/examples/poa/hello-1/
 share/doc/mico/examples/poa/hello-1/Makefile
 share/doc/mico/examples/poa/hello-1/client.cc
 share/doc/mico/examples/poa/hello-1/hello
 share/doc/mico/examples/poa/hello-1/hello.idl
 share/doc/mico/examples/poa/hello-1/server.cc
+share/doc/mico/examples/poa/hello-2/
 share/doc/mico/examples/poa/hello-2/Makefile
 share/doc/mico/examples/poa/hello-2/client.cc
 share/doc/mico/examples/poa/hello-2/hello
 share/doc/mico/examples/poa/hello-2/hello.idl
 share/doc/mico/examples/poa/hello-2/server.cc
+share/doc/mico/examples/poa/inherit/
 share/doc/mico/examples/poa/inherit/Makefile
 share/doc/mico/examples/poa/inherit/client.cc
 share/doc/mico/examples/poa/inherit/inherit
 share/doc/mico/examples/poa/inherit/inherit.idl
 share/doc/mico/examples/poa/inherit/server.cc
+share/doc/mico/examples/random/
 share/doc/mico/examples/random/Makefile
 share/doc/mico/examples/random/client.cc
 share/doc/mico/examples/random/random.idl
+share/doc/mico/examples/redlich/
+share/doc/mico/examples/redlich/Calc-1/
 share/doc/mico/examples/redlich/Calc-1/Makefile
 share/doc/mico/examples/redlich/Calc-1/calc.idl
 share/doc/mico/examples/redlich/Calc-1/client.cc
 share/doc/mico/examples/redlich/Calc-1/server.cc
+share/doc/mico/examples/redlich/Calc-2/
 share/doc/mico/examples/redlich/Calc-2/Makefile
 share/doc/mico/examples/redlich/Calc-2/calc.idl
 share/doc/mico/examples/redlich/Calc-2/client.cc
 share/doc/mico/examples/redlich/Calc-2/server.cc
+share/doc/mico/examples/redlich/Calc-3/
 share/doc/mico/examples/redlich/Calc-3/Makefile
 share/doc/mico/examples/redlich/Calc-3/calc.idl
 share/doc/mico/examples/redlich/Calc-3/client.cc
 share/doc/mico/examples/redlich/Calc-3/server.cc
+share/doc/mico/examples/redlich/Calc-4/
 share/doc/mico/examples/redlich/Calc-4/Makefile
 share/doc/mico/examples/redlich/Calc-4/calc.idl
 share/doc/mico/examples/redlich/Calc-4/client.cc
 share/doc/mico/examples/redlich/Calc-4/server.cc
+share/doc/mico/examples/redlich/Hello-1/
 share/doc/mico/examples/redlich/Hello-1/Makefile
 share/doc/mico/examples/redlich/Hello-1/client.cc
 share/doc/mico/examples/redlich/Hello-1/server.cc
 share/doc/mico/examples/redlich/Hello-1/tty.idl
+share/doc/mico/examples/redlich/Hello-2/
 share/doc/mico/examples/redlich/Hello-2/Makefile
 share/doc/mico/examples/redlich/Hello-2/client.cc
 share/doc/mico/examples/redlich/Hello-2/server.cc
 share/doc/mico/examples/redlich/Hello-2/tty.idl
+share/doc/mico/examples/redlich/Hello-3/
 share/doc/mico/examples/redlich/Hello-3/Makefile
 share/doc/mico/examples/redlich/Hello-3/client.cc
 share/doc/mico/examples/redlich/Hello-3/server.cc
 share/doc/mico/examples/redlich/Hello-3/tty.idl
 share/doc/mico/examples/redlich/Hello-3/ttyplus.idl
+share/doc/mico/examples/redlich/Hello-4/
 share/doc/mico/examples/redlich/Hello-4/Makefile
 share/doc/mico/examples/redlich/Hello-4/client.cc
 share/doc/mico/examples/redlich/Hello-4/server.cc
@@ -471,8 +520,10 @@ share/doc/mico/examples/redlich/Hello-4/tty.idl
 share/doc/mico/examples/redlich/Hello-4/ttyplus.idl
 share/doc/mico/examples/redlich/Makefile
 share/doc/mico/examples/redlich/README
+share/doc/mico/examples/services/
 share/doc/mico/examples/services/Makefile
 share/doc/mico/examples/services/README
+share/doc/mico/examples/services/events/
 share/doc/mico/examples/services/events/Makefile
 share/doc/mico/examples/services/events/client.cc
 share/doc/mico/examples/services/events/client2.cc
@@ -480,17 +531,20 @@ share/doc/mico/examples/services/events/runit
 share/doc/mico/examples/services/events/server.cc
 share/doc/mico/examples/services/events/server2.cc
 share/doc/mico/examples/services/events/server3.cc
+share/doc/mico/examples/services/naming/
 share/doc/mico/examples/services/naming/Makefile
 share/doc/mico/examples/services/naming/account.idl
 share/doc/mico/examples/services/naming/account_test
 share/doc/mico/examples/services/naming/client.cc
 share/doc/mico/examples/services/naming/server.cc
+share/doc/mico/examples/services/property-daemon/
 share/doc/mico/examples/services/property-daemon/Makefile
 share/doc/mico/examples/services/property-daemon/README
 share/doc/mico/examples/services/property-daemon/bank.idl
 share/doc/mico/examples/services/property-daemon/get_properties.cc
 share/doc/mico/examples/services/property-daemon/set_properties.cc
 share/doc/mico/examples/services/property-daemon/start_demo
+share/doc/mico/examples/services/relship/
 share/doc/mico/examples/services/relship/Documents.idl
 share/doc/mico/examples/services/relship/DocumentsServer.cc
 share/doc/mico/examples/services/relship/Documents_impl.cc
@@ -508,6 +562,7 @@ share/doc/mico/examples/services/relship/servers-start
 share/doc/mico/examples/services/relship/simple-test.cc
 share/doc/mico/examples/services/relship/stop-servers
 share/doc/mico/examples/services/relship/test
+share/doc/mico/examples/services/stream-bench/
 share/doc/mico/examples/services/stream-bench/Makefile
 share/doc/mico/examples/services/stream-bench/bench
 share/doc/mico/examples/services/stream-bench/req.idl
@@ -515,21 +570,26 @@ share/doc/mico/examples/services/stream-bench/req_client.cc
 share/doc/mico/examples/services/stream-bench/req_server.cc
 share/doc/mico/examples/services/stream-bench/stream_client.cc
 share/doc/mico/examples/services/stream-bench/stream_server.cc
+share/doc/mico/examples/services/stream-sound/
 share/doc/mico/examples/services/stream-sound/Makefile
 share/doc/mico/examples/services/stream-sound/client.cc
 share/doc/mico/examples/services/stream-sound/server.cc
 share/doc/mico/examples/services/stream-sound/sound.h
+share/doc/mico/examples/services/trader/
 share/doc/mico/examples/services/trader/Makefile
 share/doc/mico/examples/services/trader/demo.idl
 share/doc/mico/examples/services/trader/main.cc
 share/doc/mico/examples/services/trader/run
+share/doc/mico/examples/shlib/
 share/doc/mico/examples/shlib/Makefile
 share/doc/mico/examples/shlib/client.cc
 share/doc/mico/examples/shlib/hello
 share/doc/mico/examples/shlib/hello.idl
 share/doc/mico/examples/shlib/server.cc
+share/doc/mico/examples/siegel/
 share/doc/mico/examples/siegel/Makefile
 share/doc/mico/examples/siegel/README
+share/doc/mico/examples/siegel/central/
 share/doc/mico/examples/siegel/central/DepotData.cc
 share/doc/mico/examples/siegel/central/DepotData.h
 share/doc/mico/examples/siegel/central/DepotImpl.cc
@@ -538,10 +598,12 @@ share/doc/mico/examples/siegel/central/Makefile
 share/doc/mico/examples/siegel/central/TreeNode.h
 share/doc/mico/examples/siegel/central/depot.dat
 share/doc/mico/examples/siegel/central/depot_server.cc
+share/doc/mico/examples/siegel/idl/
 share/doc/mico/examples/siegel/idl/Central.idl
 share/doc/mico/examples/siegel/idl/Makefile
 share/doc/mico/examples/siegel/idl/POS.idl
 share/doc/mico/examples/siegel/idl/Store.idl
+share/doc/mico/examples/siegel/pos/
 share/doc/mico/examples/siegel/pos/InputMediaImpl.cc
 share/doc/mico/examples/siegel/pos/InputMediaImpl.h
 share/doc/mico/examples/siegel/pos/Makefile
@@ -551,9 +613,11 @@ share/doc/mico/examples/siegel/pos/POSTerminalImpl.cc
 share/doc/mico/examples/siegel/pos/POSTerminalImpl.h
 share/doc/mico/examples/siegel/pos/POS_Client.cc
 share/doc/mico/examples/siegel/pos/POS_Server.cc
+share/doc/mico/examples/siegel/primer_utils/
 share/doc/mico/examples/siegel/primer_utils/Makefile
 share/doc/mico/examples/siegel/primer_utils/NsPublisher.cc
 share/doc/mico/examples/siegel/primer_utils/NsPublisher.h
+share/doc/mico/examples/siegel/store/
 share/doc/mico/examples/siegel/store/Makefile
 share/doc/mico/examples/siegel/store/StoreAccessImpl.cc
 share/doc/mico/examples/siegel/store/StoreAccessImpl.h
@@ -562,6 +626,7 @@ share/doc/mico/examples/siegel/store/StoreImpl.h
 share/doc/mico/examples/siegel/store/TaxImpl.cc
 share/doc/mico/examples/siegel/store/TaxImpl.h
 share/doc/mico/examples/siegel/store/store_server.cc
+share/doc/mico/examples/ssl/
 share/doc/mico/examples/ssl/Makefile
 share/doc/mico/examples/ssl/c_cert.pem
 share/doc/mico/examples/ssl/c_key.pem
@@ -573,68 +638,3 @@ share/doc/mico/examples/ssl/server.cc
 share/doc/mico/examples/ssl/ssl
 share/doc/mico/manual.ps
 %%SHARED%%
-@dirrm share/doc/mico/examples/ssl
-@dirrm share/doc/mico/examples/siegel/store
-@dirrm share/doc/mico/examples/siegel/primer_utils
-@dirrm share/doc/mico/examples/siegel/pos
-@dirrm share/doc/mico/examples/siegel/idl
-@dirrm share/doc/mico/examples/siegel/central
-@dirrm share/doc/mico/examples/siegel
-@dirrm share/doc/mico/examples/shlib
-@dirrm share/doc/mico/examples/services/trader
-@dirrm share/doc/mico/examples/services/stream-sound
-@dirrm share/doc/mico/examples/services/stream-bench
-@dirrm share/doc/mico/examples/services/relship
-@dirrm share/doc/mico/examples/services/property-daemon
-@dirrm share/doc/mico/examples/services/naming
-@dirrm share/doc/mico/examples/services/events
-@dirrm share/doc/mico/examples/services
-@dirrm share/doc/mico/examples/redlich/Hello-4
-@dirrm share/doc/mico/examples/redlich/Hello-3
-@dirrm share/doc/mico/examples/redlich/Hello-2
-@dirrm share/doc/mico/examples/redlich/Hello-1
-@dirrm share/doc/mico/examples/redlich/Calc-4
-@dirrm share/doc/mico/examples/redlich/Calc-3
-@dirrm share/doc/mico/examples/redlich/Calc-2
-@dirrm share/doc/mico/examples/redlich/Calc-1
-@dirrm share/doc/mico/examples/redlich
-@dirrm share/doc/mico/examples/random
-@dirrm share/doc/mico/examples/poa/inherit
-@dirrm share/doc/mico/examples/poa/hello-2
-@dirrm share/doc/mico/examples/poa/hello-1
-@dirrm share/doc/mico/examples/poa/account-3
-@dirrm share/doc/mico/examples/poa/account-2
-@dirrm share/doc/mico/examples/poa/account-1
-@dirrm share/doc/mico/examples/poa
-@dirrm share/doc/mico/examples/obv/tricky
-@dirrm share/doc/mico/examples/obv/tree
-@dirrm share/doc/mico/examples/obv/date
-@dirrm share/doc/mico/examples/obv/custom
-@dirrm share/doc/mico/examples/obv/abstract
-@dirrm share/doc/mico/examples/obv
-@dirrm share/doc/mico/examples/mcast
-@dirrm share/doc/mico/examples/lifecycle
-@dirrm share/doc/mico/examples/interop/visibroker
-@dirrm share/doc/mico/examples/interop/orbix
-@dirrm share/doc/mico/examples/interop/jdk
-@dirrm share/doc/mico/examples/interop/jacorb
-@dirrm share/doc/mico/examples/interop
-@dirrm share/doc/mico/examples/interceptor
-@dirrm share/doc/mico/examples/henning
-@dirrm share/doc/mico/examples/generic
-@dirrm share/doc/mico/examples/externalization
-@dirrm share/doc/mico/examples/dynany
-@dirrm share/doc/mico/examples/dispatcher/x11
-@dirrm share/doc/mico/examples/dispatcher
-@dirrm share/doc/mico/examples/codesets
-@dirrm share/doc/mico/examples/boa/activate
-@dirrm share/doc/mico/examples/boa/account4
-@dirrm share/doc/mico/examples/boa/account3
-@dirrm share/doc/mico/examples/boa/account2
-@dirrm share/doc/mico/examples/boa/account
-@dirrm share/doc/mico/examples/boa
-@dirrm share/doc/mico/examples/bench
-@dirrm share/doc/mico/examples
-@dirrm share/doc/mico
-@dirrm include/ministl
-@dirrm include/mico
diff --git a/devel/mk/pkg/PLIST b/devel/mk/pkg/PLIST
index 4cceb590212..e3042242179 100644
--- a/devel/mk/pkg/PLIST
+++ b/devel/mk/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/02/16 15:13:14 markus Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/08/10 00:52:44 espie Exp $
 bin/mk
-man/man1/mk.1
+@man man/man1/mk.1
+share/doc/mk/
 share/doc/mk/mk.pdf
-@dirrm share/doc/mk
diff --git a/devel/mm/pkg/PFRAG.shared b/devel/mm/pkg/PFRAG.shared
index 4b7c7a193de..407e781a233 100644
--- a/devel/mm/pkg/PFRAG.shared
+++ b/devel/mm/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/04/29 02:03:53 margarida Exp $
-lib/libmm.so.13.20
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 00:52:45 espie Exp $
+@lib lib/libmm.so.13.20
diff --git a/devel/mm/pkg/PLIST b/devel/mm/pkg/PLIST
index 4041a012eed..a300fe68a00 100644
--- a/devel/mm/pkg/PLIST
+++ b/devel/mm/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.13 2000/07/01 22:30:12 brad Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/08/10 00:52:45 espie Exp $
 bin/mm-config
 include/mm.h
 lib/libmm.a
 lib/libmm.la
+@man man/man1/mm-config.1
+@man man/man3/mm.3
 %%SHARED%%
-man/man1/mm-config.1
-man/man3/mm.3
diff --git a/devel/mysql++/pkg/PFRAG.shared b/devel/mysql++/pkg/PFRAG.shared
index 6e79ce9e16d..e498e34ab85 100644
--- a/devel/mysql++/pkg/PFRAG.shared
+++ b/devel/mysql++/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/04/02 15:13:05 wilfried Exp $
-lib/libsqlplus.so.1.7
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/10 00:52:45 espie Exp $
+@lib lib/libsqlplus.so.1.7
diff --git a/devel/mysql++/pkg/PLIST b/devel/mysql++/pkg/PLIST
index c9b49f17e88..0f45a50303e 100644
--- a/devel/mysql++/pkg/PLIST
+++ b/devel/mysql++/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/01/06 11:16:53 wilfried Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/08/10 00:52:45 espie Exp $
+include/mysql++/
 include/mysql++/coldata1.hh
 include/mysql++/coldata2.hh
 include/mysql++/coldata3.hh
@@ -76,4 +77,3 @@ include/mysql++/vallist3.hh
 lib/libsqlplus.a
 lib/libsqlplus.la
 %%SHARED%%
-@dirrm include/mysql++
diff --git a/devel/mysql++/pkg/PLIST-docs b/devel/mysql++/pkg/PLIST-docs
index 8ae8575a3dd..c738c103755 100644
--- a/devel/mysql++/pkg/PLIST-docs
+++ b/devel/mysql++/pkg/PLIST-docs
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST-docs,v 1.2 2004/01/06 11:16:53 wilfried Exp $
+@comment $OpenBSD: PLIST-docs,v 1.3 2004/08/10 00:52:45 espie Exp $
+share/doc/mysql++/
+share/doc/mysql++/html/
 share/doc/mysql++/html/1_Introduction.html
 share/doc/mysql++/html/2_Overview.html
 share/doc/mysql++/html/3_Important.html
@@ -31,5 +33,3 @@ share/doc/mysql++/html/prev.png
 share/doc/mysql++/html/prev_g.png
 share/doc/mysql++/html/up.png
 share/doc/mysql++/html/up_g.png
-@dirrm share/doc/mysql++/html
-@dirrm share/doc/mysql++