Date: Wed, 3 Sep 2014 05:47:19 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367155 - head/Mk Message-ID: <201409030547.s835lJVh012879@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Sep 3 05:47:19 2014 New Revision: 367155 URL: http://svnweb.freebsd.org/changeset/ports/367155 QAT: https://qat.redports.org/buildarchive/r367155/ Log: Convert some @unexec to their proper equivalent in keyword Modified: head/Mk/bsd.gnome.mk head/Mk/bsd.ocaml.mk head/Mk/bsd.tex.mk head/Mk/bsd.xorg.mk Modified: head/Mk/bsd.gnome.mk ============================================================================== --- head/Mk/bsd.gnome.mk Wed Sep 3 05:33:10 2014 (r367154) +++ head/Mk/bsd.gnome.mk Wed Sep 3 05:47:19 2014 (r367155) @@ -910,7 +910,7 @@ gnome-post-install: . if defined(INSTALLS_ICONS) @${RM} -f ${TMPPLIST}.icons1 @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \ - ${ECHO_CMD} "@unexec /bin/rm %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@rmtry $${i}/icon-theme.cache" \ >> ${TMPPLIST}.icons1; \ ${ECHO_CMD} "@exec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ Modified: head/Mk/bsd.ocaml.mk ============================================================================== --- head/Mk/bsd.ocaml.mk Wed Sep 3 05:33:10 2014 (r367154) +++ head/Mk/bsd.ocaml.mk Wed Sep 3 05:47:19 2014 (r367155) @@ -130,7 +130,7 @@ ocaml-findlib: @${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} . endif - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}/${DIR}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ >> ${TMPPLIST} . endfor @@ -155,12 +155,10 @@ ocaml-ldconfig: .if defined(USE_OCAML_WASH) . if !target(ocaml-wash) ocaml-wash: - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR} 2>/dev/null || true"\ - >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}" >> ${TMPPLIST} # If ld.conf is empty - @${ECHO_CMD} "@unexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_LIBDIR} 2>/dev/null || true" \ - >> ${TMPPLIST} + @${ECHO_CMD} "@rmtry ${OCAML_LDCONF}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_LIBDIR}" >> ${TMPPLIST} . endif .endif @@ -186,7 +184,7 @@ ocaml-wash: add-plist-post: . if (${PREFIX} != ${LOCALBASE} && \ ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") - @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${PREFIX}" >> ${TMPPLIST} . else @${DO_NADA} . endif @@ -194,8 +192,7 @@ add-plist-post: # If we are using PORTDOCS macro port cannot delete OCAML_DOCSDIR, so # we shoud try to accomodate it . if defined(PORTDOCS) - @${ECHO_CMD} "@unexec rmdir ${OCAML_DOCSDIR} 2>/dev/null || true" \ - >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_DOCSDIR}" >> ${TMPPLIST} . endif .endif Modified: head/Mk/bsd.tex.mk ============================================================================== --- head/Mk/bsd.tex.mk Wed Sep 3 05:33:10 2014 (r367154) +++ head/Mk/bsd.tex.mk Wed Sep 3 05:47:19 2014 (r367155) @@ -192,8 +192,8 @@ do-texhash: @${ECHO_CMD} "@exec ${LOCALBASE}/bin/mktexlsr " \ "${TEXHASHDIRS:S,^,%D/,}" >> ${TMPPLIST} @for D in ${TEXHASHDIRS}; do \ - ${ECHO_CMD} "@unexec ${RM} -f %D/$$D/ls-R"; \ - ${ECHO_CMD} "@unexec ${RMDIR} %D/$$D 2> /dev/null || ${TRUE}"; \ + ${ECHO_CMD} "@rmtry $$D/ls-R"; \ + ${ECHO_CMD} "@dirmtry $$D"; \ done >> ${TMPPLIST} . else @${ECHO_CMD} "@exec for D in ${TEXHASHDIRS:S,^,${PREFIX}/,}; do " \ Modified: head/Mk/bsd.xorg.mk ============================================================================== --- head/Mk/bsd.xorg.mk Wed Sep 3 05:33:10 2014 (r367154) +++ head/Mk/bsd.xorg.mk Wed Sep 3 05:47:19 2014 (r367155) @@ -113,7 +113,7 @@ post-install: . elif ${NEED_MKFONTFOO} == yes @${ECHO_CMD} "@fontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} . else - @${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry %D/lib/X11/fonts/${_fontdir}" >> ${TMPPLIST} . endif . endfor .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409030547.s835lJVh012879>