Sun Dec 7 05:09:02 2014 UTC ()
Pass PKGNAME_REQD to su-real-package-install, for multiversion packages
not using default version.


(obache)
diff -r1.5 -r1.6 pkgsrc/mk/pkgformat/pkg/package.mk
cvs diff -r1.5 -r1.6 pkgsrc/mk/pkgformat/pkg/package.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/package.mk 2014/04/07 05:25:03 1.5
+++ pkgsrc/mk/pkgformat/pkg/package.mk 2014/12/07 05:09:02 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: package.mk,v 1.5 2014/04/07 05:25:03 obache Exp $ 1# $NetBSD: package.mk,v 1.6 2014/12/07 05:09:02 obache 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}
@@ -189,26 +189,27 @@ stage-package-install: barrier @@ -189,26 +189,27 @@ stage-package-install: barrier
189.endif 189.endif
190 190
191.if ${_USE_DESTDIR} != "no" 191.if ${_USE_DESTDIR} != "no"
192. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 192. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
193real-package-install: su-real-package-install 193real-package-install: su-real-package-install
194. else 194. else
195real-package-install: su-target 195real-package-install: su-target
196. endif 196. endif
197.else 197.else
198real-package-install: 198real-package-install:
199 @${DO_NADA} 199 @${DO_NADA}
200.endif 200.endif
201 201
 202MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q}
202su-real-package-install: 203su-real-package-install:
203 @${PHASE_MSG} "Install binary package of "${PKGNAME:Q} 204 @${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
204.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 205.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
205 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} 206 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
206 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE} 207 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${STAGE_PKGFILE}
207 @${ECHO} "Fixing recorded cwd..." 208 @${ECHO} "Fixing recorded cwd..."
208 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp 209 @${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 210 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
210.else 211.else
211 ${RUN} case ${_AUTOMATIC:Q}"" in \ 212 ${RUN} case ${_AUTOMATIC:Q}"" in \
212 [yY][eE][sS]) ${PKG_ADD} -A ${STAGE_PKGFILE} ;; \ 213 [yY][eE][sS]) ${PKG_ADD} -A ${STAGE_PKGFILE} ;; \
213 *) ${PKG_ADD} ${STAGE_PKGFILE} ;; \ 214 *) ${PKG_ADD} ${STAGE_PKGFILE} ;; \
214 esac 215 esac