[pkgsrc/trunk]: pkgsrc/misc/screen call ln with separate -s and -f args to ap...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9c70aa12e4d4
branches:  trunk
changeset: 464526:9c70aa12e4d4
user:      grant <grant%pkgsrc.org@localhost>
date:      Thu Dec 11 22:35:09 2003 +0000

description:
call ln with separate -s and -f args to appease Solaris.

from Dima Veselov on tech-pkg.

diffstat:

 misc/screen/distinfo         |   4 ++--
 misc/screen/patches/patch-an |  17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 07a5ac76d21c -r 9c70aa12e4d4 misc/screen/distinfo
--- a/misc/screen/distinfo      Thu Dec 11 22:27:40 2003 +0000
+++ b/misc/screen/distinfo      Thu Dec 11 22:35:09 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2003/12/01 15:18:27 ben Exp $
+$NetBSD: distinfo,v 1.17 2003/12/11 22:35:09 grant Exp $
 
 SHA1 (screen-4.0.1.tar.gz) = 61f24b18c56b5862c769345d204f57b1e7f222ab
 Size (screen-4.0.1.tar.gz) = 837445 bytes
@@ -11,6 +11,6 @@
 SHA1 (patch-ak) = 1e83c3406fb862e15f0fd5b90da8cf5310fbb68b
 SHA1 (patch-al) = 6ee93058847f3894a886346676e4a613c0bd134e
 SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9
-SHA1 (patch-an) = 9c5f451edb228f10daf593eba79f1fb11b4ffb24
+SHA1 (patch-an) = 79d84b0caaad6044cf81c0fcfc1cd8470c9378d8
 SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
 SHA1 (patch-ap) = e44fa5dd2cadb307f12291ed67ca3f1cc03f8297
diff -r 07a5ac76d21c -r 9c70aa12e4d4 misc/screen/patches/patch-an
--- a/misc/screen/patches/patch-an      Thu Dec 11 22:27:40 2003 +0000
+++ b/misc/screen/patches/patch-an      Thu Dec 11 22:35:09 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2002/09/15 06:51:40 kim Exp $
+$NetBSD: patch-an,v 1.2 2003/12/11 22:35:09 grant Exp $
 
---- Makefile.in.orig   Thu Feb 14 08:36:33 2002
-+++ Makefile.in        Sun Sep 15 01:57:20 2002
-@@ -55,12 +55,12 @@
+--- Makefile.in.orig   2003-09-19 02:13:02.000000000 +1000
++++ Makefile.in
+@@ -55,12 +55,12 @@ CFILES=    screen.c ansi.c fileio.c mark.c 
        search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \
        termcap.c input.c attacher.c pty.c process.c display.c comm.c \
        kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \
@@ -17,3 +17,12 @@
  
  all:  screen
  
+@@ -78,7 +78,7 @@ install_bin: .version screen
+ # This doesn't work if $(bindir)/screen is a symlink
+       -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+       rm -f $(DESTDIR)$(bindir)/screen
+-      (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
++      (cd $(DESTDIR)$(bindir) && ln -s -f $(SCREEN) screen)
+       cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+ 
+ ###############################################################################