diff --git a/devel/ORBit/pkg/DEINSTALL b/devel/ORBit/pkg/DEINSTALL
deleted file mode 100644
index 4c3b762ef9f..00000000000
--- a/devel/ORBit/pkg/DEINSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2003/09/30 17:48:52 naddy Exp $
-#
-# ORBit de-installation
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${SYSCONFDIR}/orbitrc
-
-if [ "$PKG_DELETE_EXTRA" != Yes -a -f $CONFIG_FILE ]; then
-  echo
-  echo "+---------------"
-  echo "| To completely deinstall the $1 package you need to perform"
-  echo "| this step as root:"
-  echo "|"
-  echo "|           rm -f $CONFIG_FILE"
-  echo "|"
-  echo "| Do not do this if you plan on re-installing $1"
-  echo "| at some future time."
-  echo "+---------------"
-  echo
-fi
-
-exit 0
diff --git a/devel/ORBit/pkg/INSTALL b/devel/ORBit/pkg/INSTALL
deleted file mode 100644
index b3b1452a3d4..00000000000
--- a/devel/ORBit/pkg/INSTALL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.3 2002/04/26 03:35:34 pvalchev Exp $
-#
-# Pre/post-installation setup of ORBit
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${SYSCONFDIR}/orbitrc
-SAMPLE_CONFIG_FILE=$PREFIX/share/examples/orbit/orbitrc-sample
-
-do_notice()
-{
-  echo
-  echo "+---------------"
-  echo "| The existing $1 configuration file, $CONFIG_FILE,"
-  echo "| has NOT been changed.  You may want to compare it to the"
-  echo "| current sample file, $SAMPLE_CONFIG_FILE,"
-  echo "| and update your configuration as needed."
-  echo "+---------------"
-  echo
-}
-
-do_install()
-{
-  install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
-  echo
-  echo "+---------------"
-  echo "| The $1 configuration file, $CONFIG_FILE,"
-  echo "| has been installed.  Please view this file and change"
-  echo "| the configuration to meet your needs."
-  echo "+---------------"
-  echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ -f $CONFIG_FILE ]; then
-	  do_notice $1
-	else
-	  do_install $1
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/devel/ORBit/pkg/PFRAG.shared b/devel/ORBit/pkg/PFRAG.shared
index 9c6f8a227b2..fcaf8771538 100644
--- a/devel/ORBit/pkg/PFRAG.shared
+++ b/devel/ORBit/pkg/PFRAG.shared
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2002/02/24 22:44:00 brad Exp $
-lib/libIDL.so.4.4
-lib/libIIOP.so.5.13
-lib/libORBit.so.5.13
-lib/libORBitCosNaming.so.5.13
-lib/libORBitutil.so.5.13
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.8 2004/08/10 09:43:46 espie Exp $
+@lib lib/libIDL.so.4.4
+@lib lib/libIIOP.so.5.13
+@lib lib/libORBit.so.5.13
+@lib lib/libORBitCosNaming.so.5.13
+@lib lib/libORBitutil.so.5.13
diff --git a/devel/ORBit/pkg/PLIST b/devel/ORBit/pkg/PLIST
index e698ebfd2af..cacc78b0955 100644
--- a/devel/ORBit/pkg/PLIST
+++ b/devel/ORBit/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2003/12/18 17:21:07 naddy Exp $
-@unexec install-info --delete --info-dir=%D/info %D/info/libIDL.info
+@comment $OpenBSD: PLIST,v 1.21 2004/08/10 09:43:46 espie Exp $
 bin/libIDL-config
 bin/name-client
 bin/old-name-server
@@ -8,15 +7,21 @@ bin/orbit-event-server
 bin/orbit-idl
 bin/orbit-ird
 bin/orbit-name-server
+include/libIDL-1.0/
+include/libIDL-1.0/libIDL/
 include/libIDL-1.0/libIDL/IDL.h
+include/orbit-1.0/
+include/orbit-1.0/IIOP/
 include/orbit-1.0/IIOP/IIOP-config.h
 include/orbit-1.0/IIOP/IIOP-types.h
 include/orbit-1.0/IIOP/IIOP.h
 include/orbit-1.0/IIOP/giop-msg-buffer.h
 include/orbit-1.0/IIOP/iiop-encoders.h
 include/orbit-1.0/IIOP/iiop-endian.h
+include/orbit-1.0/ORBitservices/
 include/orbit-1.0/ORBitservices/CosNaming.h
 include/orbit-1.0/ORBitservices/CosNaming_impl.h
