Remove support for USE_DESTDIR=no.

4 files changed, 12 insertions, 59 deletions

diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk
index 21a7790e37b..f71e9fd0f02 100644
--- a/mk/install/bsd.install.mk
+++ b/mk/install/bsd.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.15 2014/12/06 23:28:18 agc Exp $
+# $NetBSD: bsd.install.mk,v 1.16 2016/04/10 15:58:02 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -17,14 +17,12 @@ _COOKIE.install=	${WRKDIR}/.install_done
 ######################################################################
 ### install (PUBLIC)
 ######################################################################
-### install is a public target to install the package either by
-### depending on stage-install (_USE_DESTDIR=no) or package-install
-### (_USE_DESTDIR!=no).
+### install is a public target to install the package by depending
+### on stage-package-install or package-install. The difference is
+### a package is created in the public PACKAGES directory.
 ###
 .PHONY: install
-.if ${_USE_DESTDIR} == "no"
-install: stage-install
-.elif ${_KEEP_BIN_PKGS} == "no"
+.if ${_KEEP_BIN_PKGS} == "no"
 install: stage-package-install
 .else
 install: package-install
@@ -34,8 +32,7 @@ install: package-install
 ### stage-install (PUBLIC)
 ######################################################################
 ### stage-install is a public target to install the package to
-### ${PREFIX} (_USE_DESTDIR=no) or to ${DESTDIR}${PREFIX}
-### (_USE_DESTDIR!=no)
+### to ${DESTDIR}${PREFIX}.
 ###
 .PHONY: stage-install
 .if !defined(NO_INSTALL)
diff --git a/mk/install/deinstall.mk b/mk/install/deinstall.mk
index 57068d77cfc..22212caa837 100644
--- a/mk/install/deinstall.mk
+++ b/mk/install/deinstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.11 2011/10/15 00:23:09 reed Exp $
+# $NetBSD: deinstall.mk,v 1.12 2016/04/10 15:58:02 joerg Exp $
 
 # DEINSTALLDEPENDS controls whether dependencies and dependents are also
 # removed when a package is de-installed.  The valid values are:
@@ -31,9 +31,6 @@ deinstall: su-target
 _SU_DEINSTALL_TARGETS=	acquire-deinstall-lock
 _SU_DEINSTALL_TARGETS+=	_pkgformat-deinstall
 _SU_DEINSTALL_TARGETS+=	release-deinstall-lock
-.if ${_USE_DESTDIR} == "no"
-_SU_DEINSTALL_TARGETS+=	install-clean
-.endif
 su-deinstall: ${_SU_DEINSTALL_TARGETS}
 
 .PHONY: acquire-deinstall-lock release-deinstall-lock
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 6ae35583409..5691face206 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.67 2015/10/12 09:08:22 jperkin Exp $
+# $NetBSD: install.mk,v 1.68 2016/04/10 15:58:02 joerg Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -154,27 +154,12 @@ install-check-version: ${_COOKIE.extract}
 	esac
 
 ######################################################################
-### The targets below are run with elevated privileges.
-######################################################################
-
-.PHONY: acquire-install-localbase-lock release-install-localbase-lock
-acquire-install-localbase-lock: acquire-localbase-lock
-release-install-localbase-lock: release-localbase-lock
-
-######################################################################
 ### install-all, su-install-all (PRIVATE)
 ######################################################################
 ### install-all is a helper target to run the install target of
 ### the built software, register the software installation, and run
 ### some sanity checks.
 ###
-.if ${_USE_DESTDIR} != "user-destdir"
-_INSTALL_ALL_TARGETS+=		acquire-install-localbase-lock
-.endif
-.if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		_pkgformat-check-conflicts
-_INSTALL_ALL_TARGETS+=		_pkgformat-check-installed
-.endif
 _INSTALL_ALL_TARGETS+=		install-check-umask
 .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		check-files-pre
