[pkgsrc/trunk]: pkgsrc sysMkPath should be ${PREFIX}/share/mk by default and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/33b3ed4a52ac
branches:  trunk
changeset: 503216:33b3ed4a52ac
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 16 13:53:51 2005 +0000

description:
sysMkPath should be ${PREFIX}/share/mk by default and only that.
Including e.g. /usr/share/mk results in sys.mk read from there
as well. On DragonFly this adds X11BASE and results in obscure
breakages. Since the mk files are supposed to be self-contained,
it doesn't make much sense to look in other directories anyway.
Bump revision to annotate this.

Discussed-with: reed@.
Reported-by: Aggelos Economopoulos <aoiko AT cc DOT ece DOT ntua DOT gr>

diffstat:

 bootstrap/bootstrap  |  4 ++--
 devel/bmake/Makefile |  5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r fa8fd9b780ca -r 33b3ed4a52ac bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Nov 16 12:36:58 2005 +0000
+++ b/bootstrap/bootstrap       Wed Nov 16 13:53:51 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.44 2005/11/10 00:10:35 reed Exp $
+# $NetBSD: bootstrap,v 1.45 2005/11/16 13:53:51 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -659,7 +659,7 @@
 
 echo_msg "Installing bmake"
 copy_src ../devel/bmake/files bmake
-run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./boot-strap -q -o $opsys --prefix=$prefix 
--sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk")"
+run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./boot-strap -q -o $opsys --prefix=$prefix 
--sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk")"
 run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 755 $wrkdir/bmake/$opsys/bmake $prefix/bin/bmake"
 #run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 644 $wrkdir/bmake/$opsys/bmake.1 $prefix/man/man1/bmake.1"
 
diff -r fa8fd9b780ca -r 33b3ed4a52ac devel/bmake/Makefile
--- a/devel/bmake/Makefile      Wed Nov 16 12:36:58 2005 +0000
+++ b/devel/bmake/Makefile      Wed Nov 16 13:53:51 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2005/11/10 00:09:34 reed Exp $
+# $NetBSD: Makefile,v 1.28 2005/11/16 13:53:51 joerg Exp $
 #
 
 DISTNAME=       bmake-20051105
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -16,7 +17,7 @@
 WRKSRC=                ${WRKDIR}/bmake
 NO_CHECKSUM=   YES
 
-makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
+makesyspath=   ${PREFIX}/share/mk
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1