 @@ -1,68 +1,69 @@
-$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
 can be used when loading Makefiles. (That is, no references to undefined
 variables.)
 === Legacy ===
 * PKG_DBDIR (TODO: Make the other parts of pkgsrc independent of that
   variable; this should go away.)
 === Packaging commands ===
 The following variables all refer to shell commands, which must accept
 some command line options that are detailed in the respective man pages.
 (TODO: Find out which command line options are really used and which
 ones are useful. Document them.)
 * PKG_ADD
 * PKG_ADMIN
 * PKG_CREATE
 * PKG_DELETE
 * PKG_INFO
 * PKG_VIEW
 * LINKFARM
 * PKG_BEST_EXISTS
 The following variables must be defined so that they can be used in
 shell commands. They may contain references to all other variables.
 * PKG_FILELIST_CMD
 XXX: Why isn't this variable in the previous list?
 == Make targets ==
 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,174 +1,196 @@
-# $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 \
 	replace-clean \
 	.PHONY
 _INSTALLED_INFO_FILE=	${WRKDIR}/.replace-+INSTALLED_INFO
 _REQUIRED_BY_FILE=	${WRKDIR}/.replace-+REQUIRED_BY
 _COOKIE.replace=	${WRKDIR}/.replace_done
 _REPLACE_OLDNAME_FILE=	${WRKDIR}/.replace_oldname
 _REPLACE_NEWNAME_FILE=	${WRKDIR}/.replace_newname
 _REPLACE_OLDNAME_CMD=	\
 	[ -f ${_REPLACE_OLDNAME_FILE} ] \
 	|| ${FAIL_MSG} "[${.TARGET}] ${_REPLACE_OLDNAME_FILE}: File not found"; \
 	oldname=`${CAT} ${_REPLACE_OLDNAME_FILE}`
 _REPLACE_NEWNAME_CMD=	\
 	[ -f ${_REPLACE_NEWNAME_FILE} ] \
 	|| ${FAIL_MSG} "[${.TARGET}] ${_REPLACE_NEWNAME_FILE}: File not found"; \
 	newname=`${CAT} ${_REPLACE_NEWNAME_FILE}`
 # Verifies that there was a previous "replace" action performed that can be undone.
+#
 undo-replace-check: .PHONY
 	${RUN} [ -f ${_COOKIE.replace} ] \
 	|| ${FAIL_MSG} "No replacement to undo!"
 # Generates a binary package for the (older) installed package using pkg_tarup.
+#
 replace-tarup: .PHONY
 	${RUN} [ -x ${_PKG_TARUP_CMD:Q} ] \
 	|| ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found.";		\
 	${_REPLACE_OLDNAME_CMD};					\
 	${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX}		\
 		PKGREPOSITORY=${WRKDIR}					\
 		${_PKG_TARUP_CMD} $${oldname} ||			\
 	${FAIL_MSG} "Could not pkg_tarup $${oldname}".
 # Re-installs the old package that has been saved by replace-tarup.
+#
 undo-replace-install: .PHONY
 	@${PHASE_MSG} "Re-adding ${PKGNAME} from saved tar-up package."
 	${RUN} ${_REPLACE_OLDNAME_CMD};					\
 	${ECHO} "Installing saved package ${WRKDIR}/$${oldname}${PKG_SUFX}"; \
 	${PKG_ADD} ${WRKDIR}/$${oldname}${PKG_SUFX}
 # Computes and saves the full names of the installed package to be replaced
 # (oldname) and the package that will be installed (newname), so that these
 # names are available later.
+#
 replace-names: .PHONY
 	${RUN} if [ x"${OLDNAME}" = x ]; then				\
 		wildcard=${PKGWILDCARD:Q};				\
 	else								\
 		wildcard="${OLDNAME}-[0-9]*";				\
 	fi;								\
 	${_PKG_BEST_EXISTS} "$${wildcard}" > ${_REPLACE_OLDNAME_FILE}
 	${RUN} ${ECHO} ${PKGNAME} > ${_REPLACE_NEWNAME_FILE}
 	${RUN} ${CP} -f ${_REPLACE_NEWNAME_FILE} ${_COOKIE.replace}
 # Saves and removes the +INSTALLED_INFO file from the installed package.
