Module Name:	pkgsrc
Committed By:	jlam
Date:		Fri Aug 23 05:23:01 UTC 2002

Modified Files:
	pkgsrc/pkgtools/digest: Makefile
	pkgsrc/pkgtools/pkgdiff: Makefile
	pkgsrc/pkgtools/rpm2pkg: Makefile
	pkgsrc/pkgtools/x11-links: Makefile xfree.buildlink.mk
	pkgsrc/pkgtools/xpkgwedge: Makefile
Added Files:
	pkgsrc/pkgtools/x11-links: openwin.buildlink2.mk xfree.buildlink2.mk

Log Message:
Merge pkgsrc/pkgtools from the buildlink2 branch back to the main trunk.


To generate a diff of this commit:
cvs rdiff -r1.25 -r1.26 pkgsrc/pkgtools/digest/Makefile
cvs rdiff -r1.25 -r1.26 pkgsrc/pkgtools/pkgdiff/Makefile
cvs rdiff -r1.10 -r1.11 pkgsrc/pkgtools/rpm2pkg/Makefile
cvs rdiff -r1.12 -r1.13 pkgsrc/pkgtools/x11-links/Makefile
cvs rdiff -r0 -r1.2 pkgsrc/pkgtools/x11-links/openwin.buildlink2.mk \
    pkgsrc/pkgtools/x11-links/xfree.buildlink2.mk
cvs rdiff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/xfree.buildlink.mk
cvs rdiff -r1.33 -r1.34 pkgsrc/pkgtools/xpkgwedge/Makefile

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