Module Name:	pkgsrc
Committed By:	tv
Date:		Sun Nov 28 20:11:32 UTC 2004

Modified Files:
	pkgsrc/mk [tv-derecurse]: bsd.options.mk bsd.pkg.use.mk bsd.sites.mk
	    db1.builtin.mk pthread.buildlink3.mk pthread.builtin.mk
	pkgsrc/mk/buildlink3 [tv-derecurse]: bsd.buildlink3.mk
	pkgsrc/mk/compiler [tv-derecurse]: xlc.mk
	pkgsrc/mk/defaults [tv-derecurse]: mk.conf
Added Files:
	pkgsrc/mk [tv-derecurse]: dlopen.buildlink3.mk dlopen.builtin.mk

Log Message:
Merge from HEAD.


To generate a diff of this commit:
cvs rdiff -r1.9.4.1 -r1.9.4.2 pkgsrc/mk/bsd.options.mk
cvs rdiff -r1.1.2.1 -r1.1.2.2 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -r1.20 -r1.20.2.1 pkgsrc/mk/bsd.sites.mk
cvs rdiff -r1.5 -r1.5.2.1 pkgsrc/mk/db1.builtin.mk
cvs rdiff -r0 -r1.8.2.1 pkgsrc/mk/dlopen.buildlink3.mk
cvs rdiff -r0 -r1.6.2.1 pkgsrc/mk/dlopen.builtin.mk
cvs rdiff -r1.17 -r1.17.2.1 pkgsrc/mk/pthread.buildlink3.mk
cvs rdiff -r1.2 -r1.2.2.1 pkgsrc/mk/pthread.builtin.mk
cvs rdiff -r1.163.2.2 -r1.163.2.3 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs rdiff -r1.2.2.1 -r1.2.2.2 pkgsrc/mk/compiler/xlc.mk
cvs rdiff -r1.14.2.1 -r1.14.2.2 pkgsrc/mk/defaults/mk.conf

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