diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-05 04:32:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-05 04:32:10 +0000 |
| commit | bb74d3bb13a575c8daf48ec498241f861b6a695c (patch) | |
| tree | 277a5763fbfdd2b78add7ae1a7e7f936b5fa447a /mk/tools/tools.SunOS.mk | |
| parent | 5dd869d58bce9ac77979e476e6e2743bbacce7dd (diff) | |
| download | pkgsrc-bb74d3bb13a575c8daf48ec498241f861b6a695c.tar.gz | |
Teach the tools framework about the following new tools:
itools, intltool, diff3, sdiff, msgmerge
* Adding USE_TOOLS+=itools to a package Makefile will cause the
tool-directory versions of imake, makedepend, mkdirhier and xmkmf
to point to the ones from the devel/nbitools package.
This change will remove the need for nbitools/buildlink3.mk, which
currently does a bit of hackery to force the "right" imake tools to
be used by packages that need it.
* Adding USE_TOOLS+=intltool to a package Makefile will cause the
local versions of intltool-* inside ${WRKSRC} to be replaced by
copies from the textproc/intltool package. If "intltool" is not
specified as a tool, then we create "broken" intltool-* tools in
the tools directory to help highlight hidden dependencies on the
intltool package.
In addition, modify the tools framework so that if "perl" is not
specified as a tool, then we create a "broken" perl tool in the
tools directory for the same reason as for "intltool".
These two changes together will remove the need for
intltools/buildlink3.mk and should also catch all cases where the
sources' intltools may have been silently used because perl was
found on the system.
* Adding USE_TOOLS+=diff3, USE_TOOLS+=sdiff, or USE_TOOLS+=msgmerge
to a package Makefile will cause the corresponding tool to be pulled
into the tools directory.
These are convenience tools to help simplify dependencies for some
packages.
Diffstat (limited to 'mk/tools/tools.SunOS.mk')
| -rw-r--r-- | mk/tools/tools.SunOS.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk index fd16208de8b..84e0794a5ee 100644 --- a/mk/tools/tools.SunOS.mk +++ b/mk/tools/tools.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.SunOS.mk,v 1.24 2006/06/14 16:57:07 jlam Exp $ +# $NetBSD: tools.SunOS.mk,v 1.25 2006/07/05 04:32:10 jlam Exp $ # # System-supplied tools for the Solaris operating system. @@ -26,6 +26,11 @@ TOOLS_PLATFORM.diff?= /bin/diff .elif exists(/usr/bin/diff) TOOLS_PLATFORM.diff?= /usr/bin/diff .endif +.if exists(/bin/diff3) +TOOLS_PLATFORM.diff3?= /bin/diff3 +.elif exists(/usr/bin/diff3) +TOOLS_PLATFORM.diff3?= /usr/bin/diff3 +.endif TOOLS_PLATFORM.dirname?= /usr/bin/dirname TOOLS_PLATFORM.echo?= /usr/ucb/echo TOOLS_PLATFORM.egrep?= /usr/xpg4/bin/grep -E @@ -68,6 +73,11 @@ TOOLS_PLATFORM.printf?= /bin/printf TOOLS_PLATFORM.pwd?= /bin/pwd TOOLS_PLATFORM.rm?= /usr/bin/rm TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir +.if exists(/bin/sdiff) +TOOLS_PLATFORM.sdiff?= /bin/sdiff +.elif exists(/usr/bin/sdiff) +TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff +.endif TOOLS_PLATFORM.sh?= /bin/ksh TOOLS_PLATFORM.sleep?= /bin/sleep .if exists(/usr/bin/soelim) |