Allows me to alias rm='rm -i' and make update-patches. While I'm
here, add -f to other mv and rm commands.
Okay?
-Ray-
Index: build/update-patches
===================================================================
RCS file: /cvs/ports/infrastructure/build/update-patches,v
retrieving revision 1.15
diff -u -r1.15 update-patches
--- build/update-patches 3 Feb 2007 17:08:13 -0000 1.15
+++ build/update-patches 3 May 2007 18:08:30 -0000
@@ -62,11 +62,11 @@
-I "^--- `echo $file$PATCHORIG | sed 's/[.+]/\\\\&/g'`
" \
-I "^\+\+\+ `echo $file | sed 's/[.+]/\\\\&/g'` " $i
$i.new 1>&2
then
- rm $i.new
+ rm -f $i.new
else
echo 1>&2 "Patch $i for $file updated"
- mv $i $i$PATCHORIG
- mv $i.new $i
+ mv -f $i $i$PATCHORIG
+ mv -f $i.new $i
edit="$edit $i"
fi
continue 2
Index: mk/bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.891
diff -u -r1.891 bsd.port.mk
--- mk/bsd.port.mk 8 Apr 2007 11:26:39 -0000 1.891
+++ mk/bsd.port.mk 3 May 2007 18:08:31 -0000
@@ -1763,7 +1763,7 @@
_refetch:
. for file cipher value in ${_PROBLEMS}
- @rm ${DISTDIR}/${file}
+ @rm -f ${DISTDIR}/${file}
@cd ${.CURDIR} && exec ${MAKE} ${DISTDIR}/${file} \
MASTER_SITE_OVERRIDE="ftp://ftp.openbsd.org/pub/OpenBSD/distfiles/${cipher}/${value}/";
. endfor
@@ -2454,13 +2454,13 @@
readme:
@tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap 'rm -r $$tmpdir' 0 1 2 3 13 15; \
+ trap 'rm -rf $$tmpdir' 0 1 2 3 13 15; \
cd ${.CURDIR} && ${MAKE} TMPDIR=$$tmpdir README_NAME=${README_NAME} \
${READMES_TOP}/${PKGPATH}/${FULLPKGNAME${SUBPACKAGE}}.html
readmes:
@tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap 'rm -r $$tmpdir' 0 1 2 3 13 15; \
+ trap 'rm -rf $$tmpdir' 0 1 2 3 13 15; \
cd ${.CURDIR} && ${MAKE} TMPDIR=$$tmpdir README_NAME=${README_NAME} \
${_READMES}
@@ -2806,8 +2806,8 @@
.for _CAT in ${CATEGORIES}
@linkname=${PORTSDIR}/${_CAT}/`basename ${.CURDIR}`; \
if [ -L $$linkname ]; then \
- echo "rm $$linkname"; \
- rm $$linkname; \
+ echo "rm -f $$linkname"; \
+ rm -f $$linkname; \
if rmdir ${PORTSDIR}/${_CAT} 2>/dev/null; then \
echo "rmdir ${PORTSDIR}/${_CAT}"; \
fi; \
Index: mk/bsd.port.subdir.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.subdir.mk,v
retrieving revision 1.83
diff -u -r1.83 bsd.port.subdir.mk
--- mk/bsd.port.subdir.mk 7 Apr 2007 09:55:13 -0000 1.83
+++ mk/bsd.port.subdir.mk 3 May 2007 18:08:31 -0000
@@ -155,7 +155,7 @@
readmes:
@DESCRIBE_TARGET=Yes; export DESCRIBE_TARGET; ${_subdir_fragment}
@tmpdir=`mktemp -d ${TMPDIR}/readme.XXXXXX`; \
- trap 'rm -r $$tmpdir' 0 1 2 3 13 15; \
+ trap 'rm -rf $$tmpdir' 0 1 2 3 13 15; \
cd ${.CURDIR} && ${MAKE} TMPDIR=$$tmpdir \
${READMES_TOP}/${PKGPATH}/README.html
@@ -177,7 +177,7 @@
-e '/%%DESCR%%/r${.CURDIR}/pkg/DESCR' -e '//d' \
-e '/%%SUBDIR%%/r${TMPDIR}/subdirs' -e '//d' \
${README} > $@
- @rm ${TMPDIR}/subdirs
+ @rm -f ${TMPDIR}/subdirs
.PHONY: all fetch package fake extract configure \
build describe distclean deinstall install update \