+include/orbit-1.0/ORBitutil/
 include/orbit-1.0/ORBitutil/basic_types.h
 include/orbit-1.0/ORBitutil/compat.h
 include/orbit-1.0/ORBitutil/orbit-os-config.h
@@ -25,6 +30,7 @@ include/orbit-1.0/ORBitutil/os-specifics.h
 include/orbit-1.0/ORBitutil/thread-safety.h
 include/orbit-1.0/ORBitutil/trace.h
 include/orbit-1.0/ORBitutil/util.h
+include/orbit-1.0/orb/
 include/orbit-1.0/orb/allocator-defs.h
 include/orbit-1.0/orb/allocators.h
 include/orbit-1.0/orb/cdr.h
@@ -65,7 +71,7 @@ include/orbit-1.0/orb/poa.h
 include/orbit-1.0/orb/sequences.h
 include/orbit-1.0/orb/typecode.h
 include/orbit-1.0/orbit-idl2.h
-info/libIDL.info
+@info info/libIDL.info
 lib/libIDL.a
 lib/libIDL.la
 lib/libIDLConf.sh
@@ -79,11 +85,16 @@ lib/libORBitutil.a
 lib/libORBitutil.la
 lib/libname-server.a
 lib/liborbit-c-backend.a
+lib/pkgconfig/
 lib/pkgconfig/ORBit.pc
 lib/pkgconfig/libIDL.pc
 share/aclocal/ORBit.m4
 share/aclocal/libIDL.m4
+share/examples/orbit/
 share/examples/orbit/orbitrc-sample
+@sample ${SYSCONFDIR}/orbitrc
+share/idl/
+share/idl/orbit-1.0/
 share/idl/orbit-1.0/CosEventChannel.idl
 share/idl/orbit-1.0/CosEventComm.idl
 share/idl/orbit-1.0/CosNaming.idl
@@ -91,16 +102,3 @@ share/idl/orbit-1.0/CosTypedEventChannel.idl
 share/idl/orbit-1.0/CosTypedEventComm.idl
 share/idl/orbit-1.0/LName.pidl
 %%SHARED%%
-@dirrm share/idl/orbit-1.0
-@dirrm share/idl
-@dirrm share/examples/orbit
-@dirrm include/orbit-1.0/orb
-@dirrm include/orbit-1.0/ORBitutil
-@dirrm include/orbit-1.0/ORBitservices
-@dirrm include/orbit-1.0/IIOP
-@dirrm include/orbit-1.0
-@dirrm include/libIDL-1.0/libIDL
-@dirrm include/libIDL-1.0
-@exec install-info --info-dir=%D/info %D/info/libIDL.info
-@cwd ${SYSCONFDIR}
-@extra orbitrc
diff --git a/devel/ORBit2/pkg/PFRAG.shared b/devel/ORBit2/pkg/PFRAG.shared
index 02eabd6ef9f..df966743652 100644
--- a/devel/ORBit2/pkg/PFRAG.shared
+++ b/devel/ORBit2/pkg/PFRAG.shared
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/10/07 05:47:57 marcm Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 09:43:46 espie Exp $
+@lib lib/libORBit-2.so.0.0
+@lib lib/libORBit-imodule-2.so.0.0
+@lib lib/libORBitCosNaming-2.so.0.0
 lib/orbit-2.0/Everything_module.so
-lib/libORBit-2.so.0.0
-lib/libORBit-imodule-2.so.0.0
-lib/libORBitCosNaming-2.so.0.0
-DYNLIBDIR(%D/lib)
diff --git a/devel/ORBit2/pkg/PLIST b/devel/ORBit2/pkg/PLIST
index d632ee3735c..633d49d9949 100644
--- a/devel/ORBit2/pkg/PLIST
+++ b/devel/ORBit2/pkg/PLIST
@@ -1,16 +1,22 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/02/21 22:36:30 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/08/10 09:43:46 espie Exp $
 @pkgcfl linc-*
 bin/ior-decode-2
 bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
 bin/typelib-dump
+include/orbit-2.0/
+include/orbit-2.0/ORBitservices/
 include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
 include/orbit-2.0/ORBitservices/orbit-imodule.h
+include/orbit-2.0/orbit/
+include/orbit-2.0/orbit-idl/
 include/orbit-2.0/orbit-idl/orbit-idl-backend.h
+include/orbit-2.0/orbit/dynamic/
 include/orbit-2.0/orbit/dynamic/dynamic-defs.h
 include/orbit-2.0/orbit/dynamic/dynamic.h
