From a497b4efbc4f2224de42dbe984d4ba19106f256d Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 10 Apr 2016 15:58:02 +0000 Subject: Remove support for USE_DESTDIR=no. --- mk/bsd.prefs.mk | 13 ++------ mk/build/bsd.build-vars.mk | 3 +- mk/check/check-shlibs.mk | 36 +-------------------- mk/haskell.mk | 17 +++------- mk/install/bsd.install.mk | 15 ++++----- mk/install/deinstall.mk | 5 +-- mk/install/install.mk | 32 ++----------------- mk/install/replace.mk | 19 ++--------- mk/package/package.mk | 21 +------------ mk/pkgformat/README | 3 +- mk/pkgformat/pkg/install.mk | 70 +---------------------------------------- mk/pkgformat/pkg/metadata.mk | 27 +--------------- mk/pkgformat/pkg/package.mk | 42 +++---------------------- mk/pkgformat/pkg/pkgformat.mk | 12 ++----- mk/pkgformat/pkg/replace.mk | 11 ++----- mk/pkginstall/bsd.pkginstall.mk | 27 ++-------------- mk/plist/print-plist.mk | 16 ++-------- 17 files changed, 42 insertions(+), 327 deletions(-) (limited to 'mk') diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index d184e3744b9..cbfad329377 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.384 2016/04/10 15:10:12 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.385 2016/04/10 15:58:02 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -405,8 +405,6 @@ do-install: @${DO_NADA} .endif -# After 2011Q1, the default is to use DESTDIR. -USE_DESTDIR?= yes # PKG_DESTDIR_SUPPORT can only be one of "destdir", or "user-destdir". PKG_DESTDIR_SUPPORT?= user-destdir @@ -421,21 +419,16 @@ PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir # When using staged installation, everything gets installed into # ${DESTDIR}${PREFIX} instead of ${PREFIX} directly. # -.if ${_USE_DESTDIR} != "no" DESTDIR= ${WRKDIR}/.destdir -. if ${_USE_DESTDIR} == "destdir" +.if ${_USE_DESTDIR} == "destdir" _MAKE_PACKAGE_AS_ROOT= yes _MAKE_CLEAN_AS_ROOT= yes _MAKE_INSTALL_AS_ROOT= yes -. elif ${_USE_DESTDIR} == "user-destdir" +.else _MAKE_PACKAGE_AS_ROOT= no _MAKE_CLEAN_AS_ROOT= no _MAKE_INSTALL_AS_ROOT= no . endif -.else -PKG_FAIL_REASON+= "USE_DESTDIR=no is no longer supported." -DESTDIR= -.endif # controls whether binary packages are preserved in pkgsrc/packages/All # default is no (to preserve settings since 2013/05/23, prior to that it diff --git a/mk/build/bsd.build-vars.mk b/mk/build/bsd.build-vars.mk index 42f085bc2cf..b49dbeada24 100644 --- a/mk/build/bsd.build-vars.mk +++ b/mk/build/bsd.build-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.build-vars.mk,v 1.10 2016/03/10 16:58:19 jperkin Exp $ +# $NetBSD: bsd.build-vars.mk,v 1.11 2016/04/10 15:58:02 joerg Exp $ # # Package-settable variables: # @@ -50,4 +50,3 @@ MAKE_ENV+= ${USETOOLS:DUSETOOLS=${USETOOLS:Q}} # processes for build-related phases. # PKGSRC_MAKE_ENV+= PATH=${PATH:Q} -PKGSRC_MAKE_ENV+= USE_DESTDIR=${USE_DESTDIR:Q} diff --git a/mk/check/check-shlibs.mk b/mk/check/check-shlibs.mk index 68431fd0cd9..cf931b10b03 100644 --- a/mk/check/check-shlibs.mk +++ b/mk/check/check-shlibs.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-shlibs.mk,v 1.28 2015/11/24 09:41:20 jperkin Exp $ +# $NetBSD: check-shlibs.mk,v 1.29 2016/04/10 15:58:02 joerg Exp $ # # This file verifies that all libraries used by the package can be found # at run-time. @@ -63,9 +63,7 @@ CHECK_SHLIBS_NATIVE= ${PKGSRCDIR}/mk/check/check-shlibs-macho.awk CHECK_SHLIBS_NATIVE_ENV+= CROSS_DESTDIR=${_CROSS_DESTDIR:Q} CHECK_SHLIBS_NATIVE_ENV+= PKG_INFO_CMD=${PKG_INFO:Q} CHECK_SHLIBS_NATIVE_ENV+= DEPENDS_FILE=${_RRDEPENDS_FILE:Q} -. if ${_USE_DESTDIR} != "no" CHECK_SHLIBS_NATIVE_ENV+= DESTDIR=${DESTDIR:Q} -. endif CHECK_SHLIBS_NATIVE_ENV+= WRKDIR=${WRKDIR:Q} . if defined(CHECK_WRKREF) && !empty(CHECK_WRKREF:Mextra) CHECK_SHLIBS_NATIVE_ENV+= CHECK_WRKREF_EXTRA_DIRS=${CHECK_WRKREF_EXTRA_DIRS:Q} @@ -88,38 +86,6 @@ _check-shlibs: error-check .PHONY ${PKGSRC_SETENV} ${CHECK_SHLIBS_NATIVE_ENV} ${AWK} -f ${CHECK_SHLIBS_NATIVE} > ${ERROR_DIR}/${.TARGET} .else -. if ${_USE_DESTDIR} != "no" _check-shlibs: error-check .PHONY @${WARNING_MSG} "Skipping missing run-time search-path check in DESTDIR mode." -. else -_check-shlibs: error-check .PHONY - @${STEP_MSG} "Checking for missing run-time search paths in ${PKGNAME}" - ${RUN} rm -f ${ERROR_DIR}/${.TARGET} - ${RUN} \ - exec 1>${ERROR_DIR}/${.TARGET}; \ - case ${LDD:Q}"" in \ - "") ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \ - *) ldd=${LDD:Q} ;; \ - esac; \ - ${TEST} -x "$$ldd" || exit 0; \ - cd ${DESTDIR}${PREFIX}; \ - ${_CHECK_SHLIBS_FILELIST_CMD} | \ - ${EGREP} -h ${_CHECK_SHLIBS_ERE:Q} | \ - while read file; do \ - case "$$file" in \ - ${CHECK_SHLIBS_SKIP:@p@${p}) continue ;;@} \ - *) ;; \ - esac; \ - err=`$$ldd $$file 2>&1 | ${GREP} "not found" || ${TRUE}`; \ - ${TEST} -z "$$err" || ${ECHO} "${DESTDIR}${PREFIX}/$$file: $$err"; \ - done - ${RUN} \ - exec 1>>${ERROR_DIR}/${.TARGET}; \ - if ${_NONZERO_FILESIZE_P} ${ERROR_DIR}/${.TARGET}; then \ - ${ECHO} "*** The programs/libs shown above will not find the listed"; \ - ${ECHO} " shared libraries at runtime."; \ - ${ECHO} " Please fix the package (add -Wl,-R.../lib in the right places)!"; \ - ${SHCOMMENT} Might not error-out for non-pkg-developers; \ - fi -. endif .endif diff --git a/mk/haskell.mk b/mk/haskell.mk index 99f32cfcc85..3abab83eea3 100644 --- a/mk/haskell.mk +++ b/mk/haskell.mk @@ -1,4 +1,4 @@ -# $NetBSD: haskell.mk,v 1.3 2015/02/17 13:57:47 joerg Exp $ +# $NetBSD: haskell.mk,v 1.4 2016/04/10 15:58:02 joerg Exp $ # # This Makefile fragment handles Haskell Cabal packages. # See: http://www.haskell.org/cabal/ @@ -248,17 +248,10 @@ _HASKELL_PKG_DESCR_FILE= ${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION}/package-d do-install: ${RUN} cd ${WRKSRC} && \ ./Setup register --gen-pkg-config=dist/package-description && \ - if [ "${_USE_DESTDIR}" = "no" ]; then \ - ./Setup copy && \ - if [ -f dist/package-description ]; then \ - ${INSTALL_DATA} dist/package-description ${_HASKELL_PKG_DESCR_FILE}; \ - fi \ - else \ - ./Setup copy --destdir=${DESTDIR} && \ - if [ -f dist/package-description ]; then \ - ${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \ - fi \ - fi + ./Setup copy --destdir=${DESTDIR} && \ + if [ -f dist/package-description ]; then \ + ${INSTALL_DATA} dist/package-description ${DESTDIR}${_HASKELL_PKG_DESCR_FILE}; \ + fi \ # Define test target. do-test: diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 21a7790e37b..f71e9fd0f02 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.15 2014/12/06 23:28:18 agc Exp $ +# $NetBSD: bsd.install.mk,v 1.16 2016/04/10 15:58:02 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -17,14 +17,12 @@ _COOKIE.install= ${WRKDIR}/.install_done ###################################################################### ### install (PUBLIC) ###################################################################### -### install is a public target to install the package either by -### depending on stage-install (_USE_DESTDIR=no) or package-install -### (_USE_DESTDIR!=no). +### install is a public target to install the package by depending +### on stage-package-install or package-install. The difference is +### a package is created in the public PACKAGES directory. ### .PHONY: install -.if ${_USE_DESTDIR} == "no" -install: stage-install -.elif ${_KEEP_BIN_PKGS} == "no" +.if ${_KEEP_BIN_PKGS} == "no" install: stage-package-install .else install: package-install @@ -34,8 +32,7 @@ install: package-install ### stage-install (PUBLIC) ###################################################################### ### stage-install is a public target to install the package to -### ${PREFIX} (_USE_DESTDIR=no) or to ${DESTDIR}${PREFIX} -### (_USE_DESTDIR!=no) +### to ${DESTDIR}${PREFIX}. ### .PHONY: stage-install .if !defined(NO_INSTALL) diff --git a/mk/install/deinstall.mk b/mk/install/deinstall.mk index 57068d77cfc..22212caa837 100644 --- a/mk/install/deinstall.mk +++ b/mk/install/deinstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.mk,v 1.11 2011/10/15 00:23:09 reed Exp $ +# $NetBSD: deinstall.mk,v 1.12 2016/04/10 15:58:02 joerg Exp $ # DEINSTALLDEPENDS controls whether dependencies and dependents are also # removed when a package is de-installed. The valid values are: @@ -31,9 +31,6 @@ deinstall: su-target _SU_DEINSTALL_TARGETS= acquire-deinstall-lock _SU_DEINSTALL_TARGETS+= _pkgformat-deinstall _SU_DEINSTALL_TARGETS+= release-deinstall-lock -.if ${_USE_DESTDIR} == "no" -_SU_DEINSTALL_TARGETS+= install-clean -.endif su-deinstall: ${_SU_DEINSTALL_TARGETS} .PHONY: acquire-deinstall-lock release-deinstall-lock diff --git a/mk/install/install.mk b/mk/install/install.mk index 6ae35583409..5691face206 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.67 2015/10/12 09:08:22 jperkin Exp $ +# $NetBSD: install.mk,v 1.68 2016/04/10 15:58:02 joerg Exp $ # # This file provides the code for the "install" phase. # @@ -153,14 +153,6 @@ install-check-version: ${_COOKIE.extract} ${RECURSIVE_MAKE} ${MAKEFLAGS} build ;; \ esac -###################################################################### -### The targets below are run with elevated privileges. -###################################################################### - -.PHONY: acquire-install-localbase-lock release-install-localbase-lock -acquire-install-localbase-lock: acquire-localbase-lock -release-install-localbase-lock: release-localbase-lock - ###################################################################### ### install-all, su-install-all (PRIVATE) ###################################################################### @@ -168,13 +160,6 @@ release-install-localbase-lock: release-localbase-lock ### the built software, register the software installation, and run ### some sanity checks. ### -.if ${_USE_DESTDIR} != "user-destdir" -_INSTALL_ALL_TARGETS+= acquire-install-localbase-lock -.endif -.if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= _pkgformat-check-conflicts -_INSTALL_ALL_TARGETS+= _pkgformat-check-installed -.endif _INSTALL_ALL_TARGETS+= install-check-umask .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss]) _INSTALL_ALL_TARGETS+= check-files-pre @@ -186,9 +171,6 @@ _INSTALL_ALL_TARGETS+= install-dirs-from-PLIST .elif defined(AUTO_MKDIRS) && !empty(AUTO_MKDIRS:M[Yy][Ee][Ss]) _INSTALL_ALL_TARGETS+= install-dirs-from-PLIST .endif -.if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= pre-install-script -.endif _INSTALL_ALL_TARGETS+= pre-install _INSTALL_ALL_TARGETS+= do-install _INSTALL_ALL_TARGETS+= post-install @@ -201,18 +183,8 @@ _INSTALL_ALL_TARGETS+= install-script-data .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss]) _INSTALL_ALL_TARGETS+= check-files-post .endif -.if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= post-install-script -.endif -.if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= _pkgformat-register -.else _INSTALL_ALL_TARGETS+= _pkgformat-generate-metadata -.endif _INSTALL_ALL_TARGETS+= privileged-install-hook -.if ${_USE_DESTDIR} != "user-destdir" -_INSTALL_ALL_TARGETS+= release-install-localbase-lock -.endif _INSTALL_ALL_TARGETS+= error-check .PHONY: install-all su-install-all @@ -315,7 +287,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} INSTALL_MAKE_FLAGS?= # none INSTALL_TARGET?= install ${USE_IMAKE:D${NO_INSTALL_MANPAGES:D:Uinstall.man}} DESTDIR_VARNAME?= DESTDIR -.if ${_USE_DESTDIR} != "no" && !empty(DESTDIR_VARNAME) +.if !empty(DESTDIR_VARNAME) INSTALL_ENV+= ${DESTDIR_VARNAME}=${DESTDIR:Q} INSTALL_MAKE_FLAGS+= ${DESTDIR_VARNAME}=${DESTDIR:Q} .endif diff --git a/mk/install/replace.mk b/mk/install/replace.mk index 8e0d5160d83..9c30da0a10c 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.17 2015/09/07 19:23:47 gdt Exp $ +# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $ # # Public targets: # @@ -13,11 +13,8 @@ # # Private targets that must be defined by the package system format: # -# _pkgformat-replace: -# Updates a package in-place on the system (USE_DESTDIR=no). -# # _pkgformat-destdir-replace: -# Updates a package in-place on the system (USE_DESTDIR=yes). +# Updates a package in-place on the system. # # _pkgformat-undo-replace: # Undoes a previous "make _pkgformat-replace". @@ -25,9 +22,7 @@ # _pkgformat-destdir-undo-replace: # Undoes a previous "make _pkgformat-destdir-replace". -.if ${_USE_DESTDIR} == "no" -_REPLACE_TARGETS+= ${_PKGSRC_BUILD_TARGETS} -.elif ${_KEEP_BIN_PKGS} == "no" +.if ${_KEEP_BIN_PKGS} == "no" _REPLACE_TARGETS+= stage-package-create .else _REPLACE_TARGETS+= package @@ -49,11 +44,7 @@ replace: barrier replace-message: .PHONY @${PHASE_MSG} "Replacing for ${PKGNAME}" -.if ${_USE_DESTDIR} == "no" -su-replace: .PHONY _pkgformat-replace -.else su-replace: .PHONY _pkgformat-destdir-replace -.endif MAKEFLAGS.su-replace= _UPDATE_RUNNING=yes MAKEFLAGS.su-replace+= PKGNAME_REQD=${PKGNAME_REQD:Q} @@ -67,9 +58,5 @@ undo-replace-message: .PHONY @${PHASE_MSG} "Undoing replacement for ${PKGNAME}" @${WARNING_MSG} "experimental target - DATA LOSS MAY OCCUR." -.if ${_USE_DESTDIR} == "no" -su-undo-replace: .PHONY _pkgformat-undo-replace -.else su-undo-replace: .PHONY _pkgformat-destdir-undo-replace -.endif MAKEFLAGS.su-undo-replace= _UPDATE_RUNNING=yes diff --git a/mk/package/package.mk b/mk/package/package.mk index 0fe7781223f..7a8de991cc1 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.24 2013/05/23 13:18:56 obache Exp $ +# $NetBSD: package.mk,v 1.25 2016/04/10 15:58:02 joerg Exp $ # # This file provides the code for the "package" phase. # @@ -13,12 +13,8 @@ # _PACKAGE_TARGETS+= check-vulnerable -.if make(replace) && ${_USE_DESTDIR} == "no" -_PACKAGE_TARGETS+= replace -.else _PACKAGE_TARGETS+= stage-install _PACKAGE_TARGETS+= stage-package-create -.endif _PACKAGE_TARGETS+= acquire-package-lock _PACKAGE_TARGETS+= ${_COOKIE.package} _PACKAGE_TARGETS+= release-package-lock @@ -84,9 +80,6 @@ package-cookie: ### package-all is a helper target to create the binary package and ### generate any necessary warnings. ### -.if ${_USE_DESTDIR} == "no" -_PACKAGE_ALL_TARGETS+= package-check-installed -.endif _PACKAGE_ALL_TARGETS+= package-create _PACKAGE_ALL_TARGETS+= _package-warnings _PACKAGE_ALL_TARGETS+= error-check @@ -99,18 +92,6 @@ package-all: su-package-all .endif su-package-all: ${_PACKAGE_ALL_TARGETS} -###################################################################### -### package-check-installed (PRIVATE, override) -###################################################################### -### package-check-installed verifies that the package is installed on -### the system. This should be overridden per package system format. -### -.if !target(package-check-installed) -.PHONY: package-check-installed -package-check-installed: - @${DO_NADA} -.endif - ###################################################################### ### package-create (PRIVATE, override) ###################################################################### diff --git a/mk/pkgformat/README b/mk/pkgformat/README index 23a39d2f411..34c6db20635 100644 --- a/mk/pkgformat/README +++ b/mk/pkgformat/README @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.2 2014/12/30 15:13:19 wiz Exp $ +$NetBSD: README,v 1.3 2016/04/10 15:58:03 joerg Exp $ = Introduction = @@ -57,7 +57,6 @@ The following make targets must be implemented: * _pkgformat-show-depends * _pkgformat-install-dependencies * bootstrap-depends -* _pkgformat-register * tarup (XXX: This doesn't sound like a target that should be defined here.) * tarup-pkg diff --git a/mk/pkgformat/pkg/install.mk b/mk/pkgformat/pkg/install.mk index 7fcbc274ffb..82feab95165 100644 --- a/mk/pkgformat/pkg/install.mk +++ b/mk/pkgformat/pkg/install.mk @@ -1,75 +1,7 @@ -# $NetBSD: install.mk,v 1.1 2011/10/15 00:23:09 reed Exp $ -# -# _pkgformat-check-conflicts: -# Checks for conflicts between the package and installed packages. -# -# XXX: Needs WRKDIR. -# -# _pkgformat-check-installed: -# Checks if the package (or an older version of it) is already -# installed on the system. -# -# XXX: Needs WRKDIR. -# -# _pkgformat-register: -# Populates the package database with the appropriate entries to -# register the package as being installed on the system. +# $NetBSD: install.mk,v 1.2 2016/04/10 15:58:03 joerg Exp $ # # _pkgformat-install-clean: # Removes the state files from the run of an ``install'' target. # -_pkgformat-check-conflicts: .PHONY error-check - ${RUN}${RM} -f ${WRKDIR}/.CONFLICTS -.for _conflict_ in ${CONFLICTS} - ${RUN} \ - found="`${_PKG_BEST_EXISTS} ${_conflict_:Q} || ${TRUE}`"; \ - case "$$found" in \ - "") ;; \ - *) ${ECHO} "$$found" >> ${WRKDIR}/.CONFLICTS ;; \ - esac -.endfor - ${RUN} \ - ${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0; \ - exec 1>${ERROR_DIR}/${.TARGET}; \ - ${ECHO} "${PKGNAME} conflicts with installed package(s):"; \ - ${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^| |"; \ - ${ECHO} "They install the same files into the same place."; \ - ${ECHO} "Please remove conflicts first with pkg_delete(1)."; \ - ${RM} -f ${WRKDIR}/.CONFLICTS - -_pkgformat-check-installed: .PHONY error-check - ${RUN} \ - found="`${_PKG_BEST_EXISTS} ${PKGWILDCARD:Q} || ${TRUE}`"; \ - ${TEST} -n "$$found" || exit 0; \ - exec 1>${ERROR_DIR}/${.TARGET}; \ - ${ECHO} "$$found is already installed - perhaps an older version?"; \ - ${ECHO} "If so, you may use either of:"; \ - ${ECHO} " - \"pkg_delete $$found\" and \"${MAKE} reinstall\""; \ - ${ECHO} " to upgrade properly"; \ - ${ECHO} " - \"${MAKE} update\" to rebuild the package and all"; \ - ${ECHO} " of its dependencies"; \ - ${ECHO} " - \"${MAKE} replace\" to replace only the package without"; \ - ${ECHO} " re-linking dependencies, risking various problems." - -_REGISTER_DEPENDENCIES= \ - ${PKGSRC_SETENV} PKG_DBDIR=${_PKG_DBDIR:Q} \ - AWK=${TOOLS_AWK:Q} \ - ${SH} ${PKGSRCDIR}/mk/pkgformat/pkg/register-dependencies - -_pkgformat-register: .PHONY _pkgformat-generate-metadata ${_RDEPENDS_FILE} - @${STEP_MSG} "Registering installation for ${PKGNAME}" - ${RUN}${RM} -fr ${_PKG_DBDIR}/${PKGNAME} - ${RUN}${MKDIR} ${_PKG_DBDIR}/${PKGNAME} - ${RUN}${CP} ${PKG_DB_TMPDIR}/* ${_PKG_DBDIR}/${PKGNAME} - ${RUN}${PKG_ADMIN} add ${PKGNAME} - ${RUN} \ - case ${_AUTOMATIC:Q}"" in \ - [yY][eE][sS]) ${PKG_ADMIN} set automatic=yes ${PKGNAME} ;; \ - esac - ${RUN}${_FULL_DEPENDS_CMD} | \ - ${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME} - ${RUN}${GREP} '^@pkgdir ' < ${_PKG_DBDIR}/${PKGNAME}/+CONTENTS | \ - while read tag dir; do ${MKDIR} ${PREFIX}/$$dir; done - _pkgformat-install-clean: .PHONY _pkgformat-clean-metadata diff --git a/mk/pkgformat/pkg/metadata.mk b/mk/pkgformat/pkg/metadata.mk index 45ad0ad8496..d3aa1c5679e 100644 --- a/mk/pkgformat/pkg/metadata.mk +++ b/mk/pkgformat/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.12 2015/07/04 16:18:38 joerg Exp $ +# $NetBSD: metadata.mk,v 1.13 2016/04/10 15:58:03 joerg Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -247,27 +247,6 @@ ${_MESSAGE_FILE}: ${MESSAGE_SRC} ${RUN}${MKDIR} ${.TARGET:H} ${RUN}${CAT} ${.ALLSRC} | \ ${SED} ${_MESSAGE_SUBST_SED} > ${.TARGET} - -# Display MESSAGE file and optionally mail the contents to -# PKGSRC_MESSAGE_RECIPIENTS. -# -.PHONY: install-display-message -_pkgformat-register: install-display-message -install-display-message: ${_MESSAGE_FILE} - @${STEP_MSG} "Please note the following:" - @${ECHO_MSG} "" - @${CAT} ${_MESSAGE_FILE} - @${ECHO_MSG} "" -. if !empty(PKGSRC_MESSAGE_RECIPIENTS) - ${RUN} \ - (${ECHO} "The ${PKGNAME} package was installed on `${HOSTNAME_CMD}` at `date`"; \ - ${ECHO} ""; \ - ${ECHO} "Please note the following:"; \ - ${ECHO} ""; \ - ${CAT} ${_MESSAGE_FILE}; \ - ${ECHO} "") | \ - ${MAIL_CMD} -s"Package ${PKGNAME} installed on `${HOSTNAME_CMD}`" ${PKGSRC_MESSAGE_RECIPIENTS} -. endif .endif # MESSAGE_SRC ###################################################################### @@ -364,11 +343,7 @@ _PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}} _PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}} _PKG_ARGS_INSTALL+= ${_PKG_CREATE_ARGS} -.if ${_USE_DESTDIR} == "no" -_PKG_ARGS_INSTALL+= -p ${PREFIX} -.else _PKG_ARGS_INSTALL+= -I ${PREFIX} -p ${DESTDIR}${PREFIX} -.endif _DEINSTALL_ARG_cmd= if ${TEST} -f ${DEINSTALL_FILE}; then \ ${ECHO} "-k "${DEINSTALL_FILE:Q}; \ 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,31 +13,10 @@ 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) ###################################################################### @@ -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} diff --git a/mk/pkgformat/pkg/pkgformat.mk b/mk/pkgformat/pkg/pkgformat.mk index 5bf736fe4e4..34b304644e6 100644 --- a/mk/pkgformat/pkg/pkgformat.mk +++ b/mk/pkgformat/pkg/pkgformat.mk @@ -1,19 +1,13 @@ -# $NetBSD: pkgformat.mk,v 1.2 2014/12/30 15:13:20 wiz Exp $ +# $NetBSD: pkgformat.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $ # # This Makefile fragment provides variable and target overrides that are # specific to the pkgsrc native package format. # -# PKG_FILELIST_CMD outputs the list of files owned by ${PKGNAME} as -# registered on the system. +# PKG_FILELIST_CMD outputs the list of files in the package based on +# _DEPENDS_PLIST. # -# For DESTDIR support, just use _DEPENDS_PLIST instead. -# -.if ${_USE_DESTDIR} == "no" -PKG_FILELIST_CMD= ${PKG_INFO} -qL ${PKGNAME:Q} -.else PKG_FILELIST_CMD= ${SED} -e "/^@/d" -e "s|^|${PREFIX}/|" ${_DEPENDS_PLIST} -.endif .include "depends.mk" .include "check.mk" diff --git a/mk/pkgformat/pkg/replace.mk b/mk/pkgformat/pkg/replace.mk index 93d976e8fa1..14da7155630 100644 --- a/mk/pkgformat/pkg/replace.mk +++ b/mk/pkgformat/pkg/replace.mk @@ -1,19 +1,14 @@ -# $NetBSD: replace.mk,v 1.2 2013/05/23 13:18:56 obache Exp $ +# $NetBSD: replace.mk,v 1.3 2016/04/10 15:58:03 joerg Exp $ # -# _pkgformat-replace: -# Updates a package in-place on the system (USE_DESTDIR=no). -# # _pkgformat-destdir-replace: -# Updates a package in-place on the system (USE_DESTDIR=yes). +# Updates a package in-place on the system. # # See also: # replace # # XXX: The whole replacement, from deinstalling the old package up -# to installing the new package, should be one transaction. It -# currently isn't, and the check-files target for other packages -# can be confused when a +REQUIRED_BY files suddenly disappears. +# to installing the new package, should be one transaction. # _pkgformat-replace: \ replace-names \ diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 9ca7d4df7cb..7bc12c87b43 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.65 2016/04/10 15:33:42 joerg Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.66 2016/04/10 15:58:03 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -373,9 +373,8 @@ su-create-usergroup: ${_INSTALL_USERGROUP_UNPACKER} # make certain files set-uid or to change the ownership or a # directory. # -# Note that when USE_DESTDIR is in effect, the special permissions -# are not directly recorded (as file attributes) in the binary -# package file. +# The special permissions may not directly recorded (as file +# attributes) in the binary package file. # # SETUID_ROOT_PERMS is a convenience definition to note an executable is # meant to be setuid-root, and should be used as follows: @@ -1059,8 +1058,6 @@ INSTALL_SCRIPTS_ENV= PKG_PREFIX=${PREFIX} INSTALL_SCRIPTS_ENV+= PKG_METADATA_DIR=${_PKG_DBDIR}/${PKGNAME} INSTALL_SCRIPTS_ENV+= PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR} -.PHONY: pre-install-script post-install-script - DEINSTALL_FILE= ${PKG_DB_TMPDIR}/+DEINSTALL INSTALL_FILE= ${PKG_DB_TMPDIR}/+INSTALL _DEINSTALL_FILE= ${_PKGINSTALL_DIR}/DEINSTALL @@ -1122,24 +1119,6 @@ ${_INSTALL_FILE}: ${INSTALL_SRC} esac ${RUN}${CHMOD} +x ${.TARGET} -pre-install-script: - ${RUN} \ - if ${TEST} -x ${INSTALL_FILE}; then \ - ${STEP_MSG} "Running PRE-INSTALL script actions"; \ - cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ - PRE-INSTALL; \ - fi - -post-install-script: - ${RUN} \ - if ${TEST} -x ${INSTALL_FILE}; then \ - ${STEP_MSG} "Running POST-INSTALL script actions"; \ - cd ${PKG_DB_TMPDIR} && ${PKGSRC_SETENV} ${INSTALL_SCRIPTS_ENV} \ - ${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} \ - POST-INSTALL; \ - fi - # rc.d scripts are automatically generated and installed into the rc.d # scripts example directory at the post-install step. The following # variables are relevant to this process: diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk index fa1f042f7b1..468b7465976 100644 --- a/mk/plist/print-plist.mk +++ b/mk/plist/print-plist.mk @@ -1,4 +1,4 @@ -# $NetBSD: print-plist.mk,v 1.27 2015/06/07 03:39:08 joerg Exp $ +# $NetBSD: print-plist.mk,v 1.28 2016/04/10 15:58:03 joerg Exp $ ### ### Automatic PLIST generation @@ -53,22 +53,12 @@ _PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.scale/) _PRINT_PLIST_AWK_IGNORE+= || ($$0 ~ /^.*\/fonts\.cache-1/) .endif -# scan $PREFIX for any files/dirs modified since the package was extracted -# will emit "@exec mkdir"-statements for empty directories -# XXX will fail for data files that were copied using tar (e.g. emacs)! -# XXX should check $LOCALBASE and $X11BASE, and add @cwd statements - -.if ${_USE_DESTDIR} == "no" -_PRINT_PLIST_FILES_CMD= \ - ${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} \! -type d -print -_PRINT_PLIST_DIRS_CMD= \ - ${FIND} ${DESTDIR}${PREFIX}/. -xdev -newer ${_COOKIE.extract} -type d -print -.else +# List the content of $PREFIX and emit "@pkgdir " statements for +# empty directories. _PRINT_PLIST_FILES_CMD= \ ${FIND} ${DESTDIR}${PREFIX}/. \! -type d -print _PRINT_PLIST_DIRS_CMD= \ ${FIND} ${DESTDIR}${PREFIX}/. -type d -print -.endif .if !empty(LIBTOOLIZE_PLIST:M[yY][eE][sS]) _PRINT_PLIST_LIBTOOLIZE_FILTER?= \ -- cgit v1.2.3