diff options
author | apb <apb@pkgsrc.org> | 2014-03-02 13:48:03 +0000 |
---|---|---|
committer | apb <apb@pkgsrc.org> | 2014-03-02 13:48:03 +0000 |
commit | 3cf2c4f7234e1a3540fe1f62e39352f2974c0d14 (patch) | |
tree | 0519c7a7df2625f9c9f8ae270796323cd6aa779a | |
parent | 0251ee69def19ba6666d55cb83794e1bf385d557 (diff) | |
download | pkgsrc-3cf2c4f7234e1a3540fe1f62e39352f2974c0d14.tar.gz |
Insert $(DESTDIR) in "rm -f" commands in src/Makefile.in::install-exec-local.
This fixes abuild failure when a version of the package is already
installed.
Not bumping PKGREVISION because the resulting package should be unchanged.
-rw-r--r-- | comms/lrzsz/distinfo | 3 | ||||
-rw-r--r-- | comms/lrzsz/patches/patch-src_Makefile.in | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/comms/lrzsz/distinfo b/comms/lrzsz/distinfo index 455967ec91b..de2f13747b8 100644 --- a/comms/lrzsz/distinfo +++ b/comms/lrzsz/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2009/08/29 11:33:14 wiz Exp $ +$NetBSD: distinfo,v 1.5 2014/03/02 13:48:03 apb Exp $ SHA1 (lrzsz-0.12.20.tar.gz) = 451e6a1813dfb71a412c973acd1b88b9ee3f28c4 RMD160 (lrzsz-0.12.20.tar.gz) = 1b1776143afaff8bc7447ce998f9d3a958d51f25 @@ -6,3 +6,4 @@ Size (lrzsz-0.12.20.tar.gz) = 280938 bytes SHA1 (patch-aa) = aaf33281da19658906eee6a922397968a200f186 SHA1 (patch-ab) = 273f343a3e4ca8190ae4ab52483600f7bcf8e404 SHA1 (patch-ac) = a224a77a6d9581c601a50ebe9153e6ad25c8601b +SHA1 (patch-src_Makefile.in) = 8f95cfdf1525f27b1e860f2691559277dce62b32 diff --git a/comms/lrzsz/patches/patch-src_Makefile.in b/comms/lrzsz/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..345cd8dcec0 --- /dev/null +++ b/comms/lrzsz/patches/patch-src_Makefile.in @@ -0,0 +1,21 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2014/03/02 13:48:03 apb Exp $ + +--- src/Makefile.in.orig 1998-12-30 16:31:46.000000000 +0000 ++++ src/Makefile.in +@@ -372,13 +372,13 @@ install-exec-local: + rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo lsx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo lrb | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` +- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'` ++ rm -f $(DESTDIR)$(bindir)/`echo lrx | sed -e '$(transform)'` + ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \ + $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` + # rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'` |