Wed Jan 23 14:07:07 2008 UTC ()
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.


(rillig)
diff -r1.28 -r1.29 pkgsrc/mk/flavor/pkg/metadata.mk
diff -r1.15 -r1.16 pkgsrc/mk/flavor/pkg/package.mk
cvs diff -r1.28 -r1.29 pkgsrc/mk/flavor/pkg/Attic/metadata.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/metadata.mk 2008/01/05 22:06:20 1.28
+++ pkgsrc/mk/flavor/pkg/Attic/metadata.mk 2008/01/23 14:07:07 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: metadata.mk,v 1.28 2008/01/05 22:06:20 rillig Exp $ 1# $NetBSD: metadata.mk,v 1.29 2008/01/23 14:07:07 rillig Exp $
2 2
3###################################################################### 3######################################################################
4### The targets below are all PRIVATE. 4### The targets below are all PRIVATE.
5###################################################################### 5######################################################################
6 6
7###################################################################### 7######################################################################
8### 8###
9### Temporary package meta-data directory. The contents of this directory 9### Temporary package meta-data directory. The contents of this directory
10### are copied directly into the real package meta-data directory. 10### are copied directly into the real package meta-data directory.
11### 11###
12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb 12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb
13 13
14unprivileged-install-hook: ${PKG_DB_TMPDIR} 14unprivileged-install-hook: ${PKG_DB_TMPDIR}
@@ -306,27 +306,27 @@ ${_SIZE_PKG_FILE}: plist @@ -306,27 +306,27 @@ ${_SIZE_PKG_FILE}: plist
306### 306###
307_CONTENTS_FILE= ${PKG_DB_TMPDIR}/+CONTENTS 307_CONTENTS_FILE= ${PKG_DB_TMPDIR}/+CONTENTS
308_METADATA_TARGETS+= ${_CONTENTS_FILE} 308_METADATA_TARGETS+= ${_CONTENTS_FILE}
309 309
310_DEPENDS_PLIST= ${WRKDIR}/.PLIST_deps 310_DEPENDS_PLIST= ${WRKDIR}/.PLIST_deps
311 311
312${_DEPENDS_PLIST}: ${PLIST} 312${_DEPENDS_PLIST}: ${PLIST}
313 ${RUN} { \ 313 ${RUN} { \
314 ${ECHO} "@name ${PKGNAME}"; \ 314 ${ECHO} "@name ${PKGNAME}"; \
315 ${AWK} '$$1 == "full" { printf "@blddep %s\n@pkgdep %s\n", $$3, $$2; }' < ${_RDEPENDS_FILE}; \ 315 ${AWK} '$$1 == "full" { printf "@blddep %s\n@pkgdep %s\n", $$3, $$2; }' < ${_RDEPENDS_FILE}; \
316 ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ 316 ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \
317 ${CAT} ${PLIST}; } > ${.TARGET} 317 ${CAT} ${PLIST}; } > ${.TARGET}
318 318
319_PKG_CREATE_ARGS+= -v -l -U 319_PKG_CREATE_ARGS+= -l -U
320_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE} 320_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE}
321_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE} 321_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE}
322_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE} 322_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE}
323_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}} 323_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}}
324_PKG_CREATE_ARGS+= -d ${_DESCR_FILE} 324_PKG_CREATE_ARGS+= -d ${_DESCR_FILE}
325_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST} 325_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST}
326_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}} 326_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}}
327_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE} 327_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE}
328_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE} 328_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE}
329_PKG_CREATE_ARGS+= ${CONFLICTS:D -C ${CONFLICTS:Q}} 329_PKG_CREATE_ARGS+= ${CONFLICTS:D -C ${CONFLICTS:Q}}
330_PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}} 330_PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}}
331_PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}} 331_PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}}
332 332
cvs diff -r1.15 -r1.16 pkgsrc/mk/flavor/pkg/Attic/package.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/package.mk 2008/01/05 22:06:20 1.15
+++ pkgsrc/mk/flavor/pkg/Attic/package.mk 2008/01/23 14:07:07 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: package.mk,v 1.15 2008/01/05 22:06:20 rillig Exp $ 1# $NetBSD: package.mk,v 1.16 2008/01/23 14:07:07 rillig Exp $
2 2
3PKG_SUFX?= .tgz 3PKG_SUFX?= .tgz
4PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} 4PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
5PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR} 5PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR}
6PKGREPOSITORYSUBDIR?= All 6PKGREPOSITORYSUBDIR?= All
7 7
8###################################################################### 8######################################################################
9### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk) 9### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk)
10###################################################################### 10######################################################################
11### package-check-installed verifies that the package is installed on 11### package-check-installed verifies that the package is installed on
12### the system. 12### the system.
13### 13###
14.PHONY: package-check-installed 14.PHONY: package-check-installed
@@ -30,26 +30,27 @@ _PKG_ARGS_PACKAGE+= -p ${PREFIX} @@ -30,26 +30,27 @@ _PKG_ARGS_PACKAGE+= -p ${PREFIX}
30.else 30.else
31_PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX} 31_PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX}
32. if ${_USE_DESTDIR} == "user-destdir" 32. if ${_USE_DESTDIR} == "user-destdir"
33_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP} 33_PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP}
34. endif 34. endif
35.endif 35.endif
36_PKG_ARGS_PACKAGE+= -L ${DESTDIR}${PREFIX} # @src ... 36_PKG_ARGS_PACKAGE+= -L ${DESTDIR}${PREFIX} # @src ...
37.if ${PKG_INSTALLATION_TYPE} == "pkgviews" 37.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
38_PKG_ARGS_PACKAGE+= -E 38_PKG_ARGS_PACKAGE+= -E
39.endif 39.endif
40 40
41${PKGFILE}: ${_CONTENTS_TARGETS} 41${PKGFILE}: ${_CONTENTS_TARGETS}
42 ${RUN} ${MKDIR} ${.TARGET:H} 42 ${RUN} ${MKDIR} ${.TARGET:H}
 43 @${STEP_MSG} "Creating binary package ${.TARGET}"
43 ${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \ 44 ${RUN} tmpname=${.TARGET:S,${PKG_SUFX}$,.tmp${PKG_SUFX},}; \
44 if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \ 45 if ${PKG_CREATE} ${_PKG_ARGS_PACKAGE} "$$tmpname"; then \
45 ${MV} -f "$$tmpname" ${.TARGET}; \ 46 ${MV} -f "$$tmpname" ${.TARGET}; \
46 else \ 47 else \
47 exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode; \ 48 exitcode=$$?; ${RM} -f "$$tmpname"; exit $$exitcode; \
48 fi 49 fi
49 50
50###################################################################### 51######################################################################
51### package-remove (PRIVATE) 52### package-remove (PRIVATE)
52###################################################################### 53######################################################################
53### package-remove removes the binary package from the package 54### package-remove removes the binary package from the package
54### repository. 55### repository.
55### 56###