[pkgsrc/trunk]: pkgsrc/mk/platform Always use LOCALBASE setting from mk/defau...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b33988b20e8a
branches:  trunk
changeset: 519593:b33988b20e8a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 06 14:28:46 2006 +0000

description:
Always use LOCALBASE setting from mk/defaults/mk.conf.
Setting it with ?= in the platform files is a nop anyway.

diffstat:

 mk/platform/Darwin.mk   |  4 +---
 mk/platform/IRIX.mk     |  3 +--
 mk/platform/Linux.mk    |  4 +---
 mk/platform/SunOS.mk    |  4 +---
 mk/platform/UnixWare.mk |  4 +---
 5 files changed, 5 insertions(+), 14 deletions(-)

diffs (89 lines):

diff -r 5b3dc8289ff6 -r b33988b20e8a mk/platform/Darwin.mk
--- a/mk/platform/Darwin.mk     Fri Oct 06 13:37:41 2006 +0000
+++ b/mk/platform/Darwin.mk     Fri Oct 06 14:28:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.21 2006/09/18 15:11:37 tron Exp $
+# $NetBSD: Darwin.mk,v 1.22 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -81,8 +81,6 @@
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U-Wl,-x} # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-s}    # install(1) option to strip
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
-
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /usr/sbin/sysctl -n kern.argmax
diff -r 5b3dc8289ff6 -r b33988b20e8a mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Fri Oct 06 13:37:41 2006 +0000
+++ b/mk/platform/IRIX.mk       Fri Oct 06 14:28:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.27 2006/09/10 13:44:58 schwarz Exp $
+# $NetBSD: IRIX.mk,v 1.28 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -98,7 +98,6 @@
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U-s}    # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-S -f} # install(1) option to strip
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 
 CONFIGURE_ENV+=                ABI=${ABI:Q}
diff -r 5b3dc8289ff6 -r b33988b20e8a mk/platform/Linux.mk
--- a/mk/platform/Linux.mk      Fri Oct 06 13:37:41 2006 +0000
+++ b/mk/platform/Linux.mk      Fri Oct 06 14:28:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.25 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: Linux.mk,v 1.26 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -72,8 +72,6 @@
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U-s}    # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-s}    # install(1) option to strip
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
-
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
diff -r 5b3dc8289ff6 -r b33988b20e8a mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Fri Oct 06 13:37:41 2006 +0000
+++ b/mk/platform/SunOS.mk      Fri Oct 06 14:28:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.26 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.27 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -90,8 +90,6 @@
        @false
 .endif
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
-
 .if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 .else
diff -r 5b3dc8289ff6 -r b33988b20e8a mk/platform/UnixWare.mk
--- a/mk/platform/UnixWare.mk   Fri Oct 06 13:37:41 2006 +0000
+++ b/mk/platform/UnixWare.mk   Fri Oct 06 14:28:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.22 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.23 2006/10/06 14:28:46 joerg Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -75,8 +75,6 @@
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U}      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U}      # install(1) option to strip
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
-
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 
 # check for maximum command line length and set it in configure's environment,