summaryrefslogtreecommitdiffstats
path: root/news
diff options
context:
space:
mode:
authoredwin <edwin@FreeBSD.org>2006-01-22 06:28:59 +0000
committeredwin <edwin@FreeBSD.org>2006-01-22 06:28:59 +0000
commit1677f97aa26c838254a6818de8cfcfd86c746dfb (patch)
tree2c27fc7a03a5b890cdd90d621e595a87209475e6 /news
parent9a0941e0406efa462ec7e72b9a3422d5f60a1506 (diff)
downloadFreeBSD-ports-1677f97aa26c838254a6818de8cfcfd86c746dfb.zip
FreeBSD-ports-1677f97aa26c838254a6818de8cfcfd86c746dfb.tar.gz
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Diffstat (limited to 'news')
-rw-r--r--news/papercut/pkg-plist6
-rw-r--r--news/tin/pkg-plist4
2 files changed, 4 insertions, 6 deletions
diff --git a/news/papercut/pkg-plist b/news/papercut/pkg-plist
index 117bd3e..6e0d0c9 100644
--- a/news/papercut/pkg-plist
+++ b/news/papercut/pkg-plist
@@ -49,9 +49,7 @@ bin/papercut
@unexec [ -f %D/%%DATADIR%%/storage/phpbb_mysql.pyc ] && rm %D/%%DATADIR%%/storage/phpbb_mysql.pyc || true
@unexec [ -f %D/%%DATADIR%%/storage/strutil.pyc ] && rm %D/%%DATADIR%%/storage/strutil.pyc || true
@dirrm %%DATADIR%%/auth
-@unexec [ -d %D/%%DATADIR%%/cache ] && rmdir %%DATADIR%%/cache 2>/dev/null || true
-@unexec [ -d %D/%%DATADIR%%/logs ] && rmdir %%DATADIR%%/logs 2>/dev/null || true
@dirrm %%DATADIR%%/storage
-@unexec rmdir %D/%%DATADIR%%/cache || true
-@unexec rmdir %D/%%DATADIR%%/logs || true
+@dirrmtry %%DATADIR%%/cache
+@dirrmtry %%DATADIR%%/logs
@unexec rmdir %D/%%DATADIR%% 2> /dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf %D/%%DATADIR%%`` to remove any files left." | fmt
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 6b1d0f2..9e82296 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -19,5 +19,5 @@ share/locale/fr/LC_MESSAGES/tin.mo
share/locale/ru/LC_MESSAGES/tin.mo
share/locale/rw/LC_MESSAGES/tin.mo
share/locale/tr/LC_MESSAGES/tin.mo
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES > /dev/null 2>&1 || true
-@unexec rmdir %D/share/locale/rw > /dev/null 2>&1 || true
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
OpenPOWER on IntegriCloud