+#
 replace-preserve-installed-info: .PHONY
 	@${STEP_MSG} "Preserving existing +INSTALLED_INFO file."
 	${RUN} ${_REPLACE_OLDNAME_CMD};					\
 	installed_info="${_PKG_DBDIR}/$$oldname/+INSTALLED_INFO";	\
 	${TEST} ! -f "$$installed_info" ||				\
 	${MV} $$installed_info ${_INSTALLED_INFO_FILE}
 # Saves and removes the +REQUIRED_BY file from the installed package.
+#
 replace-preserve-required-by: .PHONY
 	@${STEP_MSG} "Preserving existing +REQUIRED_BY file."
 	${RUN} ${_REPLACE_OLDNAME_CMD};					\
 	required_by="${_PKG_DBDIR}/$$oldname/+REQUIRED_BY";		\
 	${TEST} ! -f "$$required_by" ||					\
 	${MV} $$required_by ${_REQUIRED_BY_FILE}
 # Fixes the +CONTENTS files of dependent packages to refer to the
 # replacement package, and puts the +REQUIRED_BY file back into place.
 # It also sets the unsafe_depends_strict tag on each dependent package,
 # and sets the unsafe_depends tag if the replaced package has a different
 # version.
+#
 # XXX Only set unsafe_depends if there is an ABI change.
