[pkgsrc/trunk]: pkgsrc/mk/platform Kill ancient runes: /usr/local as LOCALBAS...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1c7b620aeec
branches:  trunk
changeset: 519594:b1c7b620aeec
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 06 14:31:32 2006 +0000

description:
Kill ancient runes: /usr/local as LOCALBASE was not the default for
ages and mk.conf from bootstrap sets it explicitly anyway.
The pkg_install stuff also lives in sbin.

diffstat:

 mk/platform/SunOS.mk |  18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diffs (33 lines):

diff -r b33988b20e8a -r b1c7b620aeec mk/platform/SunOS.mk
--- a/mk/platform/SunOS.mk      Fri Oct 06 14:28:46 2006 +0000
+++ b/mk/platform/SunOS.mk      Fri Oct 06 14:31:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.27 2006/10/06 14:28:46 joerg Exp $
+# $NetBSD: SunOS.mk,v 1.28 2006/10/06 14:31:32 joerg Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -78,23 +78,7 @@
 _STRIPFLAG_CC?=                ${_INSTALL_UNSTRIPPED:D:U-s}    # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   ${_INSTALL_UNSTRIPPED:D:U-s}    # install(1) option to strip
 
-# Migration aid for old /usr/local LOCALBASE
-.if !defined(LOCALBASE) && exists(${DESTDIR}/usr/local/libexec/cgi-bin) && \
-       !exists(${DESTDIR}/usr/pkg/libexec/cgi-bin)
-.BEGIN:
-       @echo "On Solaris and /usr/local/libexec/cgi-bin found:"
-       @echo "- If you have an existing pkgsrc installation & wish to continue"
-       @echo "  using /usr/local, append LOCALBASE=/usr/local to /etc/mk.conf."
-       @echo "- Otherwise set LOCALBASE=/usr/pkg in your environment for the"
-       @echo "  first package install."
-       @false
-.endif
-
-.if exists(${LOCALBASE}/sbin/pkg_info)
 PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
-.else
-PKG_TOOLS_BIN?=                ${LOCALBASE}/bin
-.endif
 
 # 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.