Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Jul 24 22:00:13 UTC 2003

Modified Files:
	pkgsrc/mk [pkgviews-mk]: bsd.pkg.defaults.mk bsd.pkg.mk bsd.prefs.mk
	    defs.SunOS.mk
	pkgsrc/mk/buildlink2 [pkgviews-mk]: bsd.buildlink2.mk

Log Message:
Restore pkgviews-mk branch modifications to pkgsrc/mk after botched sync to
HEAD (time to script the command sequence...).


To generate a diff of this commit:
cvs rdiff -r1.160.2.2 -r1.160.2.3 pkgsrc/mk/bsd.pkg.defaults.mk
cvs rdiff -r1.1216.2.2 -r1.1216.2.3 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.118.2.2 -r1.118.2.3 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.62.2.2 -r1.62.2.3 pkgsrc/mk/defs.SunOS.mk
cvs rdiff -r1.90.4.2 -r1.90.4.3 pkgsrc/mk/buildlink2/bsd.buildlink2.mk

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