Remove pkg_views support, second part: infrastructure.

5 files changed, 4 insertions, 114 deletions

diff --git a/mk/pkgformat/README b/mk/pkgformat/README
index 8de3f480767..23a39d2f411 100644
--- a/mk/pkgformat/README
+++ b/mk/pkgformat/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.1 2011/10/15 00:23:09 reed Exp $
+$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz Exp $
 
 = Introduction =
 
@@ -38,7 +38,6 @@ ones are useful. Document them.)
 * PKG_CREATE
 * PKG_DELETE
 * PKG_INFO
-* PKG_VIEW
 * LINKFARM
 * PKG_BEST_EXISTS
 
diff --git a/mk/pkgformat/pkg/package.mk b/mk/pkgformat/pkg/package.mk
index db379516b06..de92a7d268c 100644
--- a/mk/pkgformat/pkg/package.mk
+++ b/mk/pkgformat/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.6 2014/12/07 05:09:02 obache Exp $
+# $NetBSD: package.mk,v 1.7 2014/12/30 15:13:20 wiz Exp $
 
 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -68,9 +68,6 @@ _PKG_ARGS_PACKAGE+=	-I ${PREFIX} -p ${DESTDIR}${PREFIX}
 _PKG_ARGS_PACKAGE+=	-u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
 .  endif
 .endif
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-_PKG_ARGS_PACKAGE+=	-E
-.endif
 
 ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS}
 	${RUN} ${MKDIR} ${.TARGET:H}
diff --git a/mk/pkgformat/pkg/pkgformat-vars.mk b/mk/pkgformat/pkg/pkgformat-vars.mk
index c2ca46476c7..6a9284213e6 100644
--- a/mk/pkgformat/pkg/pkgformat-vars.mk
+++ b/mk/pkgformat/pkg/pkgformat-vars.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkgformat-vars.mk,v 1.4 2014/12/08 02:43:25 agc Exp $
+# $NetBSD: pkgformat-vars.mk,v 1.5 2014/12/30 15:13:20 wiz Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -21,20 +21,14 @@ PKG_DBDIR?=		/var/db/pkg
 # _PKG_DBDIR is the actual packages database directory where we register
 # packages.
 #
-.if ${PKG_INSTALLATION_TYPE} == "overwrite"
 _PKG_DBDIR=		${_CROSS_DESTDIR}${PKG_DBDIR}
 _HOST_PKG_DBDIR=	${HOST_PKG_DBDIR:U${PKG_DBDIR}}
-.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
-_PKG_DBDIR=		${_CROSS_DESTDIR}${DEPOTBASE}
-_HOST_PKG_DBDIR=	${HOST_DEPOTBASE:U${DEPOTBASE}}
-.endif
 
 PKG_ADD_CMD?=		${PKG_TOOLS_BIN}/pkg_add
 PKG_ADMIN_CMD?=		${PKG_TOOLS_BIN}/pkg_admin
 PKG_CREATE_CMD?=	${PKG_TOOLS_BIN}/pkg_create
 PKG_DELETE_CMD?=	${PKG_TOOLS_BIN}/pkg_delete
 PKG_INFO_CMD?=		${PKG_TOOLS_BIN}/pkg_info
-PKG_VIEW_CMD?=		${PKG_TOOLS_BIN}/pkg_view
 LINKFARM_CMD?=		${PKG_TOOLS_BIN}/linkfarm
 
 # Latest versions of tools required for correct pkgsrc operation.
@@ -71,19 +65,11 @@ _AUDIT_CONFIG_OPTION=	IGNORE_URL
 PKGTOOLS_ARGS?=		-K ${_PKG_DBDIR}
 HOST_PKGTOOLS_ARGS?=	-K ${_HOST_PKG_DBDIR}
 
-# Views are rooted in ${LOCALBASE}, all packages are depoted in
-# ${DEPOTBASE}, and the package database directory for the default view
-# is in ${PKG_DBDIR}.
-#
-PKG_VIEW_ARGS?=		-W ${LOCALBASE} -d ${DEPOTBASE} -k ${_CROSS_DESTDIR}${PKG_DBDIR}
-HOST_PKG_VIEW_ARGS?=	-W ${LOCALBASE} -d ${DEPOTBASE} -k ${PKG_DBDIR}
-
 PKG_ADD?=	${PKG_ADD_CMD} ${PKGTOOLS_ARGS}
 PKG_ADMIN?=	${PKG_ADMIN_CMD} ${PKGTOOLS_ARGS}
 PKG_CREATE?=	${PKG_CREATE_CMD} ${PKGTOOLS_ARGS}
 PKG_DELETE?=	${PKG_DELETE_CMD} ${PKGTOOLS_ARGS}
 PKG_INFO?=	${PKG_INFO_CMD} ${PKGTOOLS_ARGS}
-PKG_VIEW?=	${PKG_VIEW_CMD} ${PKG_VIEW_ARGS}
 LINKFARM?=	${LINKFARM_CMD}
 
 HOST_PKG_ADD?=		${PKG_ADD_CMD} ${HOST_PKGTOOLS_ARGS}
