git: 2f051a95cb1f - main - shells/rc: fix deinstallaion problem
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 21 May 2022 09:35:22 UTC
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2f051a95cb1fe7e8a091c755c2ccdee3ded3ff61
commit 2f051a95cb1fe7e8a091c755c2ccdee3ded3ff61
Author: Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2022-05-21 09:31:00 +0000
Commit: Koichiro Iwao <meta@FreeBSD.org>
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