From 10d63a94a97ccfa8ed87bbb189685811693e2574 Mon Sep 17 00:00:00 2001
From: will <will@FreeBSD.org>
Date: Thu, 12 Aug 2010 20:46:49 +0000
Subject: Fix buildworld -DNO_CLEAN when using with Perforce, which marks files
 as read-only by default, meaning files copied can't be overwritten next time.

Reviewed by:	imp
Approved by:	ken (mentor)
---
 gnu/lib/libreadline/history/Makefile      | 2 +-
 gnu/lib/libreadline/readline/doc/Makefile | 2 +-
 gnu/usr.bin/cvs/contrib/Makefile          | 2 +-
 gnu/usr.bin/gdb/doc/Makefile              | 4 ++--
 lib/libexpat/Makefile                     | 2 +-
 secure/lib/libcrypto/Makefile             | 4 ++--
 share/mk/sys.mk                           | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index 7c83496..1602872 100644
--- a/gnu/lib/libreadline/history/Makefile
+++ b/gnu/lib/libreadline/history/Makefile
@@ -8,7 +8,7 @@ MAN=    rlhistory.3
 SRCS= $(HISTSRC) xmalloc.c
 
 rlhistory.3: doc/history.3
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 
 CLEANFILES+= rlhistory.3
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index 42254de..7028971 100644
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -13,7 +13,7 @@ CLEANFILES += readline.texi
 readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
 
 readline.texi: rlman.texi
-	cp ${SRCDIR}/rlman.texi ${.TARGET}
+	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
 
 rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
 
diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index 5a8a8b52..2ac3618 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -24,7 +24,7 @@ Makefile:
 	@:
 
 .sh:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 
 .pl:
 	sed -e 's,xPERL_PATHx,$(PERLPATH),' ${.IMPSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/gdb/doc/Makefile b/gnu/usr.bin/gdb/doc/Makefile
index a09f66a..626f02d 100644
--- a/gnu/usr.bin/gdb/doc/Makefile
+++ b/gnu/usr.bin/gdb/doc/Makefile
@@ -20,11 +20,11 @@ GDBvn.texi: version.in
 	echo "@set GDBVN `sed q ${.ALLSRC}`" > ${.TARGET}
 
 inc-hist.texinfo: hsuser.texi inc-hist.diff
-	cp ${.ALLSRC:M*.texi} ${.TARGET}
+	cp -f ${.ALLSRC:M*.texi} ${.TARGET}
 	patch < ${.ALLSRC:M*.diff}
 
 rluser.texinfo: rluser.texi
-	cp ${.ALLSRC:M*.texi} ${.TARGET}
+	cp -f ${.ALLSRC:M*.texi} ${.TARGET}
 
 CLEANFILES= gdb-cfg.texi GDBvn.texi inc-hist.texinfo inc-hist.texinfo.orig \
 	rluser.texinfo
diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index ab9b0e8..9b641c1 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -30,6 +30,6 @@ bsdxml.h: expat.h
 		> ${.TARGET}
 
 bsdxml_external.h: expat_external.h
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 8a08589..212427f 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -355,13 +355,13 @@ buildinf.h: ${.CURDIR}/Makefile
 	echo "#endif" ) > ${.TARGET}
 
 opensslconf.h: opensslconf-${MACHINE_ARCH}.h
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 
 evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
 .if ${MK_IDEA} == "no"
 	sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
 .else
-	cp ${.ALLSRC} ${.TARGET}
+	cp -f ${.ALLSRC} ${.TARGET}
 .endif
 
 # No FIPS support for now
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 1131f31..dbd7fa0 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -167,7 +167,7 @@ YFLAGS		?=	-d
 		${CTFCONVERT} ${CTFFLAGS} ${.TARGET})
 
 .sh:
-	cp ${.IMPSRC} ${.TARGET}
+	cp -f ${.IMPSRC} ${.TARGET}
 	chmod a+x ${.TARGET}
 
 # DOUBLE SUFFIX RULES
@@ -225,7 +225,7 @@ YFLAGS		?=	-d
 # non-Posix rule set
 
 .sh:
-	cp -p ${.IMPSRC} ${.TARGET}
+	cp -fp ${.IMPSRC} ${.TARGET}
 	chmod a+x ${.TARGET}
 
 .c.ln:
-- 
cgit v1.1