From owner-svn-ports-head@freebsd.org Mon Mar 29 07:42:21 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 02E8F5BF914; Mon, 29 Mar 2021 07:42:21 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F84Km6YVRz4kMx; Mon, 29 Mar 2021 07:42:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D3D0272E1; Mon, 29 Mar 2021 07:42:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12T7gK7A090549; Mon, 29 Mar 2021 07:42:20 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12T7gKYn090547; Mon, 29 Mar 2021 07:42:20 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202103290742.12T7gKYn090547@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 29 Mar 2021 07:42:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569436 - in head/Mk: . Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/Mk: . Scripts X-SVN-Commit-Revision: 569436 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2021 07:42:21 -0000 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}' \