[pkgsrc/trunk]: pkgsrc/mk Use LOCALBASE instead of ZOULARISBASE

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a115c271394f
branches:  trunk
changeset: 460841:a115c271394f
user:      martti <martti%pkgsrc.org@localhost>
date:      Fri Sep 05 13:54:13 2003 +0000

description:
Use LOCALBASE instead of ZOULARISBASE

diffstat:

 mk/defs.Darwin.mk |  11 ++++++++---
 mk/defs.Linux.mk  |  15 ++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diffs (90 lines):

diff -r 2137422489e9 -r a115c271394f mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Fri Sep 05 13:06:34 2003 +0000
+++ b/mk/defs.Darwin.mk Fri Sep 05 13:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.53 2003/09/02 06:59:44 jlam Exp $
+# $NetBSD: defs.Darwin.mk,v 1.54 2003/09/05 13:54:13 martti Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -77,7 +77,7 @@
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
 MOTIF12_TYPE_DEFAULT?= lesstif12       # default 1.2 compatible libs type
 NOLOGIN?=              ${FALSE}
-PKG_TOOLS_BIN?=                ${ZOULARISBASE}/sbin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             sudo sh -c
 ROOT_GROUP?=           wheel
 ROOT_USER?=            root
@@ -86,7 +86,6 @@
 ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 USERADD?=              ${FALSE}                        # XXX - Fix me!
-ZOULARISBASE?=         ${LOCALBASE}
 
 PKG_CREATE_USERGROUP?= NO                              # XXX - Until then
 
@@ -129,3 +128,9 @@
 _STRIPFLAG_CC?=                -Wl,-x  # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
+
+LOCALBASE?=            ${DESTDIR}/usr/pkg
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
+.endif
+PKG_TOOLS_BIN?=                ${LOCALBASE}/bin
diff -r 2137422489e9 -r a115c271394f mk/defs.Linux.mk
--- a/mk/defs.Linux.mk  Fri Sep 05 13:06:34 2003 +0000
+++ b/mk/defs.Linux.mk  Fri Sep 05 13:54:13 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.57 2003/09/02 06:59:45 jlam Exp $
+# $NetBSD: defs.Linux.mk,v 1.58 2003/09/05 13:54:14 martti Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -73,7 +73,7 @@
 LS?=           /bin/ls
 M4?=           /usr/bin/m4
 MKDIR?=                /bin/mkdir -p
-MTREE?=                ${ZOULARISBASE}/sbin/mtree
+MTREE?=                ${LOCALBASE}/sbin/mtree
 MV?=           /bin/mv
 .if exists(/bin/nice)
 NICE?=         /bin/nice
@@ -81,7 +81,7 @@
 NICE?=         /usr/bin/nice
 .endif
 PATCH?=                /usr/bin/patch
-PAX?=          ${ZOULARISBASE}/bin/pax
+PAX?=          ${LOCALBASE}/bin/pax
 PERL5?=                ${LOCALBASE}/bin/perl
 PKGLOCALEDIR?= share
 PS?=           /bin/ps
@@ -129,7 +129,7 @@
 MOTIF_TYPE_DEFAULT?=   openmotif       # default 2.0 compatible libs type
 MOTIF12_TYPE_DEFAULT?= lesstif12       # default 1.2 compatible libs type
 NOLOGIN?=              ${FALSE}
-PKG_TOOLS_BIN?=                ${ZOULARISBASE}/sbin
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
 ROOT_CMD?=             ${SU} - root -c
 ROOT_GROUP?=           root
 ROOT_USER?=            root
@@ -138,7 +138,6 @@
 ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`
 ULIMIT_CMD_memorysize?=        ulimit -m `ulimit -H -m`
 USERADD?=              /usr/sbin/useradd
-ZOULARISBASE?=         /usr/pkg
 
 # imake installs manpages in weird places
 # these values from /usr/X11R6/lib/X11/config/linux.cf
@@ -178,3 +177,9 @@
 _STRIPFLAG_CC?=                -s      # cc(1) option to strip
 _STRIPFLAG_INSTALL?=   -s      # install(1) option to strip
 .endif
+
+LOCALBASE?=            ${DESTDIR}/usr/pkg
+.if exists(${LOCALBASE}/sbin/pkg_info)
+PKG_TOOLS_BIN?=                ${LOCALBASE}/sbin
+.endif
+PKG_TOOLS_BIN?=                ${LOCALBASE}/bin