Module Name:	pkgsrc
Committed By:	jlam
Date:		Thu Jul  6 22:08:32 UTC 2006

Modified Files:
	pkgsrc/mk: bsd.pkg.barrier.mk
	pkgsrc/mk/package: package.mk

Log Message:
The "replace" target does conceptually the same thing as the "install"
target in that it installs the currently-built software into the
filesystem.  In that case where "replace" is specified as a target on
the command line, make "replace" and not "install" be the source target
for "package".

Also, place the "replace" target between the "install" and "package"
targets in _BARRIER_POST_TARGETS as it should be legal to do those
steps in that order (but not in another order).

These changes make the following work:

	make replace package

In this example, the currently installed package will be replaced and
the newly-installed software will be packaged, all within the same
make process.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 pkgsrc/mk/bsd.pkg.barrier.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/mk/package/package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.