Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Jul 10 22:17:58 UTC 2006

Modified Files:
	pkgsrc/mk: bsd.prefs.mk
	pkgsrc/mk/platform: IRIX.mk
	pkgsrc/mk/tools: replace.mk tools.IRIX.mk

Log Message:
Back out revision 1.172 of mk/tools/replace.mk -- we never want to
allow IMAKE to be set by anything other than the tools framework.
Modify the IRIX files so that the native imake is listed as a built-in
tool in the case where X11_TYPE is "native".  Also, move the include
of tools/default.mk a bit lower in bsd.prefs.mk so that tools.${OPSYS}.mk
files can use the value of X11_TYPE.  This should properly set and
point IMAKE to the right binary on IRIX without destroying the
configuration for platforms where IMAKE was not explicitly set, i.e.
every non-IRIX platform.


To generate a diff of this commit:
cvs rdiff -r1.226 -r1.227 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/platform/IRIX.mk
cvs rdiff -r1.172 -r1.173 pkgsrc/mk/tools/replace.mk
cvs rdiff -r1.15 -r1.16 pkgsrc/mk/tools/tools.IRIX.mk

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