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.

1 files changed, 22 insertions, 0 deletions

diff --git a/mk/fetch/bsd.fetch-vars.mk b/mk/fetch/bsd.fetch-vars.mk
new file mode 100644
index 00000000000..b5b6897d707
--- /dev/null
+++ b/mk/fetch/bsd.fetch-vars.mk
@@ -0,0 +1,22 @@
+# $NetBSD: bsd.fetch-vars.mk,v 1.1 2006/06/06 03:05:48 jlam Exp $
+#
+# This Makefile fragment is included to bsd.prefs.mk and defines some
+# variables which must be defined earlier than where bsd.fetch.mk
+# is included.
+#
+# The following variables may be set by the user:
+#
+#    DISTDIR is the top-level directory into which all original
+#	distribution files are fetched.
+#
+# The following variables may be set in a package Makefile:
+#
+#    DIST_SUBDIR is the subdirectory of ${DISTDIR} in which the original
+#	distribution files for the package are fetched.
+#
+#    DISTFILES is the list of distribution files that are fetched.
+#
+
+DISTDIR?=               ${PKGSRCDIR}/distfiles
+_DISTDIR=		${DISTDIR}/${DIST_SUBDIR}
+DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}