diff options
| author | jmmv <jmmv> | 2005-01-11 13:39:19 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-01-11 13:39:19 +0000 |
| commit | c7ba14fee342027af19f8e1c08db168933a322ca (patch) | |
| tree | 76fc35a492d2a43c8f35c1a0420350452162ef13 /mk | |
| parent | 07ad476393f9679dee09284944d6ed15ddcdbd0d (diff) | |
| download | pkgsrc-c7ba14fee342027af19f8e1c08db168933a322ca.tar.gz | |
Reverse PATH order in many places: instead of appending ${LOCALBASE}/bin
and ${X11BASE}/bin to the current PATH, _prepend_ them. This way we will
pick our own binaries in favour of the system ones, in the cases where
conflicts exist. Also add a PREPEND_PATH for ${LOCALBASE}/bin.
This should fix several packages on non-NetBSD systems. For example,
ispell-spanish under Linux comes to mind, as it was using the 'ispell'
binary from /usr/bin instead of the one in /usr/pkg/bin to get its
configuration information.
Ideally, buildlink could handle this as it does for libraries, hidding
unexpected binaries ;-)
No objections in tech-pkg@ (or packages@; I don't remember the exact
list where I asked).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1ffa595fd8f..cb67df61333 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1554 2005/01/10 18:34:48 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1555 2005/01/11 13:39:19 jmmv Exp $ # # This file is in the public domain. # @@ -164,6 +164,8 @@ PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`dynamic'' or \`\`static''." PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages." .endif +PREPEND_PATH+= ${LOCALBASE}/bin + .if defined(USE_IMAKE) PREPEND_PATH+= ${X11BASE}/bin USE_X11BASE?= implied @@ -468,7 +470,7 @@ CONFIGURE_ENV+= COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}" MAKE_FLAGS?= MAKEFILE?= Makefile -MAKE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin +MAKE_ENV+= PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} MAKE_ENV+= X11BASE=${X11BASE} CFLAGS="${CFLAGS}" MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" FFLAGS="${FFLAGS}" @@ -1109,7 +1111,7 @@ PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} CONFIGURE_DIRS?= ${WRKSRC} CONFIGURE_SCRIPT?= ./configure -CONFIGURE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin +CONFIGURE_ENV+= PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} .if defined(GNU_CONFIGURE) # @@ -1186,7 +1188,7 @@ BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # Passed to most of script invocations SCRIPTS_ENV+= CURDIR=${.CURDIR} DISTDIR=${DISTDIR} \ - PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin \ + PATH=${LOCALBASE}/bin:${X11BASE}/bin:${PATH} \ WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \ SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \ _PKGSRCDIR=${_PKGSRCDIR} PKGSRCDIR=${PKGSRCDIR} DEPENDS="${DEPENDS}" \ |