26 files changed, 80 insertions, 76 deletions

diff --git a/dns/gdnsd/Makefile b/dns/gdnsd/Makefile
index 85bc6c4ae869..48682d8cd088 100644
--- a/dns/gdnsd/Makefile
+++ b/dns/gdnsd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdnsd
 PORTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/blblack/gdnsd/releases/download/v${PORTVERSION}/ \
 		http://gdnsd.scaleengine.net/gdnsd/
diff --git a/dns/gdnsd/pkg-plist b/dns/gdnsd/pkg-plist
index 0154b59e0aef..cc61453bde0a 100644
--- a/dns/gdnsd/pkg-plist
+++ b/dns/gdnsd/pkg-plist
@@ -79,7 +79,7 @@ sbin/gdnsd
 %%PORTDOCS%%%%DOCSDIR%%/gdnsd_manual.pod
 %%PORTDOCS%%%%DOCSDIR%%/gdnsd_manual.txt
 @exec mkdir -p %%ETCDIR%%/zones
-@unexec rmdir >/dev/null 2>&1 /var/run/gdnsd || :
+@unexec rmdir "/var/run/gdnsd" >/dev/null 2>&1 || :
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry libexec/gdnsd
 @dirrmtry lib/gdnsd
diff --git a/dns/yadifa/Makefile b/dns/yadifa/Makefile
index ec2e3dcd5c7f..8dca9c528d18 100644
--- a/dns/yadifa/Makefile
+++ b/dns/yadifa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yadifa
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-2880
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://cdn.yadifa.eu/sites/default/files/releases/
diff --git a/dns/yadifa/pkg-plist b/dns/yadifa/pkg-plist
index 29c423f82198..dec0d746c22e 100644
--- a/dns/yadifa/pkg-plist
+++ b/dns/yadifa/pkg-plist
@@ -147,11 +147,11 @@ sbin/yadifad
 /var/yadifa/masters/localhost.zone
 /var/yadifa/masters/localhost6.zone
 /var/yadifa/masters/somedomain.eu.zone
-@unexec rmdir >/dev/null 2>&1 /var/yadifa/xfr || :
-@unexec rmdir >/dev/null 2>&1 /var/yadifa/slaves || :
-@unexec rmdir >/dev/null 2>&1 /var/yadifa/masters || :
-@unexec rmdir >/dev/null 2>&1 /var/yadifa/keys || :
-@unexec rmdir >/dev/null 2>&1 /var/yadifa || :
+@unexec rmdir "/var/yadifa/xfr" >/dev/null 2>&1 || :
+@unexec rmdir "/var/yadifa/slaves" >/dev/null 2>&1 || :
+@unexec rmdir "/var/yadifa/masters" >/dev/null 2>&1 || :
+@unexec rmdir "/var/yadifa/keys" >/dev/null 2>&1 || :
+@unexec rmdir "/var/yadifa" >/dev/null 2>&1 || :
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 @dirrmtry include/dnszone
 @dirrmtry include/dnsdb
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index a22922252458..36043b29ad33 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	crossfire
 PORTVERSION=	1.70.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-server
diff --git a/games/crossfire-server/pkg-plist b/games/crossfire-server/pkg-plist
index b0b1017c3073..484f166f7a4f 100644
--- a/games/crossfire-server/pkg-plist
+++ b/games/crossfire-server/pkg-plist
@@ -4165,13 +4165,13 @@ man/man6/crossloop.web.6.gz
 /var/games/crossfire/clockdata
 /var/games/crossfire/highscore
 /var/games/crossfire/temp.maps
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/unique-items || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/template-maps || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/players || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/maps || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/datafiles || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire/account || :
-@unexec rmdir >/dev/null 2>&1 /var/games/crossfire || :
+@unexec rmdir "/var/games/crossfire/unique-items" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire/template-maps" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire/players" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire/maps" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire/datafiles" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire/account" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/crossfire" >/dev/null 2>&1 || :
 @dirrmtry %%DATADIR%%/wizhelp
 @dirrm %%DATADIR%%/maps/world
 @dirrm %%DATADIR%%/maps/wolfsburg/volcano
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index 797f41c34176..31b260fcb286 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinball
 PORTVERSION=	0.3.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/games/pinball/pkg-plist b/games/pinball/pkg-plist
index 5c735476349a..aad50e23f288 100644
--- a/games/pinball/pkg-plist
+++ b/games/pinball/pkg-plist
@@ -129,9 +129,9 @@ lib/pinball/libemilia_pin.a
 @dirrm lib/pinball
 @dirrm include/pinball
 @group games
-@unexec rmdir >/dev/null 2>&1 /var/games/pinball/tux || :
-@unexec rmdir >/dev/null 2>&1 /var/games/pinball/professor || :
-@unexec rmdir >/dev/null 2>&1 /var/games/pinball || :
+@unexec rmdir "/var/games/pinball/tux" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/pinball/professor" >/dev/null 2>&1 || :
+@unexec rmdir "/var/games/pinball" >/dev/null 2>&1 || :
 /var/games/pinball/professor/highscores
 /var/games/pinball/tux/highscores
 @group
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile
index b52d4f0c8881..499b3b4d6030 100644
--- a/irc/charybdis/Makefile
+++ b/irc/charybdis/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	charybdis
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc net
 MASTER_SITES=	http://www.stack.nl/~jilles/irc/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist
index 3c3f08476a4c..7ebf0a678745 100644
--- a/irc/charybdis/pkg-plist
+++ b/irc/charybdis/pkg-plist
@@ -286,5 +286,5 @@ man/man8/ircd.8.gz
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%
 @dirrm %%ETCDIR%%
-@unexec rmdir >/dev/null 2>&1 /var/log/charybdis || :
-@unexec rmdir >/dev/null 2>&1 /var/db/charybdis || :
+@unexec rmdir "/var/log/charybdis" >/dev/null 2>&1 || :
+@unexec rmdir "/var/db/charybdis" >/dev/null 2>&1 || :
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 30c093bbec11..3adc38dec032 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 7483f6df9e5b..50bb1c581bae 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -872,8 +872,8 @@ sbin/radwatch
 %%DATADIR%%/dictionary.xylan
 %%DATADIR%%/dictionary.zeus
 %%DATADIR%%/dictionary.zyxel
-@unexec rmdir >/dev/null 2>&1 /var/run/radiusd || :
-@unexec rmdir >/dev/null 2>&1 /var/log/radacct || :
+@unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :
+@unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || :
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%/raddb/sql/postgresql
 @dirrm %%EXAMPLESDIR%%/raddb/sql/oracle
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 55c8b68a1716..baee39689a40 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	3.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist
index dbe7d5021b25..e15713174d82 100644
--- a/net/freeradius3/pkg-plist
+++ b/net/freeradius3/pkg-plist
@@ -831,8 +831,8 @@ sbin/radmin
 %%DATADIR%%/dictionary.yubico
 %%DATADIR%%/dictionary.zeus
 %%DATADIR%%/dictionary.zyxel
-@unexec rmdir >/dev/null 2>&1 /var/run/radiusd || :
-@unexec rmdir >/dev/null 2>&1 /var/log/radacct || :
+@unexec rmdir "/var/run/radiusd" >/dev/null 2>&1 || :
+@unexec rmdir "/var/log/radacct" >/dev/null 2>&1 || :
 @dirrm %%DATADIR%%
 @dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
 @dirrm %%EXAMPLESDIR%%/raddb/sites-available
diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index c8f4b9cdad61..55decd429f5f 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		fidogate
 PORTVERSION=		5.1.7
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		news mail
 MASTER_SITES=		SF/rus${PORTNAME}/${PORTNAME}-stable/${PORTNAME}%20${PORTVERSION}ds
 PKGNAMESUFFIX=		-ds
diff --git a/news/fidogate-ds/pkg-plist b/news/fidogate-ds/pkg-plist
index a9cb7dcf4c54..b7dc4edf3124 100644
--- a/news/fidogate-ds/pkg-plist
+++ b/news/fidogate-ds/pkg-plist
@@ -129,27 +129,27 @@ var/fidogate/fareas.bbs.sample
 @dirrm etc/fido
 @dirrm libexec/fidogate
 @dirrm lib/fidogate
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/toss || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/route || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/pack || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss/bad || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/toss || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc/news || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc/mail || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outrfc || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt/news || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt/mail || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%%/outpkt || true
-@unexec rmdir >/dev/null 2>&1 %%SPOOLDIR%% || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/tick || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin/tmpunpack || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin/bad || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/pin || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in/tmpunpack || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in/bad || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%%/in || true
-@unexec rmdir >/dev/null 2>&1 %%BTBASEDIR%% || true
-@unexec rmdir >/dev/null 2>&1 /var/spool/fido || true
-@unexec rmdir >/dev/null 2>&1 %%LOCKDIR%% || true
-@unexec rmdir >/dev/null 2>&1 %%LOGDIR%% || true
-@unexec rmdir >/dev/null 2>&1 /var/log/fido || true
+@unexec rmdir "%%SPOOLDIR%%/toss/toss" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/toss/route" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/toss/pack" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/toss/bad" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/toss" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outrfc/news" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outrfc/mail" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outrfc" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outpkt/news" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outpkt/mail" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%/outpkt" >/dev/null 2>&1 || :
+@unexec rmdir "%%SPOOLDIR%%" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/tick" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/pin/tmpunpack" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/pin/bad" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/pin" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/in/tmpunpack" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/in/bad" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%/in" >/dev/null 2>&1 || :
+@unexec rmdir "%%BTBASEDIR%%" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/fido" >/dev/null 2>&1 || :
+@unexec rmdir "%%LOCKDIR%%" >/dev/null 2>&1 || :
+@unexec rmdir "%%LOGDIR%%" >/dev/null 2>&1 || :
+@unexec rmdir "/var/log/fido" >/dev/null 2>&1 || :
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index b14b08c13b62..f9b1d2352947 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	cups
 PORTVERSION=	1.7.1
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.cups.org/software/${DISTVERSION}/ \
 		EASYSW/${PORTNAME}/${DISTVERSION}
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index d40fa5d3240b..4941af5dd00f 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -897,13 +897,13 @@ share/locale/fr/cups_fr.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
 share/locale/ru/cups_ru.po
