Module Name:	pkgsrc
Committed By:	tv
Date:		Thu Dec  9 17:15:01 UTC 2004

Modified Files:
	pkgsrc/mk [tv-derecurse]: bsd.options.mk bsd.sites.mk
	    pthread.builtin.mk
	pkgsrc/mk/wrapper [tv-derecurse]: bsd.wrapper.mk logic transform-xlc-cc
Added Files:
	pkgsrc/mk/wrapper [tv-derecurse]: cmd-sink-darwin-xlc

Log Message:
Merge from HEAD.


To generate a diff of this commit:
cvs rdiff -r1.9.4.2 -r1.9.4.3 pkgsrc/mk/bsd.options.mk
cvs rdiff -r1.20.2.3 -r1.20.2.4 pkgsrc/mk/bsd.sites.mk
cvs rdiff -r1.2.2.1 -r1.2.2.2 pkgsrc/mk/pthread.builtin.mk
cvs rdiff -r1.12.2.4 -r1.12.2.5 pkgsrc/mk/wrapper/bsd.wrapper.mk
cvs rdiff -r0 -r1.1.2.1 pkgsrc/mk/wrapper/cmd-sink-darwin-xlc
cvs rdiff -r1.6 -r1.6.2.1 pkgsrc/mk/wrapper/logic
cvs rdiff -r1.1 -r1.1.2.1 pkgsrc/mk/wrapper/transform-xlc-cc

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