Date: Mon, 29 Mar 2021 07:42:20 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569436 - in head/Mk: . Scripts Message-ID: <202103290742.12T7gKYn090547@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Mar 29 07:42:20 2021 New Revision: 569436 URL: https://svnweb.freebsd.org/changeset/ports/569436 Log: Remove upgrade script It never actually really have been a thing, and can be done directly in install/deinstall scripts Reviewed by: mat (portmgr) Differential Revision: https://reviews.freebsd.org/D29427 Modified: head/Mk/Scripts/create-manifest.sh head/Mk/bsd.port.mk Modified: head/Mk/Scripts/create-manifest.sh ============================================================================== --- head/Mk/Scripts/create-manifest.sh Mon Mar 29 07:38:21 2021 (r569435) +++ head/Mk/Scripts/create-manifest.sh Mon Mar 29 07:42:20 2021 (r569436) @@ -12,10 +12,9 @@ validate_env dp_ACTUAL_PACKAGE_DEPENDS dp_CATEGORIES d dp_COMPLETE_OPTIONS_LIST dp_DEPRECATED dp_DESCR dp_EXPIRATION_DATE \ dp_GROUPS dp_LICENSE dp_LICENSE_COMB dp_MAINTAINER dp_METADIR \ dp_NO_ARCH dp_PKGBASE dp_PKGDEINSTALL dp_PKGINSTALL dp_PKGMESSAGES \ - dp_PKGORIGIN dp_PKGPOSTDEINSTALL dp_PKGPOSTINSTALL dp_PKGPOSTUPGRADE \ - dp_PKGPREDEINSTALL dp_PKGPREINSTALL dp_PKGPREUPGRADE dp_PKGUPGRADE \ - dp_PKGVERSION dp_PKG_BIN dp_PKG_IGNORE_DEPENDS dp_PKG_NOTES \ - dp_PORT_OPTIONS dp_PREFIX dp_USERS dp_WWW + dp_PKGORIGIN dp_PKGPOSTDEINSTALL dp_PKGPOSTINSTALL dp_PKGPREDEINSTALL \ + dp_PKGPREINSTALL dp_PKGVERSION dp_PKG_BIN dp_PKG_IGNORE_DEPENDS \ + dp_PKG_NOTES dp_PORT_OPTIONS dp_PREFIX dp_USERS dp_WWW [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_CREATE_MANIFEST}" ] && set -x @@ -92,7 +91,7 @@ cp ${dp_DESCR} ${dp_METADIR}/+DESC # Concatenate all the scripts output_files= -for stage in INSTALL DEINSTALL UPGRADE; do +for stage in INSTALL DEINSTALL; do for prepost in '' PRE POST; do output=${dp_METADIR}/+${prepost:+${prepost}_}${stage} [ -f "${output}" ] && output_files="${output_files:+${output_files} }${output}" @@ -100,7 +99,7 @@ for stage in INSTALL DEINSTALL UPGRADE; do done [ -n "${output_files}" ] && rm -f ${output_files} -for stage in INSTALL DEINSTALL UPGRADE; do +for stage in INSTALL DEINSTALL; do for prepost in '' PRE POST; do eval files="\${dp_PKG${prepost}${stage}}" output=${dp_METADIR}/+${prepost:+${prepost}_}${stage} Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Mar 29 07:38:21 2021 (r569435) +++ head/Mk/bsd.port.mk Mon Mar 29 07:42:20 2021 (r569436) @@ -1933,9 +1933,6 @@ PKGPREINSTALL?= ${PKGDIR}/pkg-pre-install PKGPOSTINSTALL?= ${PKGDIR}/pkg-post-install PKGPREDEINSTALL?= ${PKGDIR}/pkg-pre-deinstall PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall -PKGPREUPGRADE?= ${PKGDIR}/pkg-pre-upgrade -PKGPOSTUPGRADE?= ${PKGDIR}/pkg-post-upgrade -PKGUPGRADE?= ${PKGDIR}/pkg-upgrade _FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ fonts.dir fonts.scale gtk-update-icon-cache \ @@ -4344,11 +4341,8 @@ create-manifest: dp_PKGORIGIN='${PKGORIGIN}' \ dp_PKGPOSTDEINSTALL='${PKGPOSTDEINSTALL}' \ dp_PKGPOSTINSTALL='${PKGPOSTINSTALL}' \ - dp_PKGPOSTUPGRADE='${PKGPOSTUPGRADE}' \ dp_PKGPREDEINSTALL='${PKGPREDEINSTALL}' \ dp_PKGPREINSTALL='${PKGPREINSTALL}' \ - dp_PKGPREUPGRADE='${PKGPREUPGRADE}' \ - dp_PKGUPGRADE='${PKGUPGRADE}' \ dp_PKGVERSION='${PKGVERSION}' \ dp_PKG_BIN='${PKG_BIN}' \ dp_PKG_IGNORE_DEPENDS='${PKG_IGNORE_DEPENDS}' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103290742.12T7gKYn090547>