diff options
Diffstat (limited to 'mk/pkgformat/pkg/package.mk')
| -rw-r--r-- | mk/pkgformat/pkg/package.mk | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/mk/pkgformat/pkg/package.mk b/mk/pkgformat/pkg/package.mk index d9116e369fe..f360e06e668 100644 --- a/mk/pkgformat/pkg/package.mk +++ b/mk/pkgformat/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.13 2016/02/02 08:15:07 rillig Exp $ +# $NetBSD: package.mk,v 1.14 2016/04/10 15:58:03 joerg Exp $ .if defined(PKG_SUFX) WARNINGS+= "PKG_SUFX is deprecated, please use PKG_COMPRESSION" @@ -13,32 +13,11 @@ WARNINGS+= "Unsupported value for PKG_SUFX" PKG_SUFX?= .tgz FILEBASE?= ${PKGBASE} PKGFILE?= ${PKGREPOSITORY}/${FILEBASE}-${PKGVERSION}${PKG_SUFX} -.if ${_USE_DESTDIR} == "no" -. if !empty(SIGN_PACKAGES:Mgpg) STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX} -. elif !empty(SIGN_PACKAGES:Mx509) -STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX} -. else -STAGE_PKGFILE?= ${PKGFILE} -. endif -.else -STAGE_PKGFILE?= ${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX} -.endif PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR} PKGREPOSITORYSUBDIR?= All ###################################################################### -### package-check-installed (PRIVATE, pkgsrc/mk/package/package.mk) -###################################################################### -### package-check-installed verifies that the package is installed on -### the system. -### -.PHONY: package-check-installed -package-check-installed: - ${RUN} ${PKG_INFO} -qe ${PKGNAME} \ - || ${FAIL_MSG} "${PKGNAME} is not installed." - -###################################################################### ### package-create (PRIVATE, pkgsrc/mk/package/package.mk) ###################################################################### ### package-create creates the binary package. @@ -52,21 +31,13 @@ package-create: ${PKGFILE} package-links ### stage-package-create creates the binary package for stage install. ### .PHONY: stage-package-create -.if ${_USE_DESTDIR} == "no" -stage-package-create: package-create -.else stage-package-create: stage-install ${STAGE_PKGFILE} -.endif _PKG_ARGS_PACKAGE+= ${_PKG_CREATE_ARGS} _PKG_ARGS_PACKAGE+= -F ${PKG_COMPRESSION} -.if ${_USE_DESTDIR} == "no" -_PKG_ARGS_PACKAGE+= -p ${PREFIX} -.else _PKG_ARGS_PACKAGE+= -I ${PREFIX} -p ${DESTDIR}${PREFIX} -. if ${_USE_DESTDIR} == "user-destdir" +.if ${_USE_DESTDIR} == "user-destdir" _PKG_ARGS_PACKAGE+= -u ${REAL_ROOT_USER} -g ${REAL_ROOT_GROUP} -. endif .endif ${STAGE_PKGFILE}: ${_CONTENTS_TARGETS} @@ -187,15 +158,10 @@ stage-package-install: stage-package-create real-package-install stage-package-install: barrier .endif -.if ${_USE_DESTDIR} != "no" -. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) real-package-install: su-real-package-install -. else -real-package-install: su-target -. endif .else -real-package-install: - @${DO_NADA} +real-package-install: su-target .endif MAKEFLAGS.su-real-package-install= PKGNAME_REQD=${PKGNAME_REQD:Q} |