diff options
author | agc <agc@pkgsrc.org> | 2002-12-03 19:24:26 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2002-12-03 19:24:26 +0000 |
commit | 1418b13a8084c9e9eb7be44a48c03246eb50ee5e (patch) | |
tree | 24239a50380d75349efa578fa61c313e54319482 /mk | |
parent | 642c8c8176b382464f0cc7d87cb02eed07975e1b (diff) | |
download | pkgsrc-1418b13a8084c9e9eb7be44a48c03246eb50ee5e.tar.gz |
Use ${_PATCH_CAN_BACKUP} rather than hardcoding an OPSYS value into
the logic for doing backups when applying patches, and set the value
accordingly in the opsys-dependent defs file.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
-rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
-rw-r--r-- | mk/defs.FreeBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.IRIX.mk | 3 | ||||
-rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
-rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.OpenBSD.mk | 3 | ||||
-rw-r--r-- | mk/defs.SunOS.mk | 3 |
8 files changed, 16 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index af5df6105fa..55a86eaa368 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1097 2002/12/03 19:17:33 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1098 2002/12/03 19:24:26 agc Exp $ # # This file is in the public domain. # @@ -401,7 +401,7 @@ PATCH_DIST_ARGS?= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} PATCH_ARGS+= --batch PATCH_DIST_ARGS+= --batch .endif -.if ${OPSYS} != "IRIX" +.if ${_PATCH_CAN_BACKUP} == "yes" PATCH_ARGS+= ${_PATCH_BACKUP_ARG} .orig PATCH_DIST_ARGS+= ${_PATCH_BACKUP_ARG} .orig .endif diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index ed2412e89ab..a2266eed4d3 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.35 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.Darwin.mk,v 1.36 2002/12/03 19:24:27 agc Exp $ # # Variable definitions for the Darwin operating system. @@ -84,6 +84,7 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _OPSYS_RPATH_NAME= # no 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 _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk index 2c4e2b2d672..0cb562a0f76 100644 --- a/mk/defs.FreeBSD.mk +++ b/mk/defs.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.FreeBSD.mk,v 1.6 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.FreeBSD.mk,v 1.7 2002/12/03 19:24:27 agc Exp $ # # Variable definitions for the FreeBSD operating system. @@ -96,6 +96,7 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb10 # base version of libtool required _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 _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk index 52a039851c7..fca3444824c 100644 --- a/mk/defs.IRIX.mk +++ b/mk/defs.IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.IRIX.mk,v 1.4 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.IRIX.mk,v 1.5 2002/12/03 19:24:27 agc Exp $ # # Variable definitions for the IRIX operating system. @@ -96,6 +96,7 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _OPSYS_RPATH_NAME= -path, # name of symbol in rpath directive to linker +_PATCH_CAN_BACKUP= no # native patch(1) can make backups _PREFORMATTED_MAN_DIR= man # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext _USE_RPATH= yes # add rpath to LDFLAGS diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index 2723c0f3772..e0c6a2777b1 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.35 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.Linux.mk,v 1.36 2002/12/03 19:24:27 agc Exp $ # # Variable definitions for the Linux operating system. @@ -86,6 +86,7 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _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 _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index a3d9db36c93..28a2066f488 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.35 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.36 2002/12/03 19:24:28 agc Exp $ # # Variable definitions for the NetBSD operating system. @@ -96,6 +96,7 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _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 _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk index a023d911431..d923a170f34 100644 --- a/mk/defs.OpenBSD.mk +++ b/mk/defs.OpenBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.OpenBSD.mk,v 1.4 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.OpenBSD.mk,v 1.5 2002/12/03 19:24:28 agc Exp $ # # Variable definitions for the OpenBSD operating system. @@ -96,6 +96,7 @@ _OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages _OPSYS_HAS_OSSAUDIO= yes # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _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 _PREFORMATTED_MAN_DIR= cat # directory where catman pages are _USE_GNU_GETTEXT= no # Don't use GNU gettext diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index d9052182644..7e5e1d3dfae 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.38 2002/12/03 19:17:34 agc Exp $ +# $NetBSD: defs.SunOS.mk,v 1.39 2002/12/03 19:24:28 agc Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -100,6 +100,7 @@ _OPSYS_HAS_MANZ= no # no MANZ for gzipping of man pages _OPSYS_HAS_OSSAUDIO= no # libossaudio is available _OPSYS_LIBTOOL_REQD= 1.4.20010614nb9 # base version of libtool required _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 -z # switch to patch(1) for backup suffix _PREFORMATTED_MAN_DIR= man # directory where catman pages are _USE_GNU_GETTEXT= yes # Use GNU gettext |