diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 4eb5e556e2f..ce884951ee2 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2005/02/09 03:48:43 brad Exp $
+# $OpenBSD: Makefile,v 1.27 2005/08/13 18:19:32 espie Exp $
 
 .if ${MACHINE_ARCH} == "hppa"
 BROKEN=			"hangs indefinitely until machine panics/hangs"
@@ -10,7 +10,7 @@ COMMENT-leim=		"Library of Emacs Input Methods"
 
 VERSION=		21.3
 DISTNAME=		emacs-${VERSION}
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 FULLPKGNAME-el=		emacs-el-${VERSION}
 FULLPKGNAME-leim=	emacs-leim-${VERSION}
 
diff --git a/editors/emacs21/pkg/PLIST-el b/editors/emacs21/pkg/PLIST-el
index 9da3b68da5f..1ccc8f2f30c 100644
--- a/editors/emacs21/pkg/PLIST-el
+++ b/editors/emacs21/pkg/PLIST-el
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-el,v 1.1 2003/07/06 12:46:45 naddy Exp $
+@comment $OpenBSD: PLIST-el,v 1.2 2005/08/13 18:19:32 espie Exp $
+share/emacs/${VERSION}/leim/ja-dic/
 share/emacs/${VERSION}/leim/ja-dic/ja-dic.el
+share/emacs/${VERSION}/leim/quail/
 share/emacs/${VERSION}/leim/quail/4Corner.el
 share/emacs/${VERSION}/leim/quail/ARRAY30.el
 share/emacs/${VERSION}/leim/quail/CCDOSPY.el
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index b70940a9083..ba4e926cf54 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2005/07/17 19:28:41 alek Exp $
+# $OpenBSD: Makefile,v 1.46 2005/08/13 18:19:31 espie Exp $
 
 COMMENT=	"Civilization clone for X11; multiplayer; game server"
 COMMENT-client=	"Freeciv client"
@@ -8,7 +8,7 @@ VERSION=	2.0.3
 DISTNAME=	freeciv-${VERSION}
 PKGNAME=	freeciv-server-${VERSION}
 PKGNAME-client=	freeciv-client-${VERSION}
-PKGNAME-share=	freeciv-share-${VERSION}
+PKGNAME-share=	freeciv-share-${VERSION}p0
 CATEGORIES=	games
 HOMEPAGE=	http://www.freeciv.org/
 
diff --git a/games/freeciv/pkg/PLIST-share b/games/freeciv/pkg/PLIST-share
index 63fcb27d0bd..0f448970a87 100644
--- a/games/freeciv/pkg/PLIST-share
+++ b/games/freeciv/pkg/PLIST-share
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-share,v 1.3 2005/07/09 10:36:18 alek Exp $
+@comment $OpenBSD: PLIST-share,v 1.4 2005/08/13 18:19:31 espie Exp $
+share/freeciv/
 share/freeciv/civ1.serv
+share/freeciv/civ1/
 share/freeciv/civ1/buildings.ruleset
 share/freeciv/civ1/game.ruleset
 share/freeciv/civ1/governments.ruleset
@@ -8,12 +10,14 @@ share/freeciv/civ1/techs.ruleset
 share/freeciv/civ1/terrain.ruleset
 share/freeciv/civ1/units.ruleset
 share/freeciv/civ2.serv
+share/freeciv/civ2/
 share/freeciv/civ2/buildings.ruleset
 share/freeciv/civ2/game.ruleset
 share/freeciv/civ2/governments.ruleset
 share/freeciv/civ2/techs.ruleset
 share/freeciv/civ2/terrain.ruleset
 share/freeciv/civ2/units.ruleset
+share/freeciv/default/
 share/freeciv/default/buildings.ruleset
 share/freeciv/default/cities.ruleset
 share/freeciv/default/game.ruleset
@@ -23,12 +27,14 @@ share/freeciv/default/techs.ruleset
 share/freeciv/default/terrain.ruleset
 share/freeciv/default/units.ruleset
 share/freeciv/history.serv
