diff options
| author | rillig <rillig> | 2008-01-23 14:07:07 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2008-01-23 14:07:07 +0000 |
| commit | 111bf702047e61762812459b1e5042898e2b8b7c (patch) | |
| tree | 3390269984e3b118e2d75c78fd2c7f9aa5f6b9a4 | |
| parent | 8d28f4fa01f4a53cb91cf98e797717bfa08a3203 (diff) | |
| download | pkgsrc-111bf702047e61762812459b1e5042898e2b8b7c.tar.gz | |
Don't run pkg_create with the -v option. It prints a temporary package
name which isn't correct, and the "Value of SrcDir" that is used is not
important to any pkgsrc user. Instead, let the pkgsrc infrastructure
print the package name.
| -rw-r--r-- | mk/flavor/pkg/metadata.mk | 4 | ||||
| -rw-r--r-- | mk/flavor/pkg/package.mk | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index 9cdc9ada3cf..2b158876ef2 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.28 2008/01/05 22:06:20 rillig Exp $ +# $NetBSD: metadata.mk,v 1.29 2008/01/23 14:07:07 rillig Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -316,7 +316,7 @@ ${_DEPENDS_PLIST}: ${PLIST} ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ ${CAT} ${PLIST}; } > ${.TARGET} -_PKG_CREATE_ARGS+= -v -l -U +_PKG_CREATE_ARGS+= -l -U _PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE} _PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE} _PKG_CREATE_ARGS+= -c ${_COMMENT_FILE} diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk index b4a7a39e425..4773499f855 100644 --- a/mk/flavor/pkg/package.mk +++ b/mk/flavor/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.15 2008/01/05 22:06:20 rillig Exp $ +# $NetBSD: package.mk,v 1.16 2008/01/23 14:07:07 rillig Exp $ PKG_SUFX?= .tgz PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} @@ -40,6 +40,7 @@ _PKG_ARGS_PACKAGE+= -E ${PKGFILE}: ${_CONTENTS_TARGETS} ${RUN} ${MKDIR} ${.TARGET:H} + @${STEP_MSG} "Creating binary package ${.TARGET}" ${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \ if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \ ${MV} -f "$$tmpname" ${.TARGET}; \ |