+include/orbit-2.0/orbit/orb-core/
 include/orbit-2.0/orbit/orb-core/allocators.h
 include/orbit-2.0/orbit/orb-core/corba-any-type.h
 include/orbit-2.0/orbit/orb-core/corba-any.h
@@ -39,6 +45,7 @@ include/orbit-2.0/orbit/orb-core/orbit-small.h
 include/orbit-2.0/orbit/orbit-config.h
 include/orbit-2.0/orbit/orbit-types.h
 include/orbit-2.0/orbit/orbit.h
+include/orbit-2.0/orbit/poa/
 include/orbit-2.0/orbit/poa/orbit-adaptor.h
 include/orbit-2.0/orbit/poa/poa-basics.h
 include/orbit-2.0/orbit/poa/poa-defs.h
@@ -47,6 +54,7 @@ include/orbit-2.0/orbit/poa/poa-types.h
 include/orbit-2.0/orbit/poa/poa.h
 include/orbit-2.0/orbit/poa/portableserver-current-type.h
 include/orbit-2.0/orbit/poa/portableserver-poa-type.h
+include/orbit-2.0/orbit/util/
 include/orbit-2.0/orbit/util/basic_types.h
 include/orbit-2.0/orbit/util/orbit-genrand.h
 include/orbit-2.0/orbit/util/orbit-util.h
@@ -57,13 +65,18 @@ lib/libORBit-imodule-2.la
 lib/libORBitCosNaming-2.a
 lib/libORBitCosNaming-2.la
 lib/libname-server-2.a
+lib/orbit-2.0/
 lib/orbit-2.0/Everything_module.a
 lib/orbit-2.0/Everything_module.la
+lib/pkgconfig/
 lib/pkgconfig/ORBit-2.0.pc
 lib/pkgconfig/ORBit-CosNaming-2.0.pc
 lib/pkgconfig/ORBit-idl-2.0.pc
 lib/pkgconfig/ORBit-imodule-2.0.pc
 share/aclocal/ORBit2.m4
+share/gtk-doc/
+share/gtk-doc/html/
+share/gtk-doc/html/ORBit2/
 share/gtk-doc/html/ORBit2/ORBit2-orbit2-allocators.html
 share/gtk-doc/html/ORBit2/ORBit2-orbit2-small.html
 share/gtk-doc/html/ORBit2/ORBit2.devhelp
@@ -74,19 +87,7 @@ share/gtk-doc/html/ORBit2/index.sgml
 share/gtk-doc/html/ORBit2/left.png
 share/gtk-doc/html/ORBit2/right.png
 share/gtk-doc/html/ORBit2/up.png
+share/idl/
+share/idl/orbit-2.0/
 share/idl/orbit-2.0/CosNaming.idl
 %%SHARED%%
-@dirrm share/idl/orbit-2.0
-@dirrm share/idl
-@dirrm share/gtk-doc/html/ORBit2
-@dirrm share/gtk-doc/html
-@dirrm share/gtk-doc
-@dirrm lib/orbit-2.0
-@dirrm include/orbit-2.0/orbit/util
-@dirrm include/orbit-2.0/orbit/poa
-@dirrm include/orbit-2.0/orbit/orb-core
-@dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit-idl
-@dirrm include/orbit-2.0/orbit
-@dirrm include/orbit-2.0/ORBitservices
-@dirrm include/orbit-2.0
diff --git a/devel/libgtop2/pkg/PFRAG.shared b/devel/libgtop2/pkg/PFRAG.shared
index 1ea7fad170b..12e182dbb8a 100644
--- a/devel/libgtop2/pkg/PFRAG.shared
+++ b/devel/libgtop2/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2004/08/01 06:06:35 marcm Exp $
-lib/libgtop-2.0.so.3.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.7 2004/08/10 09:43:46 espie Exp $
+@lib lib/libgtop-2.0.so.3.0
diff --git a/devel/libgtop2/pkg/PLIST b/devel/libgtop2/pkg/PLIST
index 71b64956f73..fc792bbd668 100644
--- a/devel/libgtop2/pkg/PLIST
+++ b/devel/libgtop2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/08/01 06:06:35 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.8 2004/08/10 09:43:46 espie Exp $
 bin/libgtop_daemon2
 bin/libgtop_server2
 include/libgtop-2.0/
@@ -49,29 +49,54 @@ include/libgtop-2.0/glibtop_suid.h
 @info info/libgtop2.info
 lib/libgtop-2.0.a
 lib/libgtop-2.0.la
+lib/pkgconfig/
 lib/pkgconfig/libgtop-2.0.pc