@@ -91,7 +77,6 @@ HOST_PKG_ADMIN?=	${PKG_ADMIN_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_CREATE?=	${PKG_CREATE_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_DELETE?=	${PKG_DELETE_CMD} ${HOST_PKGTOOLS_ARGS}
 HOST_PKG_INFO?=		${PKG_INFO_CMD} ${HOST_PKGTOOLS_ARGS}
-HOST_PKG_VIEW?=		${PKG_VIEW_CMD} ${HOST_PKG_VIEW_ARGS}
 HOST_LINKFARM?=		${LINKFARM_CMD}
 
 # "${_PKG_BEST_EXISTS} pkgpattern" prints out the name of the installed
diff --git a/mk/pkgformat/pkg/pkgformat.mk b/mk/pkgformat/pkg/pkgformat.mk
index 2652c3da044..5bf736fe4e4 100644
--- a/mk/pkgformat/pkg/pkgformat.mk
+++ b/mk/pkgformat/pkg/pkgformat.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkgformat.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
+# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz Exp $
 #
 # This Makefile fragment provides variable and target overrides that are
 # specific to the pkgsrc native package format.
@@ -22,6 +22,5 @@ PKG_FILELIST_CMD=	${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST}
 .include "deinstall.mk"
 .include "replace.mk"
 .include "package.mk"
-.include "views.mk"
 
 .include "utility.mk"
diff --git a/mk/pkgformat/pkg/views.mk b/mk/pkgformat/pkg/views.mk
deleted file mode 100644
index db1929f8517..00000000000
--- a/mk/pkgformat/pkg/views.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-# $NetBSD: views.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
-
-# By default, all packages attempt to link into the views.
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-BUILD_VIEWS?=	yes
-.endif
-
-# DEFAULT_VIEW.${PKGBASE}	default view for ${PKGBASE}
-# VIEWBASE			base location of files at run-time
-#
-DEFAULT_VIEW.${PKGBASE}?=	${DEFAULT_VIEW}
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-.  if empty(DEFAULT_VIEW.${PKGBASE}:M"")
-VIEWBASE=	${LOCALBASE}/${DEFAULT_VIEW.${PKGBASE}}
-.  else
-VIEWBASE=	${LOCALBASE}
-.  endif
-.elif ${PKG_INSTALLATION_TYPE} == "overwrite"
-VIEWBASE=	${PREFIX}
-.endif
-MAKE_ENV+=	VIEWBASE=${VIEWBASE}
-
-PKGVIEWS+=	${DEFAULT_VIEW.${PKGBASE}}
-
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-privileged-install-hook: build-views
-.endif
-
-######################################################################
-### build-views, su-build-views (PRIVATE)
-######################################################################
-### build-views adds the package to each view in PKGVIEWS.
-###
-.PHONY: build-views su-build-views
-build-views: su-target
-	@${STEP_MSG} "Building views for ${PKGNAME}"
-
-su-build-views:
-	${RUN}								\
-	${MKDIR} ${LOCALBASE};						\
-	for v in ${PKGVIEWS}; do					\
-		case "$$v" in						\
-		"")	dbdir=${PKG_DBDIR}; viewname=standard ;;	\
-		*)	dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;;	\
-		esac;							\
-		${STEP_MSG} "Performing package view clash check for ${PKGNAME} in $$viewname view"; \
-		pkg=`${PKG_INFO_CMD} -K $$dbdir -e ${PKGBASE} || ${TRUE}`; \
-		case "$$pkg" in						\
-		"")	;;						\
-		*)	${WARNING_MSG} "${PKGBASE} exists in $$viewname view - package $$pkg ***"; \
-			${WARNING_MSG} "Not hoisting ${PKGNAME} into $$viewname view"; \
-			continue;					\
-			;;						\
-		esac;							\
-		${STEP_MSG} "Performing package view overwrite check for ${PKGNAME} in $$viewname view"; \
-		dups=`${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v check ${PKGNAME} || ${TRUE}`; \
-		case "$$dups" in					\
-		"")	;;						\
-		*)	${WARNING_MSG} "***********************************************************"; \
-			${WARNING_MSG} "**** The following symbolic links will be overwritten *****"; \
-			for f in $$dups; do				\
-				${LS} -l ${LOCALBASE}/$$v/$$f | ${WARNING_CAT}; \
-			done;						\
-			${WARNING_MSG} "***********************************************************"; \
-			;;						\
-		esac;							\
-		${STEP_MSG} "Linking package into $$viewname view";	\
-		${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v add ${PKGNAME}; \
-	done
-
-######################################################################
-### remove-views, su-remove-views (PRIVATE)
-######################################################################
-### remove-views removes the package from each view in PKGVIEWS.
-###
-.PHONY: remove-views su-remove-views
-remove-views: su-target
-	@${STEP_MSG} "Removing ${PKGNAME} from views"
-
-su-remove-views:
-	${RUN}								\
-	for v in "" ${PKGVIEWS}; do					\
-		${TEST} -n "$$v" || continue;				\
-		case "$$v" in						\
-		"")	dbdir=${PKG_DBDIR}; viewname=standard ;;	\
-		*)	dbdir=${LOCALBASE}/$$v/.dbdir; viewname=$$v ;;	\
-		esac;							\
-		${STEP_MSG} "Removing package from $$viewname view";	\
-		${PKGSRC_SETENV} PLIST_IGNORE_FILES=${_PLIST_IGNORE_FILES:Q} ${PKG_VIEW} --view=$$v delete ${PKGNAME}; \
-	done