 @@ -1,14 +1,14 @@
-$NetBSD: README,v 1.6 2007/10/01 10:08:20 rillig Exp $
+$NetBSD: README,v 1.7 2009/06/09 08:40:27 joerg Exp $
 = Introduction =
 A package flavor 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.
 = Interface =
 == Variables usable at load-time ==
 A package system flavor must define the following variables so that they
 @@ -48,21 +48,22 @@ XXX: Why isn't this variable in the prev
 The following make targets must be implemented:
 * _flavor-check-vulnerable
 * _flavor-deinstall
 * _flavor-show-depends
 * _flavor-install-dependencies
 * bootstrap-depends
 * _flavor-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 =
 The name "flavor" is badly chosen, especially since flavor is such a
 broad term that OpenBSD ports collection has chosen to implement
 something entirely different using the same name. (This has happended
 before pkgsrc has chosen to use this word, though, so no blame on them.)

 @@ -1,39 +1,49 @@
-# $NetBSD: replace.mk,v 1.24 2008/01/23 14:48:50 gdt Exp $
+# $NetBSD: replace.mk,v 1.25 2009/06/09 08:40:27 joerg Exp $
+#
 # _flavor-replace:
-#	Updates a package in-place on the system.
+#	Updates a package in-place on the system (USE_DESTDIR=yes).
+#
 # _flavor-destdir-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=yes).
+#
 # See also:
 #	replace
+#
 # XXX: The whole replacement, from deinstalling the old package up
 # to installing the new package, should be one transaction. It
 # currently isn't, and the check-files target for other packages
 # can be confused when a +REQUIRED_BY files suddenly disappears.
+#
 _flavor-replace: \
 	replace-names \
 	replace-tarup \
 	replace-preserve-installed-info \
 	replace-preserve-required-by \
 	deinstall \
 	install-clean \
 	install \
 	replace-fixup-required-by \
 	replace-fixup-installed-info \
 	.PHONY
 _flavor-destdir-replace: \
 	replace-names \
 	replace-destdir \
 	replace-fixup-required-by \
 	replace-fixup-installed-info \
 	.PHONY
 # _flavor-undo-replace:
 #	Undoes the actions from a previous _flavor-replace.
+#
 # See also:
 #	undo-replace
+#
 _flavor-undo-replace: \
 	undo-replace-check \
 	replace-preserve-installed-info \
 	replace-preserve-required-by \
 	deinstall \
 	undo-replace-install \
 	replace-fixup-required-by \
 @@ -162,13 +172,25 @@ replace-fixup-installed-info: .PHONY
 		${TEST} ! -f ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO || \
 		${PKG_ADMIN} unset $$var $$newname;			\
 	done
 # Removes the state files for the "replace" target, so that it may be re-invoked.
+#
 replace-clean: .PHONY
 	${RUN} ${_REPLACE_OLDNAME_CMD};					\
 	${_REPLACE_NEWNAME_CMD};					\
 	${RM} -f ${WRKDIR}/$$oldname${PKG_SUFX};			\
 	${RM} -f ${WRKDIR}/$$newname${PKG_SUFX};			\
 	${RM} -f ${_REPLACE_OLDNAME_FILE} ${_REPLACE_NEWNAME_FILE}	\
 		${_COOKIE.replace}
 replace-destdir: .PHONY
 	@${PHASE_MSG} "Updating using binary package of "${PKGNAME:Q}
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 	@${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
 	${PKG_ADD} -u -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE}
 	@${ECHO} "Fixing recorded cwd..."
 	@${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
 	@${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
 .else
 	${PKG_ADD} -u ${PKGFILE}
 .endif

 @@ -1,54 +1,65 @@
-# $NetBSD: replace.mk,v 1.10 2007/03/09 03:28:58 rillig Exp $
+# $NetBSD: replace.mk,v 1.11 2009/06/09 08:40:28 joerg Exp $
+#
 # Public targets:
+#
 # replace:
 #	Updates a package in-place on the system.
 #	It will acquire elevated privileges just-in-time.
+#
 # undo-replace:
 #	Undoes the effects of a previous "make replace".
 #	It will acquire elevated privileges just-in-time.
+#
+#
 # Private targets that must be defined by the package system flavor:
+#
 # _flavor-replace:
-#	Updates a package in-place on the system.
+#	Updates a package in-place on the system (USE_DESTDIR=no).
+#
 # _flavor-destdir-replace:
 #	Updates a package in-place on the system (USE_DESTDIR=yes).
+#
 # _flavor-undo-replace:
 #	Undoes a previous "make _flavor-replace".
 .if ${_USE_DESTDIR} == "no"
 _REPLACE_TARGETS+=	${_PKGSRC_BUILD_TARGETS}
 .else
 _REPLACE_TARGETS+=	package
 .endif
 _REPLACE_TARGETS+=	replace-message
 _REPLACE_TARGETS+=	unprivileged-install-hook
+#
 # replace
+#
 .PHONY: replace
 .if defined(_PKGSRC_BARRIER)
 replace: ${_REPLACE_TARGETS} su-target
 .else
 replace: barrier
 .endif
 replace-message: .PHONY
 	@${PHASE_MSG} "Replacing for ${PKGNAME}"
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 .if ${_USE_DESTDIR} == "no"
 su-replace: .PHONY _flavor-replace
 .else
 su-replace: .PHONY _flavor-destdir-replace
 .endif
 MAKEFLAGS.su-replace=	_UPDATE_RUNNING=yes
+#
 # undo-replace
+#
 undo-replace: .PHONY undo-replace-message su-target
 undo-replace-message: .PHONY
 	@${PHASE_MSG} "Undoing replacement for ${PKGNAME}"
 	@${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR."
 su-undo-replace: .PHONY _flavor-undo-replace

 @@ -1,29 +1,29 @@
-# $NetBSD: package.mk,v 1.20 2009/03/17 22:13:36 rillig Exp $
+# $NetBSD: package.mk,v 1.21 2009/06/09 08:40:28 joerg Exp $
+#
 # This file provides the code for the "package" phase.
+#
 # Public targets:
+#
 # package:
 #	Generates a binary package.
 #	It will acquire elevated privileges just-in-time.
+#
 #	XXX: From which files is the binary package generated? The
 #	installed files in LOCALBASE, or some files in WRKDIR/.destdir?
+#
 _PACKAGE_TARGETS+=	check-vulnerable
-.if make(replace)
+.if make(replace) && ${_USE_DESTDIR} == "no"
 _PACKAGE_TARGETS+=	replace
 .else
 _PACKAGE_TARGETS+=	install
 .endif
 _PACKAGE_TARGETS+=	acquire-package-lock
 _PACKAGE_TARGETS+=	${_COOKIE.package}
 _PACKAGE_TARGETS+=	release-package-lock
 .PHONY: package
 .if !target(package)
 .  if exists(${_COOKIE.package})
 package:
 	@${DO_NADA}