[pkgsrc/trunk]: pkgsrc/mk Redo previous because it had a chance to cause seri...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/842fb935c20c
branches:  trunk
changeset: 487248:842fb935c20c
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Jan 11 20:09:14 2005 +0000

description:
Redo previous because it had a chance to cause serious problems, and was
already demonstrated by imake failing.

So, instead of fiddling with PATH's value in multiple places, rely on
PREPEND_PATH to get things right.  Hopefully this will DTRT.  At least
several local tests have worked without problems.

diffstat:

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

diffs (36 lines):

diff -r 36b007fed220 -r 842fb935c20c mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jan 11 20:06:12 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Jan 11 20:09:14 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1555 2005/01/11 13:39:19 jmmv Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1556 2005/01/11 20:09:14 jmmv Exp $
 #
 # This file is in the public domain.
 #
@@ -470,7 +470,7 @@
 
 MAKE_FLAGS?=
 MAKEFILE?=             Makefile
-MAKE_ENV+=             PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH}
+MAKE_ENV+=             PATH=${PATH}
 MAKE_ENV+=             PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 MAKE_ENV+=             X11BASE=${X11BASE} CFLAGS="${CFLAGS}"
 MAKE_ENV+=             CPPFLAGS="${CPPFLAGS}" FFLAGS="${FFLAGS}"
@@ -1111,7 +1111,7 @@
 
 CONFIGURE_DIRS?=       ${WRKSRC}
 CONFIGURE_SCRIPT?=     ./configure
-CONFIGURE_ENV+=                PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH}
+CONFIGURE_ENV+=                PATH=${PATH}
 
 .if defined(GNU_CONFIGURE)
 #
@@ -1188,7 +1188,7 @@
 
 # Passed to most of script invocations
 SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR}                     \
-       PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH}                    \
+       PATH=${PATH}                                                    \
        WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR}          \
        SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR}                     \
        _PKGSRCDIR=${_PKGSRCDIR} PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \