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.

29 files changed, 136 insertions, 136 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 9f7f23ab822..39b568a02e3 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1978 2011/09/08 20:17:15 abs Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1979 2011/10/15 00:23:07 reed Exp $
 #
 # This file is in the public domain.
 #
@@ -61,7 +61,7 @@ PKG_FAIL_REASON+=	"Circular dependency detected"
 
 .include "features/features.mk"
 
-.include "flavor/bsd.flavor-vars.mk"
+.include "pkgformat/bsd.pkgformat-vars.mk"
 .include "check/bsd.check-vars.mk"
 .include "depends/bsd.depends-vars.mk"
 .include "fetch/bsd.fetch-vars.mk"
@@ -576,7 +576,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}:
 	fi
 .endif
 
-.include "flavor/bsd.flavor.mk"
+.include "pkgformat/bsd.pkgformat.mk"
 
 .include "depends/bsd.depends.mk"
 .include "check/bsd.check.mk"
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 973eab3a6d7..d55ba11eb27 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.316 2011/09/10 16:30:02 abs Exp $
+# $NetBSD: bsd.prefs.mk,v 1.317 2011/10/15 00:23:08 reed Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -701,8 +701,8 @@ PREPEND_PATH+=		${LOCALBASE}/bin
 # System features framework
 .include "features/features-vars.mk"
 
-# Package system flavor definitions
-.include "flavor/bsd.flavor-vars.mk"
+# Package system format definitions
+.include "pkgformat/bsd.pkgformat-vars.mk"
 
 # Make variable definitions cache
 .include "bsd.makevars.mk"
diff --git a/mk/check/check-vulnerable.mk b/mk/check/check-vulnerable.mk
index 4085cd6111c..7f8dad0f99e 100644
--- a/mk/check/check-vulnerable.mk
+++ b/mk/check/check-vulnerable.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check-vulnerable.mk,v 1.4 2007/03/09 00:39:54 rillig Exp $
+# $NetBSD: check-vulnerable.mk,v 1.5 2011/10/15 00:23:08 reed Exp $
 #
 # Public targets:
 #
@@ -10,13 +10,13 @@
 check-vulnerable: .PHONY
 	@${DO_NADA}
 .  else
-check-vulnerable: .PHONY _flavor-check-vulnerable
+check-vulnerable: .PHONY _pkgformat-check-vulnerable
 	@${DO_NADA}
 .endif
 
-# A package flavor does not need to implement this target, so provide a
+# A package format does not need to implement this target, so provide a
 # default implementation.
-.if !target(_flavor-check-vulnerable)
-_flavor-check-vulnerable:
+.if !target(_pkgformat-check-vulnerable)
+_pkgformat-check-vulnerable:
 	@${PHASE_MSG} "Skipping vulnerability checks."
 .endif
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index 6ddd2b1c992..9e29c1d4774 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.21 2011/05/04 09:49:34 obache Exp $
+# $NetBSD: bsd.depends.mk,v 1.22 2011/10/15 00:23:08 reed Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -95,7 +95,7 @@ depends-clean:
 ### depends-cookie (PRIVATE, override)
 ######################################################################
 ### depends-cookie creates the depends "cookie" state file.  This should
-### be overridden per package system flavor.
+### be overridden per package system format.
 ###
 .PHONY: depends-cookie
 depends-cookie:
@@ -111,4 +111,4 @@ depends-cookie:
 #	VARNAME
 #		Either DEPENDS or BUILD_DEPENDS.
 #
-show-depends: .PHONY _flavor-show-depends
+show-depends: .PHONY _pkgformat-show-depends
diff --git a/mk/depends/depends.mk b/mk/depends/depends.mk
index c983fe0eceb..6bf5e4c4ba1 100644
--- a/mk/depends/depends.mk
+++ b/mk/depends/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.15 2008/04/03 14:07:51 joerg Exp $
+# $NetBSD: depends.mk,v 1.16 2011/10/15 00:23:08 reed Exp $
 
 ######################################################################
 ### depends (PUBLIC)
@@ -41,8 +41,8 @@ _REAL_DEPENDS_TARGETS+=	${_PKG_INSTALL_DEPENDS:Dpkg_install-depends}
 _REAL_DEPENDS_TARGETS+=	bootstrap-depends
 _REAL_DEPENDS_TARGETS+=	depends-message
 _REAL_DEPENDS_TARGETS+=	pre-depends-hook
