From owner-dev-commits-ports-all@freebsd.org Tue Sep 21 08:42:35 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 065AE66E4D8; Tue, 21 Sep 2021 08:42:35 +0000 (UTC) (envelope-from git@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 4HDFL26L1fz3nCh; Tue, 21 Sep 2021 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B98D220E63; Tue, 21 Sep 2021 08:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18L8gYVU032948; Tue, 21 Sep 2021 08:42:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18L8gYMd032947; Tue, 21 Sep 2021 08:42:34 GMT (envelope-from git) Date: Tue, 21 Sep 2021 08:42:34 GMT Message-Id: <202109210842.18L8gYMd032947@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: aedc18359a34 - main - Mk/bsd.port.mk: fix NO_PKG_REGISTER MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aedc18359a342d7a3a1bb7c09820059175a24542 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 08:42:35 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=aedc18359a342d7a3a1bb7c09820059175a24542 commit aedc18359a342d7a3a1bb7c09820059175a24542 Author: Baptiste Daroussin AuthorDate: 2021-09-21 08:40:03 +0000 Commit: Baptiste Daroussin CommitDate: 2021-09-21 08:40:03 +0000 Mk/bsd.port.mk: fix NO_PKG_REGISTER Since we switched to pkg, NO_PKG_REGISTER was not working anymore. Since pkg 1.17.2 the pkg register command do support -N option which allows to bring back NO_PKG_REGISTER. PR: 191461 --- Mk/bsd.port.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f8fa7fa4b026..337d3f6be6a6 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4747,19 +4747,24 @@ flavors-package-names: .PHONY # Fake installation of package so that user can pkg delete it later. .if !target(fake-pkg) STAGE_ARGS= -i ${STAGEDIR} +.if defined(NO_PKG_REGISTER) +STAGE_ARGS= -N +.endif -.if !defined(NO_PKG_REGISTER) fake-pkg: .if defined(INSTALLS_DEPENDS) +.if !defined(NO_PKG_REGISTER) @${ECHO_MSG} "===> Registering installation for ${PKGNAME} as automatic" +.endif @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} -d ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST} .else +.if !defined(NO_PKG_REGISTER) @${ECHO_MSG} "===> Registering installation for ${PKGNAME}" +.endif @${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_REGISTER} ${STAGE_ARGS} -m ${METADIR} -f ${TMPPLIST} .endif @${RM} -r ${METADIR} .endif -.endif # Depend is generally meaningless for arbitrary ports, but if someone wants # one they can override this. This is just to catch people who've gotten into