Index: sysutils/hal/Makefile
===================================================================
--- sysutils/hal/Makefile	(revision 320665)
+++ sysutils/hal/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -113,6 +113,8 @@
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
+# Make this dir regardless, so plist will always be consistent.
+#	@/usr/bin/install -d -o ${USERS} -g ${GROUPS} /var/lib/hald
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/hald/freebsd/README \
Index: sysutils/hal/pkg-plist
===================================================================
--- sysutils/hal/pkg-plist	(revision 320665)
+++ sysutils/hal/pkg-plist	(working copy)
@@ -111,7 +111,7 @@
 @dirrm %%DATADIR%%/fdi
 @dirrm %%DATADIR%%/dist
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/hal/scripts/freebsd
 @dirrm libexec/hal/scripts
 @dirrm libexec/hal
@@ -121,10 +121,9 @@
 @dirrm etc/hal/fdi/information
 @dirrm etc/hal/fdi
 @dirrm etc/hal
-@unexec rm -f /var/run/hald/hald.pid 2>/dev/null || true
-@unexec rm -rf /var/run/hald/hald-local 2>/dev/null || true
-@unexec rm -rf /var/run/hald/hald-runner 2>/dev/null || true
-@unexec rmdir /var/run/hald 2>/dev/null || true
-@unexec rmdir /var/cache/hald 2>/dev/null || true
-@unexec rmdir /var/lib/hal 2>/dev/null || true
-@unexec rmdir /var/lib 2>/dev/null || true
+@cwd /
+@dirrmtry var/run/hald
+@dirrmtry var/cache/hald
+@dirrmtry var/lib/hal
+@dirrmtry var/lib
+@cwd