Tue Feb 2 08:15:07 2016 UTC ()
Changed "Install binary package" to "Installing binary package"


(rillig)
diff -r1.12 -r1.13 pkgsrc/mk/pkgformat/pkg/package.mk
cvs diff -r1.12 -r1.13 pkgsrc/mk/pkgformat/pkg/package.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/package.mk 2015/10/29 20:09:28 1.12
+++ pkgsrc/mk/pkgformat/pkg/package.mk 2016/02/02 08:15:07 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: package.mk,v 1.12 2015/10/29 20:09:28 jperkin Exp $ 1# $NetBSD: package.mk,v 1.13 2016/02/02 08:15:07 rillig Exp $
2 2
3.if defined(PKG_SUFX) 3.if defined(PKG_SUFX)
4WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION" 4WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
5. if ${PKG_SUFX} == ".tgz" 5. if ${PKG_SUFX} == ".tgz"
6PKG_COMPRESSION= gzip 6PKG_COMPRESSION= gzip
7. elif ${PKG_SUFX} == ".tbz" 7. elif ${PKG_SUFX} == ".tbz"
8PKG_COMPRESSION= bzip2 8PKG_COMPRESSION= bzip2
9. else 9. else
10WARNINGS+= "Unsupported value for PKG_SUFX" 10WARNINGS+= "Unsupported value for PKG_SUFX"
11. endif 11. endif
12.endif 12.endif
13PKG_SUFX?= .tgz 13PKG_SUFX?= .tgz
14FILEBASE?= ${PKGBASE} 14FILEBASE?= ${PKGBASE}
@@ -190,26 +190,26 @@ stage-package-install: barrier @@ -190,26 +190,26 @@ stage-package-install: barrier
190.if ${_USE_DESTDIR} != "no" 190.if ${_USE_DESTDIR} != "no"
191. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 191. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
192real-package-install: su-real-package-install 192real-package-install: su-real-package-install
193. else 193. else
194real-package-install: su-target 194real-package-install: su-target
195. endif 195. endif
196.else 196.else
197real-package-install: 197real-package-install:
198 @${DO_NADA} 198 @${DO_NADA}
199.endif 199.endif
200 200
201MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q} 201MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q}
202su-real-package-install: 202su-real-package-install:
203 @${PHASE_MSG} "Install binary package of "${PKGNAME:Q} 203 @${PHASE_MSG} "Installing binary package of "${PKGNAME:Q}
204.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 204.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
205 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} 205 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
206 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE} 206 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
207 @${ECHO} "Fixing recorded cwd..." 207 @${ECHO} "Fixing recorded cwd..."
208 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp 208 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
209 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS 209 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
210.else 210.else
211 ${RUN} case ${_AUTOMATIC:Q}"" in \ 211 ${RUN} case ${_AUTOMATIC:Q}"" in \
212 [yY][eE][sS]) ${PKG_ADD} -A ${STAGE_PKGFILE} ;; \ 212 [yY][eE][sS]) ${PKG_ADD} -A ${STAGE_PKGFILE} ;; \
213 *) ${PKG_ADD} ${STAGE_PKGFILE} ;; \ 213 *) ${PKG_ADD} ${STAGE_PKGFILE} ;; \
214 esac 214 esac
215.endif 215.endif