-@unexec rmdir >/dev/null 2>&1 /var/spool/cups/tmp || :
-@unexec rmdir >/dev/null 2>&1 /var/spool/cups || :
-@unexec rmdir >/dev/null 2>&1 /var/run/cups/certs || :
-@unexec rmdir >/dev/null 2>&1 /var/run/cups || :
-@unexec rmdir >/dev/null 2>&1 /var/log/cups || :
-@unexec rmdir >/dev/null 2>&1 /var/db/cups/rss || :
-@unexec rmdir >/dev/null 2>&1 /var/db/cups || :
+@unexec rmdir "/var/spool/cups/tmp" >/dev/null 2>&1 || :
+@unexec rmdir "/var/spool/cups" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/cups/certs" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/cups" >/dev/null 2>&1 || :
+@unexec rmdir "/var/log/cups" >/dev/null 2>&1 || :
+@unexec rmdir "/var/db/cups/rss" >/dev/null 2>&1 || :
+@unexec rmdir "/var/db/cups" >/dev/null 2>&1 || :
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/32x32/apps
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 881a38796cb6..fbcc7b4a3a09 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	snort
 PORTVERSION=	2.9.6.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/snort/snort \
 		http://mirrors.rit.edu/zi/
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index 53912c624239..8ca1e499c047 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -257,7 +257,7 @@ src/snort_dynamicsrc/stream_api.h
 src/snort_dynamicsrc/treenodes.h
 src/snort_dynamicsrc/util_unfold.c
 src/snort_dynamicsrc/util_unfold.h
-@unexec rmdir >/dev/null 2>&1 /var/log/snort || :
+@unexec rmdir "/var/log/snort" >/dev/null 2>&1 || :
 @dirrmtry src/snort_dynamicsrc
 @dirrmtry src
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 661a60d8347f..a59185839fff 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mnogosearch
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.mnogosearch.org/Download/ \
 		http://www.bayofrum.net/dist/${PORTNAME}/
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index a630e93a99ca..54e0c18911cc 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -81,5 +81,5 @@ lib/libmnogosearch.la
 lib/libmnogosearch.so
 man/man1/indexer.1.gz
 man/man5/indexer.conf.5.gz
-@unexec rmdir >/dev/null 2>&1 /var/mnogosearch || :
+@unexec rmdir "/var/mnogosearch" >/dev/null 2>&1 || :
 @dirrmtry %%ETCDIR%%
diff --git a/www/rt40/Makefile b/www/rt40/Makefile
index 1fb4e7f59695..aa89d03e7f81 100644
--- a/www/rt40/Makefile
+++ b/www/rt40/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	rt
 PORTVERSION=	4.0.19
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/ \
 		SF/requesttracker/
diff --git a/www/rt40/pkg-plist b/www/rt40/pkg-plist
index 8cf408e175b8..c182b30dd0f0 100644
--- a/www/rt40/pkg-plist
+++ b/www/rt40/pkg-plist
@@ -1466,12 +1466,12 @@ sbin/standalone_httpd
 @exec mkdir -p /var/run/rt40/mason_data/cache
 @exec chmod -R 0750 /var/run/rt40/session_data /var/run/rt40/mason_data
 @exec chown -R www:www /var/run/rt40/session_data /var/run/rt40/mason_data
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40/session_data || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40/mason_data/obj || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40/mason_data/etc || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40/mason_data/cache || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40/mason_data || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt40 || :
+@unexec rmdir "/var/run/rt40/session_data" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt40/mason_data/obj" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt40/mason_data/etc" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt40/mason_data/cache" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt40/mason_data" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt40" >/dev/null 2>&1 || :
 @dirrmtry www/rt40
 @dirrm %%DATADIR%%/po
 @exec mkdir -p %D/%%DATADIR%%/etc
diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index 92ddc02e3ec3..ebcab025da0d 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rt
 DISTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 PKGNAMESUFFIX=	42
diff --git a/www/rt42/pkg-plist b/www/rt42/pkg-plist
index 4a43c76cc870..ca614d42482d 100644
--- a/www/rt42/pkg-plist
+++ b/www/rt42/pkg-plist
@@ -1497,12 +1497,12 @@ sbin/standalone_httpd
 @exec mkdir -p /var/run/rt42/mason_data/cache
 @exec chmod -R 0750 /var/run/rt42/session_data /var/run/rt42/mason_data
 @exec chown -R www:www /var/run/rt42/session_data /var/run/rt42/mason_data
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42/session_data || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data/obj || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data/etc || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data/cache || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42/mason_data || :
-@unexec rmdir >/dev/null 2>&1 /var/run/rt42 || :
+@unexec rmdir "/var/run/rt42/session_data" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt42/mason_data/obj" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt42/mason_data/etc" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt42/mason_data/cache" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt42/mason_data" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/rt42" >/dev/null 2>&1 || :
 @dirrmtry www/rt42
 @dirrmtry %%DATADIR%%/static/js
 @dirrmtry %%DATADIR%%/static/images/tablesorter