aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--databases/firebird-server/pkg-plist8
-rw-r--r--databases/firebird2-server/pkg-plist8
-rw-r--r--databases/firebird20-server/pkg-plist8
-rw-r--r--databases/gnats4/pkg-plist2
-rw-r--r--databases/libudbc/pkg-plist2
-rw-r--r--databases/metakit/pkg-plist2
-rw-r--r--databases/oracle7-client/pkg-plist2
-rw-r--r--databases/py-axiom/pkg-plist2
-rw-r--r--deskutils/gcal/pkg-plist20
9 files changed, 27 insertions, 27 deletions
diff --git a/databases/firebird-server/pkg-plist b/databases/firebird-server/pkg-plist
index 0667577533bd..efb6250c2e01 100644
--- a/databases/firebird-server/pkg-plist
+++ b/databases/firebird-server/pkg-plist
@@ -26,9 +26,9 @@ sbin/gds_drop
@exec [ -f %D/%%LOCALSTATEDIR%%/security.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security.fdb
%%LOCALSTATEDIR%%/RELNOTES
%%LOCALSTATEDIR%%/help/help.fdb
-@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/firebird.log
+@rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_init1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_lock1.`hostname`
@dirrm %%LOCALSTATEDIR%%/help
@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/firebird2-server/pkg-plist b/databases/firebird2-server/pkg-plist
index 096c66efee82..400054ec22f0 100644
--- a/databases/firebird2-server/pkg-plist
+++ b/databases/firebird2-server/pkg-plist
@@ -27,9 +27,9 @@ libexec/firebird/udf/ib_udf2.sql
%%LOCALSTATEDIR%%/security2.fdb.sample
@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
%%LOCALSTATEDIR%%/help/help.fdb
-@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/firebird.log
+@rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_init1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_lock1.`hostname`
@dirrm %%LOCALSTATEDIR%%/help
@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/firebird20-server/pkg-plist b/databases/firebird20-server/pkg-plist
index 096c66efee82..400054ec22f0 100644
--- a/databases/firebird20-server/pkg-plist
+++ b/databases/firebird20-server/pkg-plist
@@ -27,9 +27,9 @@ libexec/firebird/udf/ib_udf2.sql
%%LOCALSTATEDIR%%/security2.fdb.sample
@exec [ -f %D/%%LOCALSTATEDIR%%/security2.fdb ] || cp %D/%F %D/%%LOCALSTATEDIR%%/security2.fdb
%%LOCALSTATEDIR%%/help/help.fdb
-@unexec [ -s %D/%%LOCALSTATEDIR%%/firebird.log ] || rm -f %D/%%LOCALSTATEDIR%%/firebird.log
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_event1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_init1.`hostname`
-@unexec rm -f %D/%%LOCALSTATEDIR%%/isc_lock1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/firebird.log
+@rmtry %%LOCALSTATEDIR%%/isc_event1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_init1.`hostname`
+@rmtry %%LOCALSTATEDIR%%/isc_lock1.`hostname`
@dirrm %%LOCALSTATEDIR%%/help
@dirrmtry %%LOCALSTATEDIR%%
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index 95885edd0678..365088c4eb33 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -40,7 +40,7 @@ libexec/gnats/pr-edit
@dirrm libexec/gnats
@exec mkdir -p %%GNATSDBDIR%%
@exec chown gnats %%GNATSDBDIR%%
-@unexec rmdir %%GNATSDBDIR%% 2>/dev/null || true
+@dirrmtry %%GNATSDBDIR%%
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/libudbc/pkg-plist b/databases/libudbc/pkg-plist
index a90c746a6c2d..5a0ecbe85c05 100644
--- a/databases/libudbc/pkg-plist
+++ b/databases/libudbc/pkg-plist
@@ -11,7 +11,7 @@ lib/libudbc.a
lib/libudbc.la
lib/libudbc.so
@exec ln %D/lib/libudbc.so %D/lib/libudbc.so.3
-@unexec rm %D/lib/libudbc.so.3
+@rmtry lib/libudbc.so.3
%%PORTDOCS%%share/doc/libudbc/udbc.doc
%%PORTDOCS%%share/doc/libudbc/udbc.ini.sample
%%PORTDOCS%%share/examples/libudbc/Makefile
diff --git a/databases/metakit/pkg-plist b/databases/metakit/pkg-plist
index 605ad747a0e5..f41cd7b8405f 100644
--- a/databases/metakit/pkg-plist
+++ b/databases/metakit/pkg-plist
@@ -6,7 +6,7 @@ lib/libmk4.a
lib/libmk4.la
lib/libmk4.so.0
@exec ln -s libmk4.so.0 %D/lib/libmk4.so
-@unexec rm -f %D/lib/libmk4.so
+@rmtry lib/libmk4.so
%%WITH_PYTHON%%lib/libmk4py.a
%%WITH_PYTHON%%lib/libmk4py.so
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/Mk4py.so
diff --git a/databases/oracle7-client/pkg-plist b/databases/oracle7-client/pkg-plist
index 97dd554af7b9..bef89b0efccc 100644
--- a/databases/oracle7-client/pkg-plist
+++ b/databases/oracle7-client/pkg-plist
@@ -1770,7 +1770,7 @@
%%ORACLE_PREFIX%%/rdbms/lib.old/config.o
%%ORACLE_PREFIX%%/rdbms/lib.old/sysliblist
@exec ln -s rdbms/lib %D/%%ORACLE_PREFIX%%/lib
-@unexec rm -f %D/%%ORACLE_PREFIX%%/lib
+@rmtry %%ORACLE_PREFIX%%/lib
@dirrm %%ORACLE_PREFIX%%/network/admin
@dirrm %%ORACLE_PREFIX%%/network
@dirrm %%ORACLE_PREFIX%%/ocommon/install
diff --git a/databases/py-axiom/pkg-plist b/databases/py-axiom/pkg-plist
index 00d897c2c18e..97c564463f9d 100644
--- a/databases/py-axiom/pkg-plist
+++ b/databases/py-axiom/pkg-plist
@@ -303,7 +303,7 @@ bin/axiomatic
%%PYTHON_SITELIBDIR%%/axiom/userbase.py
%%PYTHON_SITELIBDIR%%/axiom/userbase.pyc
%%PYTHON_SITELIBDIR%%/axiom/userbase.pyo
-@unexec rm -f %D/%%PYTHON_SITELIBDIR%%/axiom/plugins/dropin.cache || true
+@rmtry %%PYTHON_SITELIBDIR%%/axiom/plugins/dropin.cache
@dirrm %%PYTHON_SITELIBDIR%%/axiom/benchmarks
@dirrm %%PYTHON_SITELIBDIR%%/axiom/examples
@dirrm %%PYTHON_SITELIBDIR%%/axiom/plugins
diff --git a/deskutils/gcal/pkg-plist b/deskutils/gcal/pkg-plist
index aed1110bba63..5a1546f75ff0 100644
--- a/deskutils/gcal/pkg-plist
+++ b/deskutils/gcal/pkg-plist
@@ -45,54 +45,54 @@ bin/txt2gcal
%%DATADIR%%/misc/README
%%DATADIR%%/misc/daily/daily
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/daily/daily.awk
%%DATADIR%%/misc/daily/daily.pl
%%DATADIR%%/misc/daily/daily.rc
%%DATADIR%%/misc/ddiff/ddiff
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/ddiff/ddiff1.awk
%%DATADIR%%/misc/ddiff/ddiff1.pl
%%DATADIR%%/misc/ddiff/ddiff2.awk
%%DATADIR%%/misc/ddiff/ddiff2.pl
%%DATADIR%%/misc/ddiff/ddiffdrv
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/ddiff/ddiffdrv.awk
%%DATADIR%%/misc/ddiff/ddiffdrv.pl
%%DATADIR%%/misc/ddiff/zone.tab
%%DATADIR%%/misc/dst/dst
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/dst/dst.awk
%%DATADIR%%/misc/dst/dst.pl
%%DATADIR%%/misc/gcalltx/gcalltx
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/gcalltx/gcalltx.pl
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/gcalltx/gcalltx.sed
%%DATADIR%%/misc/gcalmagic.add
%%DATADIR%%/misc/moon/moon
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/mrms/mrms
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/mrms/mrms.awk
%%DATADIR%%/misc/mrms/mrms.pl
%%DATADIR%%/misc/mrms/mrms.rc
%%DATADIR%%/misc/srss/srss
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/srss/srss.awk
%%DATADIR%%/misc/srss/srss.pl
%%DATADIR%%/misc/srss/srss.rc
%%DATADIR%%/misc/wloc/wlocdrv
@exec ln -fs ../%F %D/bin/gcal-%f
-@unexec rm -f %D/bin/gcal-%f
+@rmtry bin/gcal-%f
%%DATADIR%%/misc/wloc/wlocdrv1.awk
%%DATADIR%%/misc/wloc/wlocdrv1.pl
%%DATADIR%%/misc/wloc/wlocdrv2.awk