[pkgsrc/trunk]: pkgsrc/mk Allow _PATCH_BACKUP_ARG to be overridden in /etc/mk...

[heinz <heinz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5ba497e2662
branches:  trunk
changeset: 464867:c5ba497e2662
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Tue Dec 16 22:54:13 2003 +0000

description:
Allow _PATCH_BACKUP_ARG to be overridden in /etc/mk.conf (in order to use different patch programs). Ok by agc

diffstat:

 mk/defs.AIX.mk     |  4 ++--
 mk/defs.BSDOS.mk   |  4 ++--
 mk/defs.Darwin.mk  |  4 ++--
 mk/defs.FreeBSD.mk |  4 ++--
 mk/defs.IRIX.mk    |  4 ++--
 mk/defs.Linux.mk   |  4 ++--
 mk/defs.NetBSD.mk  |  4 ++--
 mk/defs.OpenBSD.mk |  6 +++---
 mk/defs.SunOS.mk   |  4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diffs (165 lines):

diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.AIX.mk
--- a/mk/defs.AIX.mk    Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.AIX.mk    Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.1 2003/12/03 17:57:33 erh Exp $
+# $NetBSD: defs.AIX.mk,v 1.2 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -153,7 +153,7 @@
 _OPSYS_PTHREAD_AUTO=   no      # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -b -V simple -z         # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -b -V simple -z         # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            yes     # add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.BSDOS.mk
--- a/mk/defs.BSDOS.mk  Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.BSDOS.mk  Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.2 2003/12/11 22:42:17 reed Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.3 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -139,7 +139,7 @@
 _OPSYS_PTHREAD_AUTO=   no      # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -V simple -b -z # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -b -z # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            yes     # add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.Darwin.mk Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.62 2003/12/04 06:07:49 grant Exp $
+# $NetBSD: defs.Darwin.mk,v 1.63 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -122,7 +122,7 @@
 _OPSYS_PTHREAD_AUTO=   yes     # -lpthread not needed for pthreads
 _OPSYS_RPATH_NAME=     -L      # darwin has no rpath, use -L instead
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -V simple -b -z # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -b -z # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            no      # don't add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk        Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.FreeBSD.mk        Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.26 2003/10/26 00:07:31 grant Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.27 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -137,7 +137,7 @@
 _OPSYS_PTHREAD_AUTO=   no      # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -V simple -b    # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -b    # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            yes     # add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.IRIX.mk
--- a/mk/defs.IRIX.mk   Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.IRIX.mk   Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.37 2003/10/19 07:38:31 grant Exp $
+# $NetBSD: defs.IRIX.mk,v 1.38 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -133,7 +133,7 @@
 _OPSYS_RPATH_NAME=     -rpath,         # name of symbol in rpath directive to linker 
 .if defined(_OPSYS_GPATCH_REQD) && ${_OPSYS_GPATCH_REQD} == "YES"
 _PATCH_CAN_BACKUP=     yes             # patch(1) can make backups
-_PATCH_BACKUP_ARG=     -b -V simple -z # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -b -V simple -z # switch to patch(1) for backup suffix
 .else
 _PATCH_CAN_BACKUP=     no              # native patch(1) can make backups
 .endif
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.Linux.mk
--- a/mk/defs.Linux.mk  Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.Linux.mk  Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.61 2003/10/19 06:54:17 grant Exp $
+# $NetBSD: defs.Linux.mk,v 1.62 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -167,7 +167,7 @@
 _OPSYS_PTHREAD_AUTO=   no      # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -b -V simple -z # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -b -V simple -z # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            yes     # add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.NetBSD.mk Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.56 2003/12/10 13:37:48 grant Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.57 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -135,7 +135,7 @@
 _OPSYS_PTHREAD_AUTO=   no      # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -V simple -b    # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -b    # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
 _USE_RPATH=            yes     # add rpath to LDFLAGS
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk        Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.OpenBSD.mk        Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.25 2003/09/24 06:26:21 itojun Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.26 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -128,9 +128,9 @@
 _OPSYS_RPATH_NAME=     -R      # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes     # native patch(1) can make backups
 .if ${OS_VERSION} >= 3.4
-_PATCH_BACKUP_ARG=     -V simple -z    # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -z    # switch to patch(1) for backup suffix
 .else
-_PATCH_BACKUP_ARG=     -V simple -b    # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -V simple -b    # switch to patch(1) for backup suffix
 .endif
 _PREFORMATTED_MAN_DIR= cat     # directory where catman pages are
 _USE_GNU_GETTEXT=      no      # Don't use GNU gettext
diff -r b773f8d2c013 -r c5ba497e2662 mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Tue Dec 16 22:54:01 2003 +0000
+++ b/mk/defs.SunOS.mk  Tue Dec 16 22:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.72 2003/10/19 07:38:31 grant Exp $
+# $NetBSD: defs.SunOS.mk,v 1.73 2003/12/16 22:54:13 heinz Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -129,7 +129,7 @@
 _OPSYS_PTHREAD_AUTO=   no              # -lpthread needed for pthreads
 _OPSYS_RPATH_NAME=     -R              # name of symbol in rpath directive to linker 
 _PATCH_CAN_BACKUP=     yes             # native patch(1) can make backups
-_PATCH_BACKUP_ARG=     -b -V simple -z # switch to patch(1) for backup suffix
+_PATCH_BACKUP_ARG?=    -b -V simple -z # switch to patch(1) for backup suffix
 _PREFORMATTED_MAN_DIR= man             # directory where catman pages are
 _USE_GNU_GETTEXT=      yes             # Use GNU gettext
 _USE_RPATH=            yes             # add rpath to LDFLAGS