From 5972190656c0bdc731e7b5dd0bff75cea9626603 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Sat, 15 Oct 2011 00:23:07 +0000
Subject: Rename "flavor" to "pkgformat".

This is from Anton Panev's GSoC 2011 project to add RPM and DPKG
support to pkgsrc. (I am not adding that further support in this
commit.)

This is just a rename of the existing functionality. Now it will
be easy to test the GSoC work by simply putting in a single
directory (such as "rpm" or "deb"). See
http://addpackageforma.sourceforge.net/ for some details.

This is from Anton's CVS, but I made some minor changes:

- changed plural pkgformats to singular pkgformat (to be consistent)

- fixed a few places (in comments) that were missed

- catch up on some additions to flavor not in the pkgforma cvs:
PKGSRC_SETENV and _flavor-destdir-undo-replace and
undo-destdir-replace-install.
---
 mk/install/bin-install.mk |  4 ++--
 mk/install/deinstall.mk   |  4 ++--
 mk/install/install.mk     | 12 ++++++------
 mk/install/replace.mk     | 24 ++++++++++++------------
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'mk/install')

diff --git a/mk/install/bin-install.mk b/mk/install/bin-install.mk
index b2c487b4e97..713c140e0d1 100644
--- a/mk/install/bin-install.mk
+++ b/mk/install/bin-install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.21 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: bin-install.mk,v 1.22 2011/10/15 00:23:09 reed Exp $
 #
 
 # This file provides the following targets:
@@ -24,7 +24,7 @@
 #	any version of this package will do, but when installing
 #	dependencies, a special version may be needed.
 
-# XXX: This file contains implementation details from the "pkg" flavor,
+# XXX: This file contains implementation details from the "pkg" format,
 # for example the All/ directory and the @cwd.
 
 # List of sites carrying binary pkgs. Variables "rel" and "arch" are
diff --git a/mk/install/deinstall.mk b/mk/install/deinstall.mk
index 029116c2329..57068d77cfc 100644
--- a/mk/install/deinstall.mk
+++ b/mk/install/deinstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.10 2009/06/17 12:54:57 joerg Exp $
+# $NetBSD: deinstall.mk,v 1.11 2011/10/15 00:23:09 reed Exp $
 
 # DEINSTALLDEPENDS controls whether dependencies and dependents are also
 # removed when a package is de-installed.  The valid values are:
@@ -29,7 +29,7 @@ deinstall: su-target
 .endif
 
 _SU_DEINSTALL_TARGETS=	acquire-deinstall-lock
-_SU_DEINSTALL_TARGETS+=	_flavor-deinstall
+_SU_DEINSTALL_TARGETS+=	_pkgformat-deinstall
 _SU_DEINSTALL_TARGETS+=	release-deinstall-lock
 .if ${_USE_DESTDIR} == "no"
 _SU_DEINSTALL_TARGETS+=	install-clean
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 4a38dc2047b..e0fcd426c69 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.62 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: install.mk,v 1.63 2011/10/15 00:23:09 reed Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -171,8 +171,8 @@ release-install-localbase-lock: release-localbase-lock
 _INSTALL_ALL_TARGETS+=		acquire-install-localbase-lock
 .endif
 .if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		_flavor-check-conflicts
-_INSTALL_ALL_TARGETS+=		_flavor-check-installed
+_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])
@@ -204,9 +204,9 @@ _INSTALL_ALL_TARGETS+=		check-files-post
 _INSTALL_ALL_TARGETS+=		post-install-script
 .endif
 .if ${_USE_DESTDIR} == "no"
-_INSTALL_ALL_TARGETS+=		_flavor-register
+_INSTALL_ALL_TARGETS+=		_pkgformat-register
 .else
-_INSTALL_ALL_TARGETS+=		_flavor-generate-metadata
+_INSTALL_ALL_TARGETS+=		_pkgformat-generate-metadata
 .endif
 _INSTALL_ALL_TARGETS+=		privileged-install-hook
 .if ${_USE_DESTDIR} != "user-destdir"
@@ -393,5 +393,5 @@ privileged-install-hook: .PHONY
 ### install-clean removes the state files for the "install" and
 ### later phases so that the "install" target may be re-invoked.
 ###
-install-clean: .PHONY package-eat-cookie check-clean _flavor-install-clean
+install-clean: .PHONY package-eat-cookie check-clean _pkgformat-install-clean
 	${RUN} ${RM} -f ${PLIST} ${_COOKIE.install} ${_DEPENDS_PLIST}
diff --git a/mk/install/replace.mk b/mk/install/replace.mk
index d18a12fc734..5fecc4d96f9 100644
--- a/mk/install/replace.mk
+++ b/mk/install/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.13 2011/08/01 11:00:13 apb Exp $
+# $NetBSD: replace.mk,v 1.14 2011/10/15 00:23:09 reed Exp $
 #
 # Public targets:
 #
@@ -11,19 +11,19 @@
 #	It will acquire elevated privileges just-in-time.
 #
 #
-# Private targets that must be defined by the package system flavor:
+# Private targets that must be defined by the package system format:
 #
-# _flavor-replace:
+# _pkgformat-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=no).
 #
-# _flavor-destdir-replace:
+# _pkgformat-destdir-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=yes).
 #
-# _flavor-undo-replace:
-#	Undoes a previous "make _flavor-replace".
+# _pkgformat-undo-replace:
+#	Undoes a previous "make _pkgformat-replace".
 
-# _flavor-destdir-undo-replace:
-#	Undoes a previous "make _flavor-destdir-replace".
+# _pkgformat-destdir-undo-replace:
+#	Undoes a previous "make _pkgformat-destdir-replace".
 
 .if ${_USE_DESTDIR} == "no"
 _REPLACE_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
@@ -49,9 +49,9 @@ replace-message: .PHONY
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
 .if ${_USE_DESTDIR} == "no"
-su-replace: .PHONY _flavor-replace
+su-replace: .PHONY _pkgformat-replace
 .else
-su-replace: .PHONY _flavor-destdir-replace
+su-replace: .PHONY _pkgformat-destdir-replace
 .endif
 MAKEFLAGS.su-replace=	_UPDATE_RUNNING=yes
 MAKEFLAGS.su-replace+=	PKGNAME_REQD=${PKGNAME_REQD:Q}
@@ -67,8 +67,8 @@ undo-replace-message: .PHONY
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 
 .if ${_USE_DESTDIR} == "no"
-su-undo-replace: .PHONY _flavor-undo-replace
+su-undo-replace: .PHONY _pkgformat-undo-replace
 .else
-su-undo-replace: .PHONY _flavor-destdir-undo-replace
+su-undo-replace: .PHONY _pkgformat-destdir-undo-replace
 .endif
 MAKEFLAGS.su-undo-replace=	_UPDATE_RUNNING=yes
-- 
cgit v1.2.3