Fri Feb 13 11:30:07 2009 UTC ()
package-install with DESTDIR should pass down -A as needed to get
automatic installed handling correct.


(joerg)
diff -r1.16 -r1.17 pkgsrc/mk/flavor/pkg/package.mk
cvs diff -r1.16 -r1.17 pkgsrc/mk/flavor/pkg/Attic/package.mk (expand / switch to unified diff)

--- pkgsrc/mk/flavor/pkg/Attic/package.mk 2008/01/23 14:07:07 1.16
+++ pkgsrc/mk/flavor/pkg/Attic/package.mk 2009/02/13 11:30:07 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: package.mk,v 1.16 2008/01/23 14:07:07 rillig Exp $ 1# $NetBSD: package.mk,v 1.17 2009/02/13 11:30:07 joerg 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
@@ -131,15 +131,18 @@ real-package-install: su-target @@ -131,15 +131,18 @@ real-package-install: su-target
131real-package-install: 131real-package-install:
132 @${DO_NADA} 132 @${DO_NADA}
133.endif 133.endif
134 134
135su-real-package-install: 135su-real-package-install:
136 @${PHASE_MSG} "Install binary package of "${PKGNAME:Q} 136 @${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
137.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 137.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
138 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX} 138 @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
139 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE} 139 ${PKG_ADD} -m ${MACHINE_ARCH} -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE}
140 @${ECHO} "Fixing recorded cwd..." 140 @${ECHO} "Fixing recorded cwd..."
141 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp 141 @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
142 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS 142 @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
143.else 143.else
144 ${PKG_ADD} ${PKGFILE} 144 case ${_AUTOMATIC:Q}"" in \
 145 [yY][eE][sS]) ${PKG_ADD} -A ${PKGFILE} ;; \
 146 *) ${PKG_ADD} ${PKGFILE} ;; \
 147 esac
145.endif 148.endif