@@ -186,9 +171,6 @@ _INSTALL_ALL_TARGETS+=		install-dirs-from-PLIST
 .elif defined(AUTO_MKDIRS) && !empty(AUTO_MKDIRS:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		install-dirs-from-PLIST
 .endif
-.if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		pre-install-script
-.endif
 _INSTALL_ALL_TARGETS+=		pre-install
 _INSTALL_ALL_TARGETS+=		do-install
 _INSTALL_ALL_TARGETS+=		post-install
@@ -201,18 +183,8 @@ _INSTALL_ALL_TARGETS+=		install-script-data
 .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss])
 _INSTALL_ALL_TARGETS+=		check-files-post
 .endif
-.if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		post-install-script
-.endif
-.if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		_pkgformat-register
-.else
 _INSTALL_ALL_TARGETS+=		_pkgformat-generate-metadata
-.endif
 _INSTALL_ALL_TARGETS+=		privileged-install-hook
-.if ${_USE_DESTDIR} != "user-destdir"
-_INSTALL_ALL_TARGETS+=		release-install-localbase-lock
-.endif
 _INSTALL_ALL_TARGETS+=		error-check
 
 .PHONY: install-all su-install-all
@@ -315,7 +287,7 @@ INSTALL_DIRS?=		${BUILD_DIRS}
 INSTALL_MAKE_FLAGS?=	# none
 INSTALL_TARGET?=	install ${USE_IMAKE:D${NO_INSTALL_MANPAGES:D:Uinstall.man}}
 DESTDIR_VARNAME?=	DESTDIR
-.if ${_USE_DESTDIR} != "no" && !empty(DESTDIR_VARNAME)
+.if !empty(DESTDIR_VARNAME)
 INSTALL_ENV+=		${DESTDIR_VARNAME}=${DESTDIR:Q}
 INSTALL_MAKE_FLAGS+=	${DESTDIR_VARNAME}=${DESTDIR:Q}
 .endif
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index 8e0d5160d83..9c30da0a10c 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.17 2015/09/07 19:23:47 gdt Exp $
+# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $
 #
 # Public targets:
 #
@@ -13,11 +13,8 @@
 #
 # Private targets that must be defined by the package system format:
 #
-# _pkgformat-replace:
-#	Updates a package in-place on the system (USE_DESTDIR=no).
-#
 # _pkgformat-destdir-replace:
-#	Updates a package in-place on the system (USE_DESTDIR=yes).
+#	Updates a package in-place on the system.
 #
 # _pkgformat-undo-replace:
 #	Undoes a previous "make _pkgformat-replace".
@@ -25,9 +22,7 @@
 # _pkgformat-destdir-undo-replace:
 #	Undoes a previous "make _pkgformat-destdir-replace".
 
-.if ${_USE_DESTDIR} == "no"
-_REPLACE_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
-.elif ${_KEEP_BIN_PKGS} == "no"
+.if ${_KEEP_BIN_PKGS} == "no"
 _REPLACE_TARGETS+=	stage-package-create
 .else
 _REPLACE_TARGETS+=	package
@@ -49,11 +44,7 @@ replace: barrier
 replace-message: .PHONY
 	@${PHASE_MSG} "Replacing for ${PKGNAME}"
 
-.if ${_USE_DESTDIR} == "no"
-su-replace: .PHONY _pkgformat-replace
-.else
 su-replace: .PHONY _pkgformat-destdir-replace
-.endif
 MAKEFLAGS.su-replace=	_UPDATE_RUNNING=yes
 MAKEFLAGS.su-replace+=	PKGNAME_REQD=${PKGNAME_REQD:Q}
 
@@ -67,9 +58,5 @@ undo-replace-message: .PHONY
 	@${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
-.if ${_USE_DESTDIR} == "no"
-su-undo-replace: .PHONY _pkgformat-undo-replace
-.else
 su-undo-replace: .PHONY _pkgformat-destdir-undo-replace
-.endif
 MAKEFLAGS.su-undo-replace=	_UPDATE_RUNNING=yes