-_REAL_DEPENDS_TARGETS+=	_flavor-install-dependencies
-_REAL_DEPENDS_TARGETS+=	_flavor-post-install-dependencies
+_REAL_DEPENDS_TARGETS+=	_pkgformat-install-dependencies
+_REAL_DEPENDS_TARGETS+=	_pkgformat-post-install-dependencies
 _REAL_DEPENDS_TARGETS+=	depends-cookie
 _REAL_DEPENDS_TARGETS+=	error-check
 
@@ -57,7 +57,7 @@ depends-message:
 ### pre-depends-hook (PRIVATE, override, hook)
 ######################################################################
 ### pre-depends-hook is a generic hook target that is run just before
-### dependencies are installed for _flavor-install-dependencies.
+### dependencies are installed for _pkgformat-install-dependencies.
 ###
 .PHONY: pre-depends-hook
 pre-depends-hook:
diff --git a/mk/flavor/bsd.flavor-vars.mk b/mk/flavor/bsd.flavor-vars.mk
deleted file mode 100644
index 890ed4702e8..00000000000
--- a/mk/flavor/bsd.flavor-vars.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: bsd.flavor-vars.mk,v 1.2 2008/01/04 01:46:27 rillig Exp $
-#
-# This Makefile fragment is included by bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.flavor.mk
-# is included.
-#
-
-# Default to the pkgsrc-package flavor.
-PKG_FLAVOR?=	pkg
-
-.sinclude "${PKG_FLAVOR}/flavor-vars.mk"
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
diff --git a/mk/package/package.mk b/mk/package/package.mk
index 72e5de64082..947c4d0a2c6 100644
--- a/mk/package/package.mk
+++ b/mk/package/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.22 2010/02/24 22:53:34 joerg Exp $
+# $NetBSD: package.mk,v 1.23 2011/10/15 00:23:09 reed Exp $
 #
 # This file provides the code for the "package" phase.
 #
@@ -102,7 +102,7 @@ su-package-all: ${_PACKAGE_ALL_TARGETS}
 ### package-check-installed (PRIVATE, override)
 ######################################################################
 ### package-check-installed verifies that the package is installed on
-### the system.  This should be overridden per package system flavor.
+### the system.  This should be overridden per package system format.
 ###
 .if !target(package-check-installed)
 .PHONY: package-check-installed
@@ -114,7 +114,7 @@ package-check-installed:
 ### package-create (PRIVATE, override)
 ######################################################################
 ### package-create creates the binary package.  This should be overridden
-### per package system flavor.
+### per package system format.
 ###
 .if !target(package-create)
 .PHONY: package-create
diff --git a/mk/flavor/README b/mk/pkgformat/README
index 2d16cd75b3f..8de3f480767 100644
--- a/mk/flavor/README
+++ b/mk/pkgformat/README
@@ -1,17 +1,23 @@
-$NetBSD: README,v 1.8 2011/06/01 07:44:40 dholland Exp $
+$NetBSD: README,v 1.1 2011/10/15 00:23:09 reed Exp $
 
 = Introduction =
 
-A package flavor is a packaging system that is supported by pkgsrc.
+A package format is a packaging system that is supported by pkgsrc.
 Currently, there is only one (the native pkgsrc tools), but maybe we can
 support RPM, dpkg or the Solaris native packages someday. It can also be
 used to test new variants of the packaging tools.
 
+NOTE: The Google Summer of Code 2011 project includes rpm and debian
+http://addpackageforma.sourceforge.net/
+
+The PKG_FORMAT variable is used to select the format. The default
+format is ``pkg''.
+
 = Interface =
 
 == Variables usable at load-time ==
 
-A package system flavor must define the following variables so that they
+A package system format must define the following variables so that they
 can be used when loading Makefiles. (That is, no references to undefined
 variables.)
 
@@ -47,23 +53,17 @@ XXX: Why isn't this variable in the previous list?
 
 The following make targets must be implemented:
 
-* _flavor-check-vulnerable
-* _flavor-deinstall
-* _flavor-show-depends
-* _flavor-install-dependencies
+* _pkgformat-check-vulnerable
+* _pkgformat-deinstall
+* _pkgformat-show-depends
+* _pkgformat-install-dependencies
 * bootstrap-depends
