Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Jul  5 04:32:10 UTC 2006

Modified Files:
	pkgsrc/mk: bsd.pkg.use.mk
	pkgsrc/mk/tools: bsd.tools.mk gettext.mk imake.mk perl.mk replace.mk
	    tools.DragonFly.mk tools.FreeBSD.mk tools.Linux.mk tools.NetBSD.mk
	    tools.OpenBSD.mk tools.SunOS.mk
	pkgsrc/mk/wrapper: bsd.wrapper.mk
Added Files:
	pkgsrc/mk/tools: intltool.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -r1.34 -r1.35 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -r1.37 -r1.38 pkgsrc/mk/tools/bsd.tools.mk
cvs rdiff -r1.4 -r1.5 pkgsrc/mk/tools/gettext.mk
cvs rdiff -r1.17 -r1.18 pkgsrc/mk/tools/imake.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/tools/intltool.mk
cvs rdiff -r1.19 -r1.20 pkgsrc/mk/tools/perl.mk
cvs rdiff -r1.170 -r1.171 pkgsrc/mk/tools/replace.mk
cvs rdiff -r1.26 -r1.27 pkgsrc/mk/tools/tools.DragonFly.mk
cvs rdiff -r1.27 -r1.28 pkgsrc/mk/tools/tools.FreeBSD.mk
cvs rdiff -r1.36 -r1.37 pkgsrc/mk/tools/tools.Linux.mk
cvs rdiff -r1.32 -r1.33 pkgsrc/mk/tools/tools.NetBSD.mk
cvs rdiff -r1.25 -r1.26 pkgsrc/mk/tools/tools.OpenBSD.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/tools/tools.SunOS.mk
cvs rdiff -r1.41 -r1.42 pkgsrc/mk/wrapper/bsd.wrapper.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.