diff options
author | edwin <edwin@FreeBSD.org> | 2006-01-22 14:28:59 +0800 |
---|---|---|
committer | edwin <edwin@FreeBSD.org> | 2006-01-22 14:28:59 +0800 |
commit | 1677f97aa26c838254a6818de8cfcfd86c746dfb (patch) | |
tree | 2c27fc7a03a5b890cdd90d621e595a87209475e6 /x11-themes | |
parent | 9a0941e0406efa462ec7e72b9a3422d5f60a1506 (diff) | |
download | freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.tar.gz freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.tar.zst freebsd-ports-gnome-1677f97aa26c838254a6818de8cfcfd86c746dfb.zip |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Diffstat (limited to 'x11-themes')
-rw-r--r-- | x11-themes/gtk-bluecurve-theme/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/icon-bluecurve-theme/Makefile | 2 | ||||
-rw-r--r-- | x11-themes/kde-icons-noia/Makefile.icons | 3 | ||||
-rw-r--r-- | x11-themes/linux-gtk-bluecurve-theme/Makefile | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/x11-themes/gtk-bluecurve-theme/Makefile b/x11-themes/gtk-bluecurve-theme/Makefile index 32781a9bd192..3d1271bffea2 100644 --- a/x11-themes/gtk-bluecurve-theme/Makefile +++ b/x11-themes/gtk-bluecurve-theme/Makefile @@ -63,7 +63,7 @@ pre-install: @${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}/${GTK${v}_RCDIR}" >> ${PLIST} . endfor .endfor - @${ECHO_CMD} "@unexec rmdir %D/share/themes/Bluecurve 2>/dev/null || true" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry share/themes/Bluecurve" >> ${PLIST} .for s in ${EXTRA_STYLES} @${ECHO_CMD} "@dirrm share/themes/Bluecurve-${s}" >> ${PLIST} .endfor diff --git a/x11-themes/icon-bluecurve-theme/Makefile b/x11-themes/icon-bluecurve-theme/Makefile index 991557217b5b..1c0504991607 100644 --- a/x11-themes/icon-bluecurve-theme/Makefile +++ b/x11-themes/icon-bluecurve-theme/Makefile @@ -44,6 +44,6 @@ do-build: pre-install: @${ECHO_CMD} "@dirrm share/icons/Bluecurve" >> ${PLIST} - @${ECHO_CMD} "@unexec rmdir %D/share/icons 2>/dev/null || true" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry share/icons" >> ${PLIST} .include "${MASTERDIR}/Makefile" diff --git a/x11-themes/kde-icons-noia/Makefile.icons b/x11-themes/kde-icons-noia/Makefile.icons index 4f4003c3ed25..1207eb898181 100644 --- a/x11-themes/kde-icons-noia/Makefile.icons +++ b/x11-themes/kde-icons-noia/Makefile.icons @@ -86,8 +86,7 @@ generate-tmpplist: -e 's|^\.|@dirrm share/icons/${PORT_SHAREDIR:S/"//g}|' \ >> ${TMPPLIST} @${ECHO_CMD} \ - '@unexec rmdir %D/share/icons 2>/dev/null || true' \ - >> ${TMPPLIST} + '@dirrmtry share/icons' >> ${TMPPLIST} # use generated installation scripts install-run-scripts: diff --git a/x11-themes/linux-gtk-bluecurve-theme/Makefile b/x11-themes/linux-gtk-bluecurve-theme/Makefile index d0ed4d5b425c..c187f4c346ca 100644 --- a/x11-themes/linux-gtk-bluecurve-theme/Makefile +++ b/x11-themes/linux-gtk-bluecurve-theme/Makefile @@ -34,7 +34,7 @@ pre-install: .for v in 1 2 @${ECHO_CMD} '${GTK${v}_ENGINEDIR}/libbluecurve.so' >> ${PLIST} . for d in ${GTK${v}_ENGINEDIRS} - @${ECHO_CMD} '@unexec rmdir %D/${d} 2>/dev/null || true' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry ${d}' >> ${PLIST} . endfor . for t in ${THEMES} @${ECHO_CMD} 'usr/share/themes/${t}/${GTK${v}_RCDIR}/gtkrc' >> ${PLIST} @@ -44,7 +44,7 @@ pre-install: .for t in ${THEMES} @${ECHO_CMD} '@dirrm usr/share/themes/${t}' >> ${PLIST} .endfor - @${ECHO_CMD} '@unexec rmdir %D/usr/share/themes 2>/dev/null || true' >> ${PLIST} + @${ECHO_CMD} '@dirrmtry usr/share/themes' >> ${PLIST} do-install: .for v in 1 2 |