-* _flavor-register
+* _pkgformat-register
 * tarup (XXX: This doesn't sound like a target that should be defined
   here.)
 * tarup-pkg
 * package-install
-* _flavor-replace
-* _flavor-destdir-replace
-* _flavor-undo-replace
-
-= Bugs =
+* _pkgformat-replace
+* _pkgformat-destdir-replace
+* _pkgformat-undo-replace
 
-The name "flavor" is badly chosen, especially since flavor is such a
-broad term that OpenBSD ports collection has implemented something
-entirely different using the same name. (This happened before pkgsrc
-chose to use this word, though, so no blame attaches to them.)
diff --git a/mk/pkgformat/bsd.pkgformat-vars.mk b/mk/pkgformat/bsd.pkgformat-vars.mk
new file mode 100644
index 00000000000..ad9052c5186
--- /dev/null
+++ b/mk/pkgformat/bsd.pkgformat-vars.mk
@@ -0,0 +1,11 @@
+# $NetBSD: bsd.pkgformat-vars.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
+#
+# This Makefile fragment is included by bsd.prefs.mk and defines some
+# variables which must be defined earlier than where bsd.pkgformat.mk
+# is included.
+#
+
+# Default to the pkgsrc package format.
+PKG_FORMAT?=	pkg
+
+.sinclude "${PKG_FORMAT}/pkgformat-vars.mk"
diff --git a/mk/flavor/bsd.flavor.mk b/mk/pkgformat/bsd.pkgformat.mk
index 289b2a38479..9ec830e4fe5 100644
--- a/mk/flavor/bsd.flavor.mk
+++ b/mk/pkgformat/bsd.pkgformat.mk
@@ -1,7 +1,7 @@
-# $NetBSD: bsd.flavor.mk,v 1.2 2007/10/31 12:07:13 rillig Exp $
+# $NetBSD: bsd.pkgformat.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and pulls in the correct
-# target and variable overrides for the selected package system flavor.
+# target and variable overrides for the selected package system format.
 #
 
-.include "${PKG_FLAVOR}/flavor.mk"
+.include "${PKG_FORMAT}/pkgformat.mk"
diff --git a/mk/flavor/pkg/check.mk b/mk/pkgformat/pkg/check.mk
index 235fbe2ba9b..e53d00c9d09 100644
--- a/mk/flavor/pkg/check.mk
+++ b/mk/pkgformat/pkg/check.mk
@@ -1,15 +1,15 @@
-# $NetBSD: check.mk,v 1.13 2009/04/04 19:07:58 joerg Exp $
+# $NetBSD: check.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 
-# _flavor-check-vulnerable:
+# _pkgformat-check-vulnerable:
 #	Checks for known vulnerabilities in the package if a vulnerability
 #	file exists.
 #
 .if defined(NO_PKGTOOLS_REQD_CHECK)
-_flavor-check-vulnerable: .PHONY
+_pkgformat-check-vulnerable: .PHONY
 	${RUN}${DO_NADA}
 .else
-_flavor-check-vulnerable: .PHONY
+_pkgformat-check-vulnerable: .PHONY
 	${RUN}\
 	_PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \
 	vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities;		\
diff --git a/mk/flavor/pkg/deinstall.mk b/mk/pkgformat/pkg/deinstall.mk
index f7476a389ff..5928a41ac5b 100644
--- a/mk/flavor/pkg/deinstall.mk
+++ b/mk/pkgformat/pkg/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.1 2011/10/15 00:23:09 reed Exp $
 
 # Set the appropriate flags to pass to pkg_delete(1) based on the value
 # of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk).
@@ -25,13 +25,13 @@ MAKEFLAGS.su-deinstall+=	_UPDATE_RUNNING=YES
 .  endif
 .endif
 
-# _flavor-deinstall:
+# _pkgformat-deinstall:
 #	Removes a package from the system.
 #
 # See also:
 #	deinstall
 #
-_flavor-deinstall: .PHONY
+_pkgformat-deinstall: .PHONY
 	${RUN}								\
 	if [ x"${OLDNAME}" = x ]; then					\
 		found=`${PKG_INFO} -e "${PKGNAME}" || ${TRUE}`;		\
diff --git a/mk/flavor/pkg/depends.mk b/mk/pkgformat/pkg/depends.mk
index b2d06aad0fc..9893c5ccf27 100644
--- a/mk/flavor/pkg/depends.mk
+++ b/mk/pkgformat/pkg/depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.46 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: depends.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 
 # This command prints out the dependency patterns for all full (run-time)
 # dependencies of the package.
