[pkgsrc/trunk]: pkgsrc/mk Remove references to DESTDIR. LOCALBASE should not ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfbff259411e
branches:  trunk
changeset: 519595:bfbff259411e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 06 14:51:36 2006 +0000

description:
Remove references to DESTDIR. LOCALBASE should not be altered that way,
since it is user settable and most of the time set by the user.
X11BASE follows the same reasons. For staged installations, we don't
want to register the package directly, so there's no need to prefix
PKG_DBDIR either.

diffstat:

 mk/bsd.prefs.mk              |  10 +++++-----
 mk/flavor/pkg/flavor-vars.mk |   4 ++--
 mk/flavor/pkg/package.mk     |   4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r b1c7b620aeec -r bfbff259411e mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Oct 06 14:31:32 2006 +0000
+++ b/mk/bsd.prefs.mk   Fri Oct 06 14:51:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.237 2006/09/27 15:18:15 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.238 2006/10/06 14:51:36 joerg Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -360,16 +360,16 @@
 USE_INET6=             NO
 .endif
 
-LOCALBASE?=            ${DESTDIR}/usr/pkg
+LOCALBASE?=            /usr/pkg
 X11_TYPE?=             native
 .if !empty(X11_TYPE:Mnative)
 .  if ${OPSYS} == "SunOS"
 # On Solaris, we default to using OpenWindows for X11.
-X11BASE?=      ${DESTDIR}/usr/openwin
+X11BASE?=      /usr/openwin
 .  elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1"
-X11BASE?=      ${DESTDIR}/usr
+X11BASE?=      /usr
 .  else
-X11BASE?=      ${DESTDIR}/usr/X11R6
+X11BASE?=      /usr/X11R6
 .  endif
 .endif
 CROSSBASE?=    ${LOCALBASE}/cross
diff -r b1c7b620aeec -r bfbff259411e mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Fri Oct 06 14:31:32 2006 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Fri Oct 06 14:51:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: flavor-vars.mk,v 1.2 2006/10/06 14:51:36 joerg Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -16,7 +16,7 @@
 .endif
 
 # This is the package database directory for the default view.
-PKG_DBDIR?=            ${DESTDIR}/var/db/pkg
+PKG_DBDIR?=            /var/db/pkg
 
 # _PKG_DBDIR is the actual packages database directory where we register
 # packages.
diff -r b1c7b620aeec -r bfbff259411e mk/flavor/pkg/package.mk
--- a/mk/flavor/pkg/package.mk  Fri Oct 06 14:31:32 2006 +0000
+++ b/mk/flavor/pkg/package.mk  Fri Oct 06 14:51:36 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.2 2006/06/05 22:49:44 jlam Exp $
+# $NetBSD: package.mk,v 1.3 2006/10/06 14:51:36 joerg Exp $
 
 PKG_SUFX?=             .tgz
 PKGFILE?=              ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
@@ -29,7 +29,7 @@
 package-create: package-remove ${PKGFILE} package-links
 
 _PKG_ARGS_PACKAGE+=    ${_PKG_CREATE_ARGS}
-_PKG_ARGS_PACKAGE+=    -p ${PREFIX:S/^${DESTDIR}//}
+_PKG_ARGS_PACKAGE+=    -p ${PREFIX}
 _PKG_ARGS_PACKAGE+=    -L ${PREFIX}                    # @src ...
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 _PKG_ARGS_PACKAGE+=    -E