diff --git a/devel/libicq2000/pkg/PFRAG.shared b/devel/libicq2000/pkg/PFRAG.shared
index b6512330315..feac8135c37 100644
--- a/devel/libicq2000/pkg/PFRAG.shared
+++ b/devel/libicq2000/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2002/07/26 02:51:53 pvalchev Exp $
-lib/libicq2000.so.5.1
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/09 15:20:24 espie Exp $
+@lib lib/libicq2000.so.5.1
diff --git a/devel/libicq2000/pkg/PLIST b/devel/libicq2000/pkg/PLIST
index 1a9987c7a88..c4de61ae1bd 100644
--- a/devel/libicq2000/pkg/PLIST
+++ b/devel/libicq2000/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2002/04/21 03:19:52 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.2 2004/08/09 15:20:24 espie Exp $
 bin/libicq2000-config
+include/libicq2000/
+include/libicq2000/libicq2000/
 include/libicq2000/libicq2000/Cache.h
 include/libicq2000/libicq2000/Capabilities.h
 include/libicq2000/libicq2000/Client.h
@@ -42,8 +44,7 @@ include/libicq2000/libicq2000/userinfohelpers.h
 include/libicq2000/libicq2000/version.h
 lib/libicq2000.a
 lib/libicq2000.la
-%%SHARED%%
-man/man1/libicq2000-config.1
+@man man/man1/libicq2000-config.1
+share/aclocal/
 share/aclocal/libicq2000.m4
-@dirrm include/libicq2000/libicq2000
-@dirrm include/libicq2000
+%%SHARED%%
diff --git a/devel/libproplist/pkg/PFRAG.shared b/devel/libproplist/pkg/PFRAG.shared
index 5dbe60bb44c..97e0198da1b 100644
--- a/devel/libproplist/pkg/PFRAG.shared
+++ b/devel/libproplist/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1 2000/07/20 03:48:38 jasoni Exp $
-lib/libPropList.so.2.2
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 15:20:24 espie Exp $
+@lib lib/libPropList.so.2.2
diff --git a/devel/libproplist/pkg/PLIST b/devel/libproplist/pkg/PLIST
index d93d24c4fa8..6545310bfc1 100644
--- a/devel/libproplist/pkg/PLIST
+++ b/devel/libproplist/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.8 2000/07/20 03:48:38 jasoni Exp $
+@comment $OpenBSD: PLIST,v 1.9 2004/08/09 15:20:24 espie Exp $
 include/proplist.h
 lib/libPropList.a
 lib/libPropList.la
-%%SHARED%%
+share/doc/libproplist/
 share/doc/libproplist/README
-@dirrm share/doc/libproplist
+%%SHARED%%
diff --git a/devel/libsigc++/pkg/PFRAG.shared b/devel/libsigc++/pkg/PFRAG.shared
index 1482adc604d..0d363f457de 100644
--- a/devel/libsigc++/pkg/PFRAG.shared
+++ b/devel/libsigc++/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2001/07/20 20:59:33 shell Exp $
-lib/libsigc.so.0.0
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.5 2004/08/09 15:20:24 espie Exp $
+@lib lib/libsigc.so.0.0
diff --git a/devel/libsigc++/pkg/PLIST b/devel/libsigc++/pkg/PLIST
index 91e5357a101..282e6b519fe 100644
--- a/devel/libsigc++/pkg/PLIST
+++ b/devel/libsigc++/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/10/24 12:54:37 shell Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/09 15:20:24 espie Exp $
 bin/sigc-config
+include/sigc++-1.0/
+include/sigc++-1.0/sigc++/
 include/sigc++-1.0/sigc++/adaptor.h
 include/sigc++-1.0/sigc++/basic_signal.h
 include/sigc++-1.0/sigc++/bind.h
@@ -9,6 +11,7 @@ include/sigc++-1.0/sigc++/func_slot.h
 include/sigc++-1.0/sigc++/generator.h
 include/sigc++-1.0/sigc++/handle.h
 include/sigc++-1.0/sigc++/handle_system.h
+include/sigc++-1.0/sigc++/macros/
 include/sigc++-1.0/sigc++/macros/basic_signal.h.m4
 include/sigc++-1.0/sigc++/macros/bind.h.m4
 include/sigc++-1.0/sigc++/macros/class_slot.h.m4
@@ -31,8 +34,12 @@ include/sigc++-1.0/sigc++/thread.h
 include/sigc++-1.0/sigc++/type.h
 lib/libsigc.a
 lib/libsigc.la
+lib/sigc++-1.0/
+lib/sigc++-1.0/include/
 lib/sigc++-1.0/include/sigc++config.h
+share/aclocal/
 share/aclocal/sigc++.m4
+share/doc/libsigc++/
 share/doc/libsigc++/API
 share/doc/libsigc++/FAQ
 share/doc/libsigc++/UML
@@ -45,9 +52,3 @@ share/doc/libsigc++/riscos
 share/doc/libsigc++/signals
 share/doc/libsigc++/win32
 %%SHARED%%
-@dirrm share/doc/libsigc++
-@dirrm lib/sigc++-1.0/include
-@dirrm lib/sigc++-1.0
-@dirrm include/sigc++-1.0/sigc++/macros
-@dirrm include/sigc++-1.0/sigc++
-@dirrm include/sigc++-1.0
diff --git a/devel/libunicode/pkg/PFRAG.shared b/devel/libunicode/pkg/PFRAG.shared
index ee3da459307..c75ba015301 100644
--- a/devel/libunicode/pkg/PFRAG.shared
+++ b/devel/libunicode/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/12/19 01:19:52 margarida Exp $
-lib/libunicode.so.0.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/09 15:20:24 espie Exp $
+@lib lib/libunicode.so.0.0
diff --git a/devel/libusb/pkg/PFRAG.shared b/devel/libusb/pkg/PFRAG.shared
index 0c2530992f6..08270f1052a 100644
--- a/devel/libusb/pkg/PFRAG.shared
+++ b/devel/libusb/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2003/01/01 21:34:45 brad Exp $
-lib/libusb.so.7.0
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.6 2004/08/09 15:20:24 espie Exp $
+@lib lib/libusb.so.7.0