diff options
| author | agc <agc@pkgsrc.org> | 2001-11-21 13:09:08 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2001-11-21 13:09:08 +0000 |
| commit | 715864dc96fbdf1d7ed6d1fc790e9791670f5e50 (patch) | |
| tree | b9d09b5c15390689a2a602b8dfff3a821368264b /mk | |
| parent | b9a41cdc6b8de32437931bb3da952ea1aff77772 (diff) | |
| download | pkgsrc-715864dc96fbdf1d7ed6d1fc790e9791670f5e50.tar.gz | |
Add a _PATCH_BACKUP_ARG definition to the individual defs.${OPSYS}.mk files,
and use it in bsd.pkg.mk. This definition is the switch to patch(1) to
provide backup files when patching.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 | ||||
| -rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
| -rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
| -rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 3 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9168db99ed4..5c0ccf3c219 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.855 2001/11/21 13:02:52 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.856 2001/11/21 13:09:08 agc Exp $ # # This file is in the public domain. # @@ -369,11 +369,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} PATCH_ARGS+= --batch PATCH_DIST_ARGS+= --batch .endif -.if (${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "Darwin") -PATCH_ARGS+= -V simple -z .orig -.else -PATCH_ARGS+= -V simple -b .orig -.endif +PATCH_ARGS+= -V simple ${_PATCH_BACKUP_ARG} .orig PATCH_FUZZ_FACTOR?= -F0 # Default to zero fuzz # If the distfile has a tar.bz2 suffix, use bzcat in preference to gzcat, diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index 5f501acd160..5ed5fe152eb 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.8 2001/11/21 13:02:53 agc Exp $ +# $NetBSD: defs.Darwin.mk,v 1.9 2001/11/21 13:09:09 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -61,4 +61,5 @@ ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake +_PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= no # don't add rpath to LDFLAGS diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 40d1be4fe53..4df4cddd843 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.14 2001/11/21 13:02:53 agc Exp $ +# $NetBSD: defs.Linux.mk,v 1.15 2001/11/21 13:09:09 agc Exp $ # # Variable definitions for the Linux operating system. @@ -65,4 +65,5 @@ ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= no # perform checks for valid libintl _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake +_PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index c95103e86bb..d99d731d497 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.12 2001/11/21 13:02:53 agc Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.13 2001/11/21 13:09:09 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -70,4 +70,5 @@ ROOT_GROUP?= wheel _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _IMAKE_MAKE= ${MAKE} # program which gets invoked by imake +_PATCH_BACKUP_ARG= -b # switch to patch(1) to provide a backup file _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 110494c08bf..a64fc755fc3 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.11 2001/11/21 13:02:53 agc Exp $ +# $NetBSD: defs.SunOS.mk,v 1.12 2001/11/21 13:09:09 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -72,4 +72,5 @@ ROOT_GROUP?= root _DO_LIBINTL_CHECKS= yes # perform checks for valid libintl _IMAKE_MAKE= /usr/ccs/bin/make # program which gets invoked by imake +_PATCH_BACKUP_ARG= -z # switch to patch(1) for backup file _USE_RPATH= yes # add rpath to LDFLAGS |