pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Add a new package-settable variable, INSTALLATION_P...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8541000f6d5b
branches:  trunk
changeset: 475498:8541000f6d5b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 17 04:44:44 2004 +0000

description:
Add a new package-settable variable, INSTALLATION_PREFIX, as discussed
with gavan%NetBSD.org@localhost at pkgsrcCon.

Within the pkgsrc infrastructure, LOCALBASE has two different meanings:

    (1) where the package being built should be installed, and
    (2) where to find previously installed packages.

Most instances of case (2) should be converted to use EVAL_PREFIX,
but there are some cases where this is impossible.  To resolve this,
we preserve LOCALBASE to mean (2) and we create a new variable
INSTALLATION_PREFIX to mean (1).

INSTALLATION_PREFIX is meant to be set some time before bsd.pkg.mk is
included, and provides the value for PREFIX if it's defined, e.g.

        NO_MTREE=               yes
        INSTALLATION_PREFIX=    /

        .include "../../mk/bsd.pkg.mk"

This allows us to remove all cases where PREFIX is explicitly set in
the package Makefile, e.g. Java VM packages, qmail, etc.

diffstat:

 mk/bsd.pkg.mk |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 9abbbe55feed -r 8541000f6d5b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon May 17 03:15:20 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon May 17 04:44:44 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1459 2004/05/12 13:23:08 wiz Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1460 2004/05/17 04:44:44 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -179,7 +179,9 @@
 
 # Set the PREFIX appropriately.
 .if ${PKG_INSTALLATION_TYPE} == "overwrite"
-.  if defined(USE_X11BASE)
+.  if defined(INSTALLATION_PREFIX)
+PREFIX=                        ${INSTALLATION_PREFIX}
+.  elif defined(USE_X11BASE)
 PREFIX=                        ${X11PREFIX}
 .  elif defined(USE_CROSSBASE)
 PREFIX=                        ${CROSSBASE}
@@ -192,6 +194,10 @@
 NO_MTREE=              yes
 .endif
 
+.if (${PKG_INSTALLATION_TYPE} == "pkgviews") && defined(INSTALLATION_PREFIX)
+PKG_SKIP_REASON=       "INSTALLATION_PREFIX can't be used in a pkgviews package"
+.endif
+
 # If USE_XPKGWEDGE is set, then add a build dependency on xpkgwedge for
 # X11 packages.
 #



Home | Main Index | Thread Index | Old Index