+share/locale/am/
+share/locale/am/LC_MESSAGES/
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
+share/locale/az/
+share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/libgtop-2.0.mo
+share/locale/be/
+share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
+share/locale/bn/
+share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
 share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
+share/locale/cy/
+share/locale/cy/LC_MESSAGES/
 share/locale/cy/LC_MESSAGES/libgtop-2.0.mo
 share/locale/da/LC_MESSAGES/libgtop-2.0.mo
 share/locale/de/LC_MESSAGES/libgtop-2.0.mo
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en_CA/
+share/locale/en_CA/LC_MESSAGES/
 share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
 share/locale/es/LC_MESSAGES/libgtop-2.0.mo
 share/locale/et/LC_MESSAGES/libgtop-2.0.mo
+share/locale/fa/
+share/locale/fa/LC_MESSAGES/
 share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ga/
+share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
 share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/he/LC_MESSAGES/libgtop-2.0.mo
+share/locale/hi/
+share/locale/hi/LC_MESSAGES/
 share/locale/hi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hr/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
@@ -79,17 +104,27 @@ share/locale/id/LC_MESSAGES/libgtop-2.0.mo
 share/locale/it/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
+share/locale/lt/
+share/locale/lt/LC_MESSAGES/
 share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mk/
+share/locale/mk/LC_MESSAGES/
 share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ml/
 share/locale/ml/LC_MESSAGES/
 share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mn/
+share/locale/mn/LC_MESSAGES/
 share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ms/
+share/locale/ms/LC_MESSAGES/
 share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
 share/locale/no/LC_MESSAGES/libgtop-2.0.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
 share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
@@ -98,13 +133,23 @@ share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
+share/locale/sq/
+share/locale/sq/LC_MESSAGES/
 share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
 share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
+share/locale/sr@Latn/
+share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
 share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ta/
+share/locale/ta/LC_MESSAGES/
 share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
 share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
 share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
+share/locale/vi/
+share/locale/vi/LC_MESSAGES/
 share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
diff --git a/devel/popt/pkg/PFRAG.shared b/devel/popt/pkg/PFRAG.shared
index cd87cd52ce3..ded07b310fd 100644
--- a/devel/popt/pkg/PFRAG.shared
+++ b/devel/popt/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2003/07/15 16:50:22 jolan Exp $
-lib/libpopt.so.0.3
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 09:43:46 espie Exp $
+@lib lib/libpopt.so.0.3
diff --git a/devel/popt/pkg/PLIST b/devel/popt/pkg/PLIST
index 7ed1b0fdf8f..f5e40a27de2 100644
--- a/devel/popt/pkg/PLIST
+++ b/devel/popt/pkg/PLIST
@@ -1,96 +1,96 @@
-@comment $OpenBSD: PLIST,v 1.3 2003/12/15 16:51:05 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/10 09:43:46 espie Exp $
 include/popt.h
 @comment lib/charset.alias
 lib/libpopt.a
 lib/libpopt.la
-man/man3/popt.3
+@man man/man3/popt.3
+share/locale/
+share/locale/cs/
+share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/popt.mo
+share/locale/da/
+share/locale/da/LC_MESSAGES/
 share/locale/da/LC_MESSAGES/popt.mo
+share/locale/de/
+share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/popt.mo
+share/locale/es/
+share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/popt.mo
+share/locale/eu_ES/
+share/locale/eu_ES/LC_MESSAGES/
 share/locale/eu_ES/LC_MESSAGES/popt.mo
+share/locale/fi/
+share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/popt.mo
+share/locale/fr/
+share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/popt.mo
+share/locale/gl/
+share/locale/gl/LC_MESSAGES/
 share/locale/gl/LC_MESSAGES/popt.mo
+share/locale/hu/
+share/locale/hu/LC_MESSAGES/
 share/locale/hu/LC_MESSAGES/popt.mo
+share/locale/id/
+share/locale/id/LC_MESSAGES/
 share/locale/id/LC_MESSAGES/popt.mo
+share/locale/is/
+share/locale/is/LC_MESSAGES/
 share/locale/is/LC_MESSAGES/popt.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/popt.mo
+share/locale/ja/
+share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/popt.mo
+share/locale/ko/
+share/locale/ko/LC_MESSAGES/
 share/locale/ko/LC_MESSAGES/popt.mo
 @comment share/locale/locale.alias
+share/locale/no/
+share/locale/no/LC_MESSAGES/
 share/locale/no/LC_MESSAGES/popt.mo