+#
 replace-fixup-required-by: .PHONY
 	@${STEP_MSG} "Fixing @pkgdep entries in dependent packages."
 	${RUN} ${_REPLACE_OLDNAME_CMD};					\
 	${_REPLACE_NEWNAME_CMD};					\
 	${TEST} -f ${_REQUIRED_BY_FILE} || exit 0;			\
 	${CAT} ${_REQUIRED_BY_FILE} |					\
 	while read pkg; do						\
 		case $$pkg in						\
 		"")	continue ;;					\
 		/*)	pkgdir="$$pkg" ;;				\
 		*)	pkgdir="${_PKG_DBDIR}/$$pkg" ;;			\
 		esac;							\
 		contents="$$pkgdir/+CONTENTS";				\
 		newcontents="$$contents.$$$$";				\
 		${SETENV} OLDNAME="$$oldname" NEWNAME="$$newname"	\
 		${AWK} '($$0 ~ "^@pkgdep " ENVIRON["OLDNAME"])		\
 			{ print "@pkgdep " ENVIRON["NEWNAME"]; next }	\
 			{ print }'					\
 			$$contents > $$newcontents;			\
 		${MV} -f $$newcontents $$contents;			\
 		${PKG_ADMIN} set unsafe_depends_strict=YES $$pkg;	\
 		if ${TEST} "$$oldname" != "$$newname"; then		\
 			${PKG_ADMIN} set unsafe_depends=YES $$pkg;	\
 		fi;							\
 	done;								\
 	${MV} ${_REQUIRED_BY_FILE} ${_PKG_DBDIR}/$$newname/+REQUIRED_BY
 # Removes unsafe_depends* and rebuild tags from this package.
+#
 # XXX: pkg_admin should not complain on unset with no +INSTALLED_INFO.
+#
 replace-fixup-installed-info: .PHONY
 	@${STEP_MSG} "Removing unsafe_depends and rebuild tags."
 	${RUN} ${_REPLACE_NEWNAME_CMD};					\
 	[ ! -f ${_INSTALLED_INFO_FILE} ] ||			\
 	${MV} ${_INSTALLED_INFO_FILE} ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO; \
 	for var in unsafe_depends unsafe_depends_strict rebuild; do	\
 		${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,55 +1,66 @@
-# $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
 MAKEFLAGS.su-undo-replace=	_UPDATE_RUNNING=yes

 @@ -1,140 +1,140 @@
-# $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}
 .  elif defined(_PKGSRC_BARRIER)
 package: ${_PACKAGE_TARGETS}
 .  else
 package: barrier
 .  endif
 .endif
 .PHONY: acquire-package-lock release-package-lock
 acquire-package-lock: acquire-lock
 release-package-lock: release-lock
 .if exists(${_COOKIE.package})
 ${_COOKIE.package}:
 	@${DO_NADA}
 .else
 ${_COOKIE.package}: real-package
 .endif
 ######################################################################
 ### real-package (PRIVATE)
 ######################################################################
 ### real-package is a helper target onto which one can hook all of the
 ### targets that do the actual packaging of the built objects.
 ###
 _REAL_PACKAGE_TARGETS+=	package-message
 _REAL_PACKAGE_TARGETS+=	package-all
 _REAL_PACKAGE_TARGETS+=	package-cookie
 .PHONY: real-package
 real-package: ${_REAL_PACKAGE_TARGETS}
 .PHONY: package-message
 package-message:
 	@${PHASE_MSG} "Building binary package for ${PKGNAME}"
 ######################################################################
 ### package-cookie (PRIVATE)
 ######################################################################
 ### package-cookie creates the "package" cookie file
 ###
 .PHONY: package-cookie
 package-cookie:
 	${RUN} ${TEST} ! -f ${_COOKIE.package} || ${FALSE}
 	${RUN} ${MKDIR} ${_COOKIE.package:H}
 	${RUN} ${ECHO} ${PKGNAME} > ${_COOKIE.package}
 ######################################################################
 ### The targets below are run with elevated privileges.
 ######################################################################
 ######################################################################
 ### package-all, su-package-all (PRIVATE)
 ######################################################################
 ### package-all is a helper target to create the binary package and
 ### generate any necessary warnings.
 ###
 .if ${_USE_DESTDIR} == "no"
 _PACKAGE_ALL_TARGETS+=	package-check-installed
 .endif
 _PACKAGE_ALL_TARGETS+=	package-create
 _PACKAGE_ALL_TARGETS+=	_package-warnings
 _PACKAGE_ALL_TARGETS+=	error-check
 .PHONY: package-all su-package-all
 .if !empty(_MAKE_PACKAGE_AS_ROOT:M[Yy][Ee][Ss])
 package-all: su-target
 .else
 package-all: su-package-all
 .endif
 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.
 ###
 .if !target(package-check-installed)
 .PHONY: package-check-installed
 package-check-installed:
 	@${DO_NADA}
 .endif
 ######################################################################
 ### package-create (PRIVATE, override)
 ######################################################################
 ### package-create creates the binary package.  This should be overridden
 ### per package system flavor.
 ###
 .if !target(package-create)
 .PHONY: package-create
 package-create:
 	@${DO_NADA}
 .endif
 # Displays warnings about the binary package.
+#
 _package-warnings: .PHONY
 .if defined(NO_BIN_ON_CDROM)
 	@${WARNING_MSG} "${PKGNAME} may not be put on a CD-ROM:"
 	@${WARNING_MSG} ${NO_BIN_ON_CDROM:Q}
 .endif
 .if defined(NO_BIN_ON_FTP)
 	@${WARNING_MSG} "${PKGNAME} may not be made available through FTP:"
 	@${WARNING_MSG} ${NO_BIN_ON_FTP:Q}
 .endif
 .if defined(ABI_DEPENDS) && !empty(USE_ABI_DEPENDS:M[Nn][Oo])
 	@${WARNING_MSG} "ABI dependency recommendations are being ignored!"
 	@${WARNING_MSG} "${PKGNAME} should not be uploaded nor"
 	@${WARNING_MSG} "otherwise be used as a binary package!"
 .endif