Module Name:	pkgsrc
Committed By:	jlam
Date:		Tue Jun  6 03:05:48 UTC 2006

Modified Files:
	pkgsrc/mk: bsd.pkg.mk bsd.prefs.mk
Added Files:
	pkgsrc/mk/extract: bsd.extract-vars.mk bsd.extract.mk extract
	    extract.mk
	pkgsrc/mk/fetch: bsd.fetch-vars.mk bsd.fetch.mk distclean.mk fetch.mk
	    sites.mk
Removed Files:
	pkgsrc/mk: bsd.pkg.extract.mk bsd.sites.mk
	pkgsrc/mk/scripts: extract

Log Message:
Refactor "fetch" and "extract" code into correspondingly named
subdirectories of pkgsrc/mk.  Move the following files around for
locality:

	pkgsrc/mk/scripts/extract  -> pkgsrc/mk/extract/extract
	pkgsrc/mk/bsd.sites.mk     -> pkgsrc/mk/fetch/sites.mk

Also get rid of the recursive make for the "fetch" and "extract"
targets.  This basically merges the "fetch" and "extract" phases into
the "patch" phase.

There is still much more work to do to simplify the fetch code, but
this is a good start.


To generate a diff of this commit:
cvs rdiff -r1.25 -r0 pkgsrc/mk/bsd.pkg.extract.mk
cvs rdiff -r1.1839 -r1.1840 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.222 -r1.223 pkgsrc/mk/bsd.prefs.mk
cvs rdiff -r1.63 -r0 pkgsrc/mk/bsd.sites.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/extract/bsd.extract-vars.mk \
    pkgsrc/mk/extract/bsd.extract.mk pkgsrc/mk/extract/extract \
    pkgsrc/mk/extract/extract.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/fetch/bsd.fetch-vars.mk \
    pkgsrc/mk/fetch/bsd.fetch.mk pkgsrc/mk/fetch/distclean.mk \
    pkgsrc/mk/fetch/fetch.mk pkgsrc/mk/fetch/sites.mk
cvs rdiff -r1.21 -r0 pkgsrc/mk/scripts/extract

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