8 files changed, 19 insertions, 19 deletions
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index 3ff94de0eee9..431509717235 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -1,18 +1,18 @@
 %%INSTDIR%%/%%OPSYS%%/cvpcb
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/eeschema
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/gerbview
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/kicad
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/pcbnew
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/plugins/netlist_form_pads-pcb
 %%INSTDIR%%/INSTALL.txt
 %%INSTDIR%%/author.txt
diff --git a/cad/kicad/pkg-plist b/cad/kicad/pkg-plist
index 3ff94de0eee9..431509717235 100644
--- a/cad/kicad/pkg-plist
+++ b/cad/kicad/pkg-plist
@@ -1,18 +1,18 @@
 %%INSTDIR%%/%%OPSYS%%/cvpcb
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/eeschema
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/gerbview
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/kicad
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/pcbnew
 @exec ln -sf %D/%F %D/bin
-@unexec rm %D/bin/%f 2>&1 >/dev/null || true
+@rmtry bin/%f
 %%INSTDIR%%/%%OPSYS%%/plugins/netlist_form_pads-pcb
 %%INSTDIR%%/INSTALL.txt
 %%INSTDIR%%/author.txt
diff --git a/cad/linux-eagle/pkg-plist b/cad/linux-eagle/pkg-plist
index 3bde8ae25580..0fbb0adbbfe6 100644
--- a/cad/linux-eagle/pkg-plist
+++ b/cad/linux-eagle/pkg-plist
@@ -813,7 +813,7 @@ share/eagle/ulp/unidat.ulp
 share/eagle/ulp/update-packages.ulp
 share/eagle/ulp/useful-routines.ulp
 share/eagle/ulp/warning.bmp
-@unexec rm -f %D/share/eagle/bin/eagle.key || true
+@rmtry share/eagle/bin/eagle.key
 @dirrm share/eagle/ulp
 @dirrm share/eagle/scr
 @dirrm share/eagle/projects/examples/tutorial
diff --git a/cad/linux-eagle5/pkg-plist b/cad/linux-eagle5/pkg-plist
index 3bde8ae25580..0fbb0adbbfe6 100644
--- a/cad/linux-eagle5/pkg-plist
+++ b/cad/linux-eagle5/pkg-plist
@@ -813,7 +813,7 @@ share/eagle/ulp/unidat.ulp
 share/eagle/ulp/update-packages.ulp
 share/eagle/ulp/useful-routines.ulp
 share/eagle/ulp/warning.bmp
-@unexec rm -f %D/share/eagle/bin/eagle.key || true
+@rmtry share/eagle/bin/eagle.key
 @dirrm share/eagle/ulp
 @dirrm share/eagle/scr
 @dirrm share/eagle/projects/examples/tutorial
diff --git a/cad/opencascade/pkg-plist b/cad/opencascade/pkg-plist
index eb5c92a6400f..d1cc110cec7c 100644
--- a/cad/opencascade/pkg-plist
+++ b/cad/opencascade/pkg-plist
@@ -45970,10 +45970,10 @@ lib/libwokutilscmd.so.0
 %%OCCROOT%%/wok/site/wokinit.csh
 %%OCCROOT%%/wok/wok_entities/ATLIST
 @comment "The following entities only exist if wokinit.csh has been run."
-@unexec rm %D%/OpenCAS/wok/wok_entities/DEFAULT.edl 2>/dev/null || true
-@unexec rm %D%/OpenCAS/wok/wok_entities/OS.edl 2>/dev/null || true
-@unexec rm %D%/OpenCAS/wok/wok_entities/OS/adm/WSLIST 2>/dev/null || true
-@unexec rm %D%/OpenCAS/wok/wok_entities/WOKSESSION.edl 2>/dev/null || true
+@rmtry OpenCAS/wok/wok_entities/DEFAULT.edl
+@rmtry OpenCAS/wok/wok_entities/OS.edl
+@rmtry OpenCAS/wok/wok_entities/OS/adm/WSLIST
+@rmtry OpenCAS/wok/wok_entities/WOKSESSION.edl
 @dirrmtry %%OCCROOT%%/wok/wok_entities/OS/adm
 @dirrmtry %%OCCROOT%%/wok/wok_entities/OS/SCCS
 @dirrmtry %%OCCROOT%%/wok/wok_entities/OS
diff --git a/chinese/pine4/pkg-plist b/chinese/pine4/pkg-plist
index c61c31719a81..7a825dfc85a5 100644
--- a/chinese/pine4/pkg-plist
+++ b/chinese/pine4/pkg-plist
@@ -1,6 +1,6 @@
 @unexec %D/bin/pine -conf >%D/etc/pine.conf.tmp
 @unexec if cmp -s %D/etc/pine.conf %D/etc/pine.conf.tmp; then rm -f %D/etc/pine.conf; fi
-@unexec rm -f %D/etc/pine.conf.tmp
+@rmtry etc/pine.conf.tmp
 bin/pgpdecode
 bin/pgpencrypt
 bin/pgpsign
diff --git a/chinese/xpdf/pkg-plist b/chinese/xpdf/pkg-plist
index d4e992f6b9b6..d5c4a0b0d6b8 100644
--- a/chinese/xpdf/pkg-plist
+++ b/chinese/xpdf/pkg-plist
@@ -10,7 +10,7 @@
 @unexec cp %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
 @unexec grep -F -v --file=%D/%%DATADIR%%/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
 %%DATADIR%%/chinese-traditional/dot.xpdfrc
-@unexec rm -f %D/etc/xpdfrc.chinese-traditional
+@rmtry etc/xpdfrc.chinese-traditional
 @dirrm %%DATADIR%%/chinese-simplified
 @dirrm %%DATADIR%%/chinese-traditional
 @dirrmtry %%DATADIR%%
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 9f9edf470a3b..408e726af7a5 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -63,7 +63,7 @@ hylafax/COPYRIGHT
 @exec mkfifo %D/hylafax/FIFO
 @exec chown uucp:dialer %D/hylafax/FIFO
 @exec chmod 0600 %D/hylafax/FIFO
-@unexec rm %D/hylafax/FIFO 2>&1 >/dev/null || true
+@rmtry hylafax/FIFO
 @exec mkdir %D/hylafax/archive
 @exec chown uucp:dialer %D/hylafax/archive
 @exec chmod 0700 %D/hylafax/archive