Mon Feb 16 10:50:33 2015 UTC ()
Put back PKGNAME_REQD fix for su-real-package-install.


(jperkin)
diff -r1.8 -r1.9 pkgsrc/mk/pkgformat/pkg/package.mk
cvs diff -r1.8 -r1.9 pkgsrc/mk/pkgformat/pkg/package.mk (expand / switch to unified diff)

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