make _PATCH_BACKUP_ARG be more useful to callers by moving "-V simple"

definition to be part of it instead of appending to PATCH_ARGS.
otherwise, $VERSION_CONTROL or $PATCH_VERSION_CONTROL would still
override -b/-z.

5 files changed, 10 insertions, 10 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 03a91befbf4..309dde3c2f7 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.946 2002/03/13 15:39:36 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.947 2002/03/14 02:28:22 lukem Exp $
 #
 # This file is in the public domain.
 #
@@ -356,7 +356,7 @@ PATCH_DIST_ARGS?=	-d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP}
 PATCH_ARGS+=		--batch
 PATCH_DIST_ARGS+=	--batch
 .endif
-PATCH_ARGS+=		-V simple ${_PATCH_BACKUP_ARG} .orig
+PATCH_ARGS+=		${_PATCH_BACKUP_ARG} .orig
 PATCH_FUZZ_FACTOR?=	-F0			# Default to zero fuzz
 
 EXTRACT_SUFX?=		.tar.gz
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 7c78e4e475c..fd3c6bb1eac 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.19 2002/03/11 12:48:52 yyamano Exp $
+# $NetBSD: defs.Darwin.mk,v 1.20 2002/03/14 02:28:23 lukem Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -73,7 +73,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_PATCH_BACKUP_ARG=	-b -z	# switch to patch(1) for backup file
+_PATCH_BACKUP_ARG=	-V simple -b -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		no	# don't add rpath to LDFLAGS
 
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index c34c21794ff..c64ef60f666 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.23 2002/02/27 04:41:22 yyamano Exp $
+# $NetBSD: defs.Linux.mk,v 1.24 2002/03/14 02:28:23 lukem Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -77,7 +77,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_PATCH_BACKUP_ARG= 	-z	# switch to patch(1) for backup file
+_PATCH_BACKUP_ARG= 	-V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 42946ae6819..06c39a21d5c 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.22 2002/02/27 04:41:23 yyamano Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.23 2002/03/14 02:28:23 lukem Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -79,7 +79,7 @@ _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
-_PATCH_BACKUP_ARG=	-b	# switch to patch(1) to provide a backup file
+_PATCH_BACKUP_ARG=	-V simple -b 	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	cat	# directory where catman pages are
 _USE_RPATH=		yes	# add rpath to LDFLAGS
 
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 4b3f5a18943..69330ac34a8 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.21 2002/02/27 04:41:23 yyamano Exp $
+# $NetBSD: defs.SunOS.mk,v 1.22 2002/03/14 02:28:23 lukem Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -82,7 +82,7 @@ _IMAKE_MAKE=	/usr/ccs/bin/make	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
-_PATCH_BACKUP_ARG= 	-z		# switch to patch(1) for backup file
+_PATCH_BACKUP_ARG= 	-V simple -z	# switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR=	man		# directory where catman pages are
 _USE_RPATH=		yes		# add rpath to LDFLAGS