+share/freeciv/history/
 share/freeciv/history/buildings.ruleset
 share/freeciv/history/game.ruleset
 share/freeciv/history/governments.ruleset
 share/freeciv/history/techs.ruleset
 share/freeciv/history/terrain.ruleset
 share/freeciv/history/units.ruleset
+share/freeciv/nation/
 share/freeciv/nation/afghani.ruleset
 share/freeciv/nation/american.ruleset
 share/freeciv/nation/arab.ruleset
@@ -114,21 +120,28 @@ share/freeciv/nation/vietnamese.ruleset
 share/freeciv/nation/viking.ruleset
 share/freeciv/nation/welsh.ruleset
 share/freeciv/nation/zulu.ruleset
+share/freeciv/scenario/
 share/freeciv/scenario/british-isles-85x80-v2.80.sav
 share/freeciv/scenario/earth-160x90-v2.sav
 share/freeciv/scenario/earth-80x50-v2.sav
 share/freeciv/scenario/europe-200x100-v2.sav
 share/freeciv/scenario/hagworld-120x60-v1.2.sav
 share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/de/LC_MESSAGES/freeciv.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/freeciv.mo
 share/locale/es/LC_MESSAGES/freeciv.mo
 share/locale/et/LC_MESSAGES/freeciv.mo
 share/locale/fi/LC_MESSAGES/freeciv.mo
 share/locale/fr/LC_MESSAGES/freeciv.mo
+share/locale/he_IL/
+share/locale/he_IL/LC_MESSAGES/
 share/locale/he_IL/LC_MESSAGES/freeciv.mo
 share/locale/hu/LC_MESSAGES/freeciv.mo
 share/locale/it/LC_MESSAGES/freeciv.mo
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index be237d9e541..4bb49444714 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2005/07/27 14:06:31 xsa Exp $
+# $OpenBSD: Makefile,v 1.20 2005/08/13 18:19:32 espie Exp $
 
 COMMENT=		"integrated email and PIM software for GNOME"
 COMMENT-devguide=	"Evolution Developer's Guide"
@@ -7,7 +7,7 @@ V=			1.2
 VERSION=		${V}.4
 DISTNAME=		evolution-${VERSION}
 PKGNAME=		${DISTNAME}p0
-FULLPKGNAME-devguide=	evolution-devguide-${VERSION}p0
+FULLPKGNAME-devguide=	evolution-devguide-${VERSION}p1
 CATEGORIES=    		mail x11
 
 HOMEPAGE=		http://www.gnome.org/projects/evolution/
diff --git a/mail/evolution/pkg/PLIST-devguide b/mail/evolution/pkg/PLIST-devguide
index 9ada33c258d..3849139d252 100644
--- a/mail/evolution/pkg/PLIST-devguide
+++ b/mail/evolution/pkg/PLIST-devguide
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST-devguide,v 1.2 2004/09/15 09:09:42 espie Exp $
+@comment $OpenBSD: PLIST-devguide,v 1.3 2005/08/13 18:19:32 espie Exp $
+share/gnome/
+share/gnome/html/
 share/gnome/html/evolution-devel-guide/
 share/gnome/html/evolution-devel-guide/alarm-trigger-generation-code.html
 share/gnome/html/evolution-devel-guide/calclient.html
diff --git a/mail/hashcash/pkg/PLIST b/mail/hashcash/pkg/PLIST
index ec4bcea6e01..3b003df4c13 100644
--- a/mail/hashcash/pkg/PLIST
+++ b/mail/hashcash/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/16 17:35:22 niallo Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/08/13 18:19:31 espie Exp $
 bin/hashcash
 bin/sha1
 @man man/man1/hashcash.1
 @man man/man1/sha1-hashcash.1
+share/doc/hashcash/
 share/doc/hashcash/README
 share/doc/hashcash/LICENSE
 share/doc/hashcash/CHANGELOG
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 572beaa9baf..593c8b41cd8 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2005/03/26 18:31:45 joel Exp $
+# $OpenBSD: Makefile,v 1.17 2005/08/13 18:19:32 espie Exp $
 
 COMMENT=	"local mail delivery agent with filtering abilities"
 COMMENT-utils=	"userdb and quota tools for the Courier mail suite"
