From nobody Sat May 21 09:35:22 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C293E1B3ACD6; Sat, 21 May 2022 09:35:22 +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 4L4z3G55kZz4kLg; Sat, 21 May 2022 09:35:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653125722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0QidSVxSUdUabjSwhGig/wY6Q4rbJkVb9ushlf3CDJM=; b=fP9V76Ur0g8/w0GelKrjT/axu0T7BbbeZa6PR8e2zXqWsQJZJXFQaQXWOtkVJRZohFr1vG fbFkgMFrpBJHSxHJ3AyfUEc2zAU6yN/feeg2VG1YQQXLD7KUfwYVK/Z8raaBnZbU6MCVfz HYopER1qL9H8yXAi/lG8I6Tk7ewdhg8HpnXp8H/GPR8dKiGb/HMv3xJi49oJiZAfHRYkRC sHnuLm7ppTOFiCCr21/usqOnjdbuZ9TaDN4Ou82i0utQ4d7VLLihSpYfaGeWj9UjB8/9E/ 2Dumjyful7LSrxkxdx5PNET8PdYUmHzDHdaN1D6e5kajAflv81WVGak7KyLzpQ== 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 8EE49245B4; Sat, 21 May 2022 09:35:22 +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 24L9ZMn4067222; Sat, 21 May 2022 09:35:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24L9ZMT0067221; Sat, 21 May 2022 09:35:22 GMT (envelope-from git) Date: Sat, 21 May 2022 09:35:22 GMT Message-Id: <202205210935.24L9ZMT0067221@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: 2f051a95cb1f - main - shells/rc: fix deinstallaion problem List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f051a95cb1fe7e8a091c755c2ccdee3ded3ff61 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653125722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0QidSVxSUdUabjSwhGig/wY6Q4rbJkVb9ushlf3CDJM=; b=yf5xkKasBHl6Rduop1KS5Uk6j/HNLrkuVNyUUy3z+jGgh9LcqVys65afxMm09AHYftJ0qS zseJ61QKvv+NEh0hlStK9x5R4OUOfug7isEBFhA/nhPrM2SNAWojmHx5y5Y+bu6kamAtT9 pzW1wCeG6NVbqnl3nYczRWRsJNIMAnzJ/G+kQBdJrIkI3vTd2B+cEJwRJQ0ZvdbBJn+hI6 8d3W5tCSixFZpcgb5LLseieYJoSP0aIFmo7wqXdGENRKnqs7R+g0BidqbtSGflI+4ypPY2 mt9JXca9pLbGjxHQQVgzHuEIBoGCrnEHdCcAjK5msPZGTL4umctkn9lcr3rJag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653125722; a=rsa-sha256; cv=none; b=vs41LKGQT2y8WGIYuzU+2PLf0eFw5rmvsoJukB1/KvljJsHyQobyL/TY2vACONAmODhl9Q NbPSvlut0VEcgXsR16vWF/Rz0sZ8sIQZgQnmSoT95tjQ/L8Aynb8m5mYk30e4oHgAdDH8E b7UIpDFRX9jXY3MqhlLEFupFqTUChUUvySVVQKOuYzhflrzQwFbV17ljfaKqIyeU5LKnKD +x/tlctS4B397B17SB6jlR156k/PZsNyMv60jmaud4iWBt2iAWwMhlhYkY7OJcZue7mBQG PaH0GUHcwhQFYEf/BGNK5gKbF4jaHrMvY5nBD6BWOupkY6rzkI1cPgRV2iINFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f051a95cb1fe7e8a091c755c2ccdee3ded3ff61 commit 2f051a95cb1fe7e8a091c755c2ccdee3ded3ff61 Author: Chris Hutchinson AuthorDate: 2022-05-21 09:31:00 +0000 Commit: Koichiro Iwao CommitDate: 2022-05-21 09:35:14 +0000 shells/rc: fix deinstallaion problem PR: 264084 Reported by: jakub_lach@mailplus.pl Approved by: blanket (fix deinstallation) --- shells/rc/Makefile | 2 +- shells/rc/files/patch-Makefile.am | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/shells/rc/Makefile b/shells/rc/Makefile index ffec66d98e2b..bb15be37aa6f 100644 --- a/shells/rc/Makefile +++ b/shells/rc/Makefile @@ -2,7 +2,7 @@ PORTNAME= rc PORTVERSION= 1.7.4 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX=v CATEGORIES= shells plan9 diff --git a/shells/rc/files/patch-Makefile.am b/shells/rc/files/patch-Makefile.am index 29c867c3a301..3fdc4378b29d 100644 --- a/shells/rc/files/patch-Makefile.am +++ b/shells/rc/files/patch-Makefile.am @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2022-04-28 07:43:21.167704000 -0700 -+++ Makefile.am 2022-04-28 07:47:55.514536000 -0700 -@@ -64,8 +64,8 @@ +--- Makefile.am.orig 2022-05-20 12:55:23.153147000 -0700 ++++ Makefile.am 2022-05-20 12:58:05.878390000 -0700 +@@ -64,8 +64,9 @@ install-exec-hook: if AMC_HISTORY @@ -9,7 +9,8 @@ - rm -f $(bindir)/-p; $(LN) $(bindir)/- $(bindir)/-p ;\ - rm -f $(bindir)/--p; $(LN) $(bindir)/- $(bindir)/--p + $(INSTALL_PROGRAM) history $(DESTDIR)$(bindir)/- ;\ -+ rm -f $(bindir)/--; $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-- ;\ -+ rm -f $(bindir)/-p; $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-p ;\ -+ rm -f $(bindir)/--p; $(LN) $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/--p ++ rm -f $(DESTDIR)$(bindir)/-- $(DESTDIR)$(bindir)/-p $(DESTDIR)$(bindir)/--p;\ ++ cp $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-- ;\ ++ cp $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/--p ;\ ++ cp $(DESTDIR)$(bindir)/- $(DESTDIR)$(bindir)/-p endif