Add a few more intermediate steps to the pkgviews integration plan. We

_do_ need an xpkgwedge package to force USE_IMAKE packages to install into
a depot directory rather than directly into ${X11BASE}, so split the
migration process into three steps:

	(1) Migrate all non-USE_IMAKE packages.
	(2) Make xpkgwedge the default (flag day).
	(3) Migrate all USE_IMAKE packages.

Also remove all of the ramblings about buildlink into a file to be
committed with the new buildlink/pkgviews work.

1 files changed, 21 insertions, 42 deletions

diff --git a/mk/PKGVIEWS b/mk/PKGVIEWS
index 2413da5f8b4..065e256af60 100644
--- a/mk/PKGVIEWS
+++ b/mk/PKGVIEWS
@@ -1,4 +1,4 @@
-$NetBSD: PKGVIEWS,v 1.1.2.7 2003/08/01 19:00:24 jlam Exp $
+$NetBSD: PKGVIEWS,v 1.1.2.8 2003/08/05 10:46:50 jlam Exp $
 
 Package views integration plan:
 ==============================
@@ -19,49 +19,28 @@ the default view should look and feel like a non-depoted package in
 all respects, down to what you find in /var/db/pkg/${PKGNAME}, so
 non-depoted packages can depend on depoted packages without change.
 
-(2) Migrate packages set PKG_INSTALLATION_TYPE to "pkgviews".
-    Depoted packages can only depend on other depoted packages.  A
-    depoted package will have <deppkg_dir>/lib and ${LOCALBASE}/lib
-    in the run-time library search path (-Wl,-R*) so that wildcard
-    dependencies on library packages will still work (so long as
-    the major number of the shlib hasn't increased).
+(2) Migrate non-USE_IMAKE packages to set PKG_INSTALLATION_TYPE to
+    "pkgviews".  Depoted packages can only depend on other depoted
+    packages.  A depoted package will have <deppkg_dir>/lib and
+    ${LOCALBASE}/lib in the run-time library search path (-Wl,-R*)
+    so that wildcard dependencies on library packages will still work
+    (so long as the major number of the shlib hasn't increased).
 
-At this point, all packages in pkgsrc will be depoted, and we can
-unconditionally set PKG_INSTALLATION_TYPE to "pkgviews" for all of
-pkgsrc.  We don't actually require that xpkgwedge be used since
-depoted packages can live anywhere, and it's up to pkg_view(1) to
-add the depoted package to the default view.
+At this point, all packages in pkgsrc except for those that define
+USE_IMAKE will be depoted.
 
-(3) Allow for different package views.  At this point, this step
-    should be trivial.
+(3) Make xpkgwedge the default for pkgsrc.  It would be nice to
+    enhance xpkgwedge in some way so that a package could be compiled
+    with the correct defaults for finding app-defaults files without
+    having the user fiddle with environment variables.
 
-Possible problems:
------------------
+This is a flag day change and will require bumping the PKGREVISIONs
+for every single USE_X11BASE and USE_IMAKE package.
 
-(*) I may be wrong about xpkgwedge.  We may need some sort of
-    xpkgwedge package in order to properly handle USE_IMAKE packages
-    so that they install into depot directories, but I'm ignoring them
-    for now, or at least until we get much further along on step (2).
-    Also, I'll figure out how to deal with binary packages later on.
+(4) Migrate the USE_IMAKE packages to set PKG_INSTALLATION_TYPE to
+    "pkgviews".
 
-(*) I need to think about how to best integrate buildlink2 with
-    pkgviews.  One of the motivating philosophies of buildlink2 is
-    that we don't lie to the package configure/build procedure about
-    the true location of libraries and headers.  We need to think of
-    a way to hide ${LOCALBASE} but not ${DEPOTBASE}/* from the package
-    configure/build processes.
-
-Currently, we do the following transformations:
-
-	${LOCALBASE} --> ${BUILDLINK_DIR}
-	${X11BASE}   --> ${BUILDLINK_X11_DIR}
-
-We could change the rule to be filter out ${LOCALBASE}/* unless they
-match:
-
-	${LOCALBASE}/${DEPOT_SUBDIR}/${_pkg_}
-	${X11BASE}/${DEPOT_SUBDIR}/${_pkg_}
-
-for _pkg_ in ${BUILDLINK_PACKAGES}.  We only want to do this change
-for "pkgviews" packages, since "overwrite" packages will still work
-because "overwrite" packages ignore the existence of pkgviews.
+At this point every package in pkgsrc will be using pkgviews, and we
+can excise all of the "overwrite" code from pkgsrc internals.  From
+this point on, pkgsrc only supports depoted packages via package
+views.