details: https://anonhg.NetBSD.org/pkgsrc/rev/f66b14a43908
branches: trunk
changeset: 533572:f66b14a43908
user: gdt <gdt%pkgsrc.org@localhost>
date: Fri Sep 21 15:13:55 2007 +0000
description:
When replacing, use the oldname as found in work/.replace_oldname to
tar up, instead of PKGBASE.
This enables modifying that file to have a package that isn't
automatically found be the replace target, e.g., "echo libglade2-2.6.2
> work/.replace_oldname" after make replace fails to find a package to
tar up when doing make replace in libglade.
diffstat:
mk/flavor/pkg/replace.mk | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (25 lines):
diff -r 516535a57ae4 -r f66b14a43908 mk/flavor/pkg/replace.mk
--- a/mk/flavor/pkg/replace.mk Fri Sep 21 14:12:19 2007 +0000
+++ b/mk/flavor/pkg/replace.mk Fri Sep 21 15:13:55 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.18 2007/08/13 14:18:23 gdt Exp $
+# $NetBSD: replace.mk,v 1.19 2007/09/21 15:13:55 gdt Exp $
#
# _flavor-replace:
@@ -74,11 +74,12 @@
### package using pkg_tarup.
###
replace-tarup: .PHONY
- ${RUN} [ -x ${_PKG_TARUP_CMD:Q} ] \
- || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found.";
+ ${RUN} ${_REPLACE_OLDNAME_CMD}; \
+ [ -x ${_PKG_TARUP_CMD:Q} ] \
+ || ${FAIL_MSG} ${_PKG_TARUP_CMD:Q}" was not found."; \
${SETENV} PKG_DBDIR=${_PKG_DBDIR} PKG_SUFX=${PKG_SUFX} \
PKGREPOSITORY=${WRKDIR} \
- ${_PKG_TARUP_CMD} ${PKGBASE}
+ ${_PKG_TARUP_CMD} $${oldname}
######################################################################
### undo-replace-install (PRIVATE)