+share/locale/pl/
+share/locale/pl/LC_MESSAGES/
 share/locale/pl/LC_MESSAGES/popt.mo
+share/locale/pt/
+share/locale/pt/LC_MESSAGES/
 share/locale/pt/LC_MESSAGES/popt.mo
+share/locale/pt_BR/
+share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/popt.mo
+share/locale/ro/
+share/locale/ro/LC_MESSAGES/
 share/locale/ro/LC_MESSAGES/popt.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
 share/locale/ru/LC_MESSAGES/popt.mo
+share/locale/sk/
+share/locale/sk/LC_MESSAGES/
 share/locale/sk/LC_MESSAGES/popt.mo
+share/locale/sl/
+share/locale/sl/LC_MESSAGES/
 share/locale/sl/LC_MESSAGES/popt.mo
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
 share/locale/sr/LC_MESSAGES/popt.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
 share/locale/sv/LC_MESSAGES/popt.mo
+share/locale/tr/
+share/locale/tr/LC_MESSAGES/
 share/locale/tr/LC_MESSAGES/popt.mo
+share/locale/uk/
+share/locale/uk/LC_MESSAGES/
 share/locale/uk/LC_MESSAGES/popt.mo
+share/locale/wa/
+share/locale/wa/LC_MESSAGES/
 share/locale/wa/LC_MESSAGES/popt.mo
+share/locale/zh/
+share/locale/zh/LC_MESSAGES/
 share/locale/zh/LC_MESSAGES/popt.mo
+share/locale/zh_CN.GB2312/
+share/locale/zh_CN.GB2312/LC_MESSAGES/
 share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
 %%SHARED%%
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/zh/LC_MESSAGES
-@dirrm share/locale/zh
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
-@dirrm share/locale/uk/LC_MESSAGES
-@dirrm share/locale/uk
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sr/LC_MESSAGES
-@dirrm share/locale/sr
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/is/LC_MESSAGES
-@dirrm share/locale/is
-@dirrm share/locale/id/LC_MESSAGES
-@dirrm share/locale/id
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/gl/LC_MESSAGES
-@dirrm share/locale/gl
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/eu_ES/LC_MESSAGES
-@dirrm share/locale/eu_ES
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale
diff --git a/devel/pth/pkg/PFRAG.shared b/devel/pth/pkg/PFRAG.shared
index aaa53102472..ca5f2bb2f91 100644
--- a/devel/pth/pkg/PFRAG.shared
+++ b/devel/pth/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2002/02/26 03:57:39 brad Exp $
-lib/libpth.so.14.21
-DYNLIBDIR(%B)
+@comment $OpenBSD: PFRAG.shared,v 1.6 2004/08/10 09:43:46 espie Exp $
+@lib lib/libpth.so.14.21
diff --git a/devel/pth/pkg/PLIST b/devel/pth/pkg/PLIST
index c154f9f7f94..ef3571876a2 100644
--- a/devel/pth/pkg/PLIST
+++ b/devel/pth/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.3 2002/02/26 03:57:39 brad Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/08/10 09:43:46 espie Exp $
 bin/pth-config
 include/pth.h
 lib/libpth.a
 lib/libpth.la
-%%SHARED%%
-man/man1/pth-config.1
-man/man3/pth.3
+@man man/man1/pth-config.1
+@man man/man3/pth.3
+share/aclocal/
 share/aclocal/pth.m4
+%%SHARED%%
diff --git a/devel/sdl-gfx/pkg/PFRAG.shared b/devel/sdl-gfx/pkg/PFRAG.shared
index cd89aacf031..697fe1bc018 100644
--- a/devel/sdl-gfx/pkg/PFRAG.shared
+++ b/devel/sdl-gfx/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2004/05/23 23:07:40 jolan Exp $
-lib/libSDL_gfx.so.11.0
-DYNLIBDIR(%D/lib)
+@comment $OpenBSD: PFRAG.shared,v 1.5 2004/08/10 09:43:46 espie Exp $
+@lib lib/libSDL_gfx.so.11.0
diff --git a/devel/sdl-gfx/pkg/PLIST b/devel/sdl-gfx/pkg/PLIST
index 17c73429629..e6b3c103975 100644
--- a/devel/sdl-gfx/pkg/PLIST
+++ b/devel/sdl-gfx/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/05/23 23:07:40 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/08/10 09:43:46 espie Exp $
+include/SDL/
 include/SDL/SDL_framerate.h
 include/SDL/SDL_gfxPrimitives.h
 include/SDL/SDL_gfxPrimitives_font.h