@@ -19,7 +19,7 @@ FLAVOR?=
 MULTI_PACKAGES=	-utils
 SUBPACKAGE?=
 
-FULLPKGNAME-utils= courier-utils-${VERSION}p0
+FULLPKGNAME-utils= courier-utils-${VERSION}p1
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/mail/maildrop/pkg/PLIST-utils b/mail/maildrop/pkg/PLIST-utils
index c4c3ca91e36..6ae98a161d6 100644
--- a/mail/maildrop/pkg/PLIST-utils
+++ b/mail/maildrop/pkg/PLIST-utils
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-utils,v 1.3 2004/12/06 23:06:01 mbalmer Exp $
+@comment $OpenBSD: PLIST-utils,v 1.4 2005/08/13 18:19:32 espie Exp $
 bin/deliverquota
 bin/maildirmake
 bin/makeuserdb
@@ -13,6 +13,7 @@ bin/vchkpw2userdb
 @man man/man8/userdb.8
 @man man/man8/userdbpw.8
 @man man/man8/vchkpw2userdb.8
+share/doc/maildrop/
 share/doc/maildrop/scripts/
 share/doc/maildrop/scripts/makedat
 share/doc/maildrop/scripts/makeuserdb
diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile
index e29ec09a74b..025d44e523c 100644
--- a/sysutils/gkrellm/gkrellm/Makefile
+++ b/sysutils/gkrellm/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2005/06/12 12:07:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.19 2005/08/13 18:19:31 espie Exp $
 
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
@@ -7,7 +7,7 @@ COMMENT-client=	"single process stack of system monitors for GTK+2"
 
 V=		2.2.4
 DISTNAME=	gkrellm-${V}
-PKGNAME=	gkrellm-server-${V}p0
+PKGNAME=	gkrellm-server-${V}p1
 PKGNAME-client=	gkrellm-${V}p0
 CATEGORIES=	sysutils sysutils/gkrellm
 
diff --git a/sysutils/gkrellm/gkrellm/pkg/PLIST b/sysutils/gkrellm/gkrellm/pkg/PLIST
index d08d81dfd63..8d7e2f67e03 100644
--- a/sysutils/gkrellm/gkrellm/pkg/PLIST
+++ b/sysutils/gkrellm/gkrellm/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:39:32 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2005/08/13 18:19:31 espie Exp $
+include/gkrellm2/
 include/gkrellm2/gkrellmd.h
 lib/pkgconfig/
 lib/pkgconfig/gkrellm.pc
diff --git a/textproc/ocaml-xml-light/Makefile b/textproc/ocaml-xml-light/Makefile
index 4c66f448abb..eda16f04dd3 100644
--- a/textproc/ocaml-xml-light/Makefile
+++ b/textproc/ocaml-xml-light/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/05/23 23:03:56 avsm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/08/13 18:19:32 espie Exp $
 
 COMMENT=	"simple Objective Caml bindings for XML"
 CATEGORIES=	textproc
 
 V=		2.2
 DISTNAME=	xml-light-${V}
-PKGNAME=	ocaml-${DISTNAME}
+PKGNAME=	ocaml-${DISTNAME}p0
 EXTRACT_SUFX=	.zip
 MASTER_SITES=	http://tech.motion-twin.com/zip/
 
diff --git a/textproc/ocaml-xml-light/pkg/PLIST b/textproc/ocaml-xml-light/pkg/PLIST
index 4e7240ecf18..977d83b050c 100644
--- a/textproc/ocaml-xml-light/pkg/PLIST
+++ b/textproc/ocaml-xml-light/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/05/23 23:03:56 avsm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/08/13 18:19:32 espie Exp $
+lib/ocaml/
 lib/ocaml/dtd.cmi
 lib/ocaml/dtd.mli
 lib/ocaml/xml-light.cma