@@ -27,12 +27,12 @@ _RDEPENDS_FILE=	${WRKDIR}/.rdepends
 _FULL_DEPENDS_CMD=	\
 	${AWK} '$$1 == "full" { print $$3; }' < ${_RDEPENDS_FILE}
 
-_REDUCE_DEPENDS_CMD=	${PKGSRC_SETENV} CAT=${CAT:Q}			\
+_REDUCE_DEPENDS_CMD=	${PKGSRC_SETENV} CAT=${CAT:Q}				\
 				PKG_ADMIN=${PKG_ADMIN_CMD:Q}		\
 				PWD_CMD=${PWD_CMD:Q} TEST=${TEST:Q}	\
-			${AWK} -f ${PKGSRCDIR}/mk/flavor/pkg/reduce-depends.awk
+			${AWK} -f ${PKGSRCDIR}/mk/pkgformat/pkg/reduce-depends.awk
 
-_flavor-show-depends: .PHONY
+_pkgformat-show-depends: .PHONY
 	@case ${VARNAME:Q}"" in						\
 	BUILD_DEPENDS)	${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} ;;	\
 	DEPENDS|*)	${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} ;;		\
@@ -41,7 +41,7 @@ _flavor-show-depends: .PHONY
 _LIST_DEPENDS_CMD=	\
 	${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
 		PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
-		${SH} ${PKGSRCDIR}/mk/flavor/pkg/list-dependencies \
+		${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \
 			" "${BOOTSTRAP_DEPENDS:Q} \
 			" "${BUILD_DEPENDS:Q} \
 			" "${DEPENDS:Q}
@@ -49,13 +49,13 @@ _LIST_DEPENDS_CMD=	\
 _LIST_DEPENDS_CMD.bootstrap=	\
 	${PKGSRC_SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \
 		PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \
-		${SH} ${PKGSRCDIR}/mk/flavor/pkg/list-dependencies \
+		${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/list-dependencies \
 			" "${BOOTSTRAP_DEPENDS:Q} " " " "
 
 _RESOLVE_DEPENDS_CMD=	\
 	${PKGSRC_SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_INFO=${PKG_INFO:Q} \
 		_DEPENDS_FILE=${_DEPENDS_FILE:Q} \
-		${SH} ${PKGSRCDIR}/mk/flavor/pkg/resolve-dependencies \
+		${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/resolve-dependencies \
 			" "${BOOTSTRAP_DEPENDS:Q} \
 			" "${BUILD_DEPENDS:Q} \
 			" "${DEPENDS:Q}
@@ -114,10 +114,10 @@ ${_DEPENDS_FILE}:
 ${_RDEPENDS_FILE}: ${_DEPENDS_FILE}
 	${RUN} ${_RESOLVE_DEPENDS_CMD} > ${.TARGET}
 
-# _flavor-install-dependencies:
+# _pkgformat-install-dependencies:
 #	Installs any missing dependencies.
 #
-_flavor-install-dependencies: .PHONY ${_DEPENDS_FILE}
+_pkgformat-install-dependencies: .PHONY ${_DEPENDS_FILE}
 	${RUN}								\
 	exec 3<&0;							\
 	${CAT} ${_DEPENDS_FILE} | 					\
@@ -126,10 +126,10 @@ _flavor-install-dependencies: .PHONY ${_DEPENDS_FILE}
 		${_DEPENDS_INSTALL_CMD} 0<&3;				\
 	done
 
-# _flavor-post-install-dependencies:
+# _pkgformat-post-install-dependencies:
 #	Targets after installing all dependencies.
 #
-_flavor-post-install-dependencies: .PHONY ${_RDEPENDS_FILE}
+_pkgformat-post-install-dependencies: .PHONY ${_RDEPENDS_FILE}
 
 ######################################################################
 ### pkg_install-depends (PUBLIC, pkgsrc/mk/depends/depends.mk)
@@ -158,21 +158,21 @@ pkg_install-depends:
 ###
 .PHONY: bootstrap-depends
 _BOOTSTRAP_DEPENDS_TARGETS+=	acquire-bootstrap-depends-lock
-_BOOTSTRAP_DEPENDS_TARGETS+=	_flavor-bootstrap-depends
+_BOOTSTRAP_DEPENDS_TARGETS+=	_pkgformat-bootstrap-depends
 _BOOTSTRAP_DEPENDS_TARGETS+=	release-bootstrap-depends-lock
 
 bootstrap-depends: ${_BOOTSTRAP_DEPENDS_TARGETS}
 
-.PHONY: _flavor-bootstrap-depends
+.PHONY: _pkgformat-bootstrap-depends
 .if empty(PKG_FAIL_REASON)
-_flavor-bootstrap-depends:
+_pkgformat-bootstrap-depends:
 	${RUN}${_LIST_DEPENDS_CMD.bootstrap} | 				\
 	while read type pattern dir; do					\
 		${TEST} "$$type" = "bootstrap" || continue;		\
 		${_DEPENDS_INSTALL_CMD};				\
 	done
 .else
-_flavor-bootstrap-depends:
+_pkgformat-bootstrap-depends:
 	${RUN}${DO_NADA}
 .endif
 
diff --git a/mk/flavor/pkg/install.mk b/mk/pkgformat/pkg/install.mk
index 1ae5ca2a42c..7fcbc274ffb 100644
--- a/mk/flavor/pkg/install.mk
+++ b/mk/pkgformat/pkg/install.mk
@@ -1,25 +1,25 @@
-# $NetBSD: install.mk,v 1.15 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: install.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
-# _flavor-check-conflicts:
+# _pkgformat-check-conflicts:
 #	Checks for conflicts between the package and installed packages.
 #
 #	XXX: Needs WRKDIR.
 #
-# _flavor-check-installed:
+# _pkgformat-check-installed:
 #	Checks if the package (or an older version of it) is already
 #	installed on the system.
 #
 #	XXX: Needs WRKDIR.
 #
-# _flavor-register:
+# _pkgformat-register:
 #	Populates the package database with the appropriate entries to
 #	register the package as being installed on the system.
 #
-# _flavor-install-clean:
+# _pkgformat-install-clean:
 #	Removes the state files from the run of an ``install'' target.
 #
 
-_flavor-check-conflicts: .PHONY error-check
+_pkgformat-check-conflicts: .PHONY error-check
 	${RUN}${RM} -f ${WRKDIR}/.CONFLICTS
 .for _conflict_ in ${CONFLICTS}
 	${RUN}								\
@@ -38,7 +38,7 @@ _flavor-check-conflicts: .PHONY error-check
 	${ECHO} "Please remove conflicts first with pkg_delete(1).";	\
 	${RM} -f ${WRKDIR}/.CONFLICTS
 
-_flavor-check-installed: .PHONY error-check
+_pkgformat-check-installed: .PHONY error-check
 	${RUN}								\
 	found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`";	\
 	${TEST} -n "$$found" || exit 0;					\
@@ -53,11 +53,11 @@ _flavor-check-installed: .PHONY error-check
 	${ECHO} "      re-linking dependencies, risking various problems."
 
 _REGISTER_DEPENDENCIES=							\
-	${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q}				\
+	${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q}			\
 		AWK=${TOOLS_AWK:Q}					\
-	${SH} ${PKGSRCDIR}/mk/flavor/pkg/register-dependencies
+	${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/register-dependencies
 
-_flavor-register: .PHONY _flavor-generate-metadata ${_RDEPENDS_FILE}
+_pkgformat-register: .PHONY _pkgformat-generate-metadata ${_RDEPENDS_FILE}
 	@${STEP_MSG} "Registering installation for ${PKGNAME}"
 	${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME}
 	${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME}
@@ -72,4 +72,4 @@ _flavor-register: .PHONY _flavor-generate-metadata ${_RDEPENDS_FILE}
 	${RUN}${GREP} '^@pkgdir ' < ${_PKG_DBDIR}/${PKGNAME}/+CONTENTS | \
 	    while read tag dir; do ${MKDIR} ${PREFIX}/$$dir; done
 
-_flavor-install-clean: .PHONY _flavor-clean-metadata
+_pkgformat-install-clean: .PHONY _pkgformat-clean-metadata
diff --git a/mk/flavor/pkg/list-dependencies b/mk/pkgformat/pkg/list-dependencies
index 24835e72dc2..a7c6d9c37ae 100755
--- a/mk/flavor/pkg/list-dependencies
+++ b/mk/pkgformat/pkg/list-dependencies
@@ -43,7 +43,7 @@ set -e
 trap "exit 1" USR1
 
 reduce_depends() {
-	${AWK} -f ${PKGSRCDIR}/mk/flavor/pkg/reduce-depends.awk "$1" \
+	${AWK} -f ${PKGSRCDIR}/mk/pkgformat/pkg/reduce-depends.awk "$1" \
 	|| kill -USR1 $$
 }
 
diff --git a/mk/flavor/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk
index e2a0a89fcc3..923a94d53ea 100644
--- a/mk/flavor/pkg/metadata.mk
+++ b/mk/pkgformat/pkg/metadata.mk
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.36 2010/12/02 11:15:10 reed Exp $
+# $NetBSD: metadata.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -236,7 +236,7 @@ ${_MESSAGE_FILE}: ${MESSAGE_SRC}
 # PKGSRC_MESSAGE_RECIPIENTS.
 #
 .PHONY: install-display-message
-_flavor-register: install-display-message
+_pkgformat-register: install-display-message
 install-display-message: ${_MESSAGE_FILE}
 	@${STEP_MSG} "Please note the following:"
 	@${ECHO_MSG} ""
@@ -382,9 +382,9 @@ ${_CONTENTS_FILE}: ${_CONTENTS_TARGETS}
 	${RUN}${PKG_CREATE} ${_PKG_ARGS_INSTALL} -O ${PKGFILE:T} > ${.TARGET}
 
 ######################################################################
-### _flavor-generate-metadata (PRIVATE)
+### _pkgformat-generate-metadata (PRIVATE)
 ######################################################################
-### _flavor-generate-metadata is a convenience target for generating
+### _pkgformat-generate-metadata is a convenience target for generating
 ### all of the pkgsrc binary package meta-data files.  It populates
 ### ${PKG_DB_TMPDIR} with the following files:
 ###
@@ -400,16 +400,16 @@ ${_CONTENTS_FILE}: ${_CONTENTS_TARGETS}
 ###
 ### See the targets above for descriptions of each of those files.
 ###
-.PHONY: _flavor-generate-metadata
-_flavor-generate-metadata: ${_METADATA_TARGETS}
+.PHONY: _pkgformat-generate-metadata
+_pkgformat-generate-metadata: ${_METADATA_TARGETS}
 
 ######################################################################
-### _flavor-clean-metadata (PRIVATE)
+### _pkgformat-clean-metadata (PRIVATE)
 ######################################################################
-### _flavor-clean-metadata is a convenience target for removing the
+### _pkgformat-clean-metadata is a convenience target for removing the
 ### package meta-data files.  This is essentially the reverse action
-### of _flavor-generate-metadata.
+### of _pkgformat-generate-metadata.
 ###
-.PHONY: _flavor-clean-metadata
-_flavor-clean-metadata:
+.PHONY: _pkgformat-clean-metadata
+_pkgformat-clean-metadata:
 	${RUN}${RM} -f ${_METADATA_TARGETS}
diff --git a/mk/flavor/pkg/package.mk b/mk/pkgformat/pkg/package.mk
index 1fbf1bd4166..cdee24570f4 100644
--- a/mk/flavor/pkg/package.mk
+++ b/mk/pkgformat/pkg/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.22 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: package.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 
 .if defined(PKG_SUFX)
 WARNINGS+=		"PKG_SUFX is deprecated, please use PKG_COMPRESSION"
diff --git a/mk/flavor/pkg/flavor-vars.mk b/mk/pkgformat/pkg/pkgformat-vars.mk
index 4f03736d55d..dbcf7870bf7 100644
--- a/mk/flavor/pkg/flavor-vars.mk
+++ b/mk/pkgformat/pkg/pkgformat-vars.mk
@@ -1,8 +1,8 @@
-# $NetBSD: flavor-vars.mk,v 1.16 2010/09/14 22:29:07 gdt Exp $
+# $NetBSD: pkgformat-vars.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
-# flavor.mk is included.
+# pkgformat.mk is included.
 #
 
 PKGSRC_MESSAGE_RECIPIENTS?=	# empty
diff --git a/mk/flavor/pkg/flavor.mk b/mk/pkgformat/pkg/pkgformat.mk
index 7a02205a453..2652c3da044 100644
--- a/mk/flavor/pkg/flavor.mk
+++ b/mk/pkgformat/pkg/pkgformat.mk
@@ -1,4 +1,4 @@
-# $NetBSD: flavor.mk,v 1.3 2007/10/31 12:07:13 rillig Exp $
+# $NetBSD: pkgformat.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 # This Makefile fragment provides variable and target overrides that are
 # specific to the pkgsrc native package format.
diff --git a/mk/flavor/pkg/reduce-depends.awk b/mk/pkgformat/pkg/reduce-depends.awk
index ac6be2278a6..c27d6429d73 100755
--- a/mk/flavor/pkg/reduce-depends.awk
+++ b/mk/pkgformat/pkg/reduce-depends.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: reduce-depends.awk,v 1.7 2007/11/22 09:54:41 rillig Exp $
+# $NetBSD: reduce-depends.awk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/mk/flavor/pkg/register-dependencies b/mk/pkgformat/pkg/register-dependencies
index c9a4ef3cbb9..148ef8ac340 100755
--- a/mk/flavor/pkg/register-dependencies
+++ b/mk/pkgformat/pkg/register-dependencies
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: register-dependencies,v 1.4 2007/05/28 11:07:00 martti Exp $
+# $NetBSD: register-dependencies,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 ######################################################################
 #
diff --git a/mk/flavor/pkg/replace.mk b/mk/pkgformat/pkg/replace.mk
index 20cec47a040..17a81b32463 100644
--- a/mk/flavor/pkg/replace.mk
+++ b/mk/pkgformat/pkg/replace.mk
@@ -1,10 +1,10 @@
-# $NetBSD: replace.mk,v 1.33 2011/09/08 20:17:16 abs Exp $
+# $NetBSD: replace.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 #
 
-# _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).
 #
 # See also:
@@ -15,7 +15,7 @@
 # currently isn't, and the check-files target for other packages
 # can be confused when a +REQUIRED_BY files suddenly disappears.
 #
-_flavor-replace: \
+_pkgformat-replace: \
 	replace-names \
 	replace-tarup \
 	replace-preserve-installed-info \
@@ -27,19 +27,19 @@ _flavor-replace: \
 	replace-fixup-installed-info \
 	.PHONY
 
-_flavor-destdir-replace: \
+_pkgformat-destdir-replace: \
 	replace-names \
 	replace-tarup \
 	replace-destdir \
 	.PHONY
 
-# _flavor-undo-replace:
-#	Undoes the actions from a previous _flavor-replace.
+# _pkgformat-undo-replace:
+#	Undoes the actions from a previous _pkgformat-replace.
 #
 # See also:
 #	undo-replace
 #
-_flavor-undo-replace: \
+_pkgformat-undo-replace: \
 	undo-replace-check \
 	replace-preserve-installed-info \
 	replace-preserve-required-by \
@@ -49,7 +49,7 @@ _flavor-undo-replace: \
 	replace-clean \
 	.PHONY
 
-_flavor-destdir-undo-replace: \
+_pkgformat-destdir-undo-replace: \
 	undo-replace-check \
 	undo-destdir-replace-install \
 	replace-clean \
diff --git a/mk/flavor/pkg/resolve-dependencies b/mk/pkgformat/pkg/resolve-dependencies
index 3ee0bba4a89..3ee0bba4a89 100755
--- a/mk/flavor/pkg/resolve-dependencies
+++ b/mk/pkgformat/pkg/resolve-dependencies
diff --git a/mk/flavor/pkg/utility.mk b/mk/pkgformat/pkg/utility.mk
index e436e8196eb..31ef3923186 100644
--- a/mk/flavor/pkg/utility.mk
+++ b/mk/pkgformat/pkg/utility.mk
@@ -1,4 +1,4 @@
-# $NetBSD: utility.mk,v 1.11 2008/11/29 13:54:45 rillig Exp $
+# $NetBSD: utility.mk,v 1.1 2011/10/15 00:23:09 reed Exp $
 
 # The 'info' target can be used to display information about a package.
 .PHONY: info
diff --git a/mk/flavor/pkg/views.mk b/mk/pkgformat/pkg/views.mk
index 45fa056e7ee..db1929f8517 100644
--- a/mk/flavor/pkg/views.mk
+++ b/mk/pkgformat/pkg/views.mk
@@ -1,4 +1,4 @@
-# $NetBSD: views.mk,v 1.7 2011/09/08 20:17:16 abs Exp $
+# $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"