diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 06:28:59 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 06:28:59 +0000 |
| commit | 186c2e326cb8f9a0f44b44cdbf6314e0999b346e (patch) | |
| tree | d6ef0b4cb3c1fa6a810fcdd9bfa232d1cf549823 /x11-themes | |
| parent | Back out previous commit, it was fixed in the master port (diff) | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Notes
Notes:
svn path=/head/; revision=154137
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 |