Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Aug 22 08:21:32 UTC 2002

Modified Files:
	pkgsrc/mk: bsd.pkg.mk pthread.buildlink.mk x11.buildlink.mk
	    xaw.buildlink.mk
	pkgsrc/mk/bulk: bsd.bulk-pkg.mk build build.conf-example mksandbox
	    post-build pre-build printdepends printindex
	pkgsrc/mk/gnu-config: config.guess config.sub
	pkgsrc/mk/install: deinstall header install
Added Files:
	pkgsrc/mk: motif.buildlink2.mk ossaudio.buildlink2.mk
	    pthread.buildlink2.mk xaw.buildlink2.mk
	pkgsrc/mk/buildlink2: README bsd.buildlink2.mk buildlink2.txt
	    libtool-fix-la libtool.sh post-cache pre-cache wrapper.sh

Log Message:
Merge pkgsrc/mk from the buildlink2 branch back into the main trunk.


To generate a diff of this commit:
cvs rdiff -r1.1031 -r1.1032 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r0 -r1.2 pkgsrc/mk/motif.buildlink2.mk \
    pkgsrc/mk/ossaudio.buildlink2.mk pkgsrc/mk/pthread.buildlink2.mk \
    pkgsrc/mk/xaw.buildlink2.mk
cvs rdiff -r1.8 -r1.9 pkgsrc/mk/pthread.buildlink.mk
cvs rdiff -r1.19 -r1.20 pkgsrc/mk/x11.buildlink.mk
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/xaw.buildlink.mk
cvs rdiff -r0 -r1.2 pkgsrc/mk/buildlink2/README \
    pkgsrc/mk/buildlink2/bsd.buildlink2.mk \
    pkgsrc/mk/buildlink2/buildlink2.txt pkgsrc/mk/buildlink2/libtool-fix-la \
    pkgsrc/mk/buildlink2/libtool.sh pkgsrc/mk/buildlink2/post-cache \
    pkgsrc/mk/buildlink2/pre-cache pkgsrc/mk/buildlink2/wrapper.sh
cvs rdiff -r1.39 -r1.40 pkgsrc/mk/bulk/bsd.bulk-pkg.mk
cvs rdiff -r1.24 -r1.25 pkgsrc/mk/bulk/build
cvs rdiff -r1.12 -r1.13 pkgsrc/mk/bulk/build.conf-example
cvs rdiff -r1.8 -r1.9 pkgsrc/mk/bulk/mksandbox
cvs rdiff -r1.20 -r1.21 pkgsrc/mk/bulk/post-build
cvs rdiff -r1.23 -r1.24 pkgsrc/mk/bulk/pre-build
cvs rdiff -r1.10 -r1.11 pkgsrc/mk/bulk/printdepends
cvs rdiff -r1.9 -r1.10 pkgsrc/mk/bulk/printindex
cvs rdiff -r1.2 -r1.3 pkgsrc/mk/gnu-config/config.guess \
    pkgsrc/mk/gnu-config/config.sub
cvs rdiff -r1.11 -r1.12 pkgsrc/mk/install/deinstall pkgsrc/mk/install/install
cvs rdiff -r1.12 -r1.13 pkgsrc/mk/install/header

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