pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/comms/lrzsz Insert $(DESTDIR) in "rm -f" commands in s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/feb430767b26
branches:  trunk
changeset: 631344:feb430767b26
user:      apb <apb%pkgsrc.org@localhost>
date:      Sun Mar 02 13:48:03 2014 +0000

description:
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.

diffstat:

 comms/lrzsz/distinfo                      |   3 ++-
 comms/lrzsz/patches/patch-src_Makefile.in |  21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 77b3ccf27a4e -r feb430767b26 comms/lrzsz/distinfo
--- a/comms/lrzsz/distinfo      Sun Mar 02 09:54:36 2014 +0000
+++ b/comms/lrzsz/distinfo      Sun Mar 02 13:48:03 2014 +0000
@@ -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 @@
 SHA1 (patch-aa) = aaf33281da19658906eee6a922397968a200f186
 SHA1 (patch-ab) = 273f343a3e4ca8190ae4ab52483600f7bcf8e404
 SHA1 (patch-ac) = a224a77a6d9581c601a50ebe9153e6ad25c8601b
+SHA1 (patch-src_Makefile.in) = 8f95cfdf1525f27b1e860f2691559277dce62b32
diff -r 77b3ccf27a4e -r feb430767b26 comms/lrzsz/patches/patch-src_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/lrzsz/patches/patch-src_Makefile.in Sun Mar 02 13:48:03 2014 +0000
@@ -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)'`



Home | Main Index | Thread Index | Old Index