[pkgsrc/trunk]: pkgsrc/shells/zsh-current Put back s/$INSTALL_DATA + chmod +x...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a7a8bd1797c
branches:  trunk
changeset: 551995:4a7a8bd1797c
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Mon Dec 22 02:18:51 2008 +0000

description:
Put back s/$INSTALL_DATA + chmod +x/$INSTALL_SCRIPT/ change lost
in previous.  No user-visible changes expected.

diffstat:

 shells/zsh-current/distinfo         |   5 ++++-
 shells/zsh-current/patches/patch-af |  12 ++++++++++++
 shells/zsh-current/patches/patch-ag |  12 ++++++++++++
 shells/zsh-current/patches/patch-ah |  17 +++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletions(-)

diffs (68 lines):

diff -r 9f8236525040 -r 4a7a8bd1797c shells/zsh-current/distinfo
--- a/shells/zsh-current/distinfo       Mon Dec 22 02:15:54 2008 +0000
+++ b/shells/zsh-current/distinfo       Mon Dec 22 02:18:51 2008 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.13 2008/12/21 16:53:45 uebayasi Exp $
+$NetBSD: distinfo,v 1.14 2008/12/22 02:18:51 uebayasi Exp $
 
 SHA1 (zsh-4.3.9.tar.bz2) = 7c80e1ad6b311ee5877172a1a7e0161a9a60da70
 RMD160 (zsh-4.3.9.tar.bz2) = 2c88347fa357e3624f000721963749c6ccb4e129
 Size (zsh-4.3.9.tar.bz2) = 2659602 bytes
 SHA1 (patch-ab) = 4fc9ef0aa307a794fddf018a7888ac8b0073a13a
 SHA1 (patch-ac) = b586fcb6ab7d831a3490077f84fe170969905c26
+SHA1 (patch-af) = c78fa8e786d3ae2e3b15a9587f2a7b6e64891778
+SHA1 (patch-ag) = 2fe6b7f0a76ca7e5d341fda408f3ab5443d09cbc
+SHA1 (patch-ah) = 561132abcd56df88d7ed3da4bca5f172ca341439
diff -r 9f8236525040 -r 4a7a8bd1797c shells/zsh-current/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh-current/patches/patch-af       Mon Dec 22 02:18:51 2008 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.3 2008/12/22 02:18:51 uebayasi Exp $
+
+--- Config/defs.mk.in.orig     2008-03-13 18:44:39.000000000 +0900
++++ Config/defs.mk.in
+@@ -81,6 +81,7 @@ TEXI2PDF     = @TEXI2PDF@
+ 
+ # install utility
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_DATA    = @INSTALL_DATA@
+ 
+ # variables used in determining what to install
diff -r 9f8236525040 -r 4a7a8bd1797c shells/zsh-current/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh-current/patches/patch-ag       Mon Dec 22 02:18:51 2008 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.3 2008/12/22 02:18:51 uebayasi Exp $
+
+--- Makefile.in.orig   2008-02-01 20:22:22.000000000 +0900
++++ Makefile.in
+@@ -87,6 +87,7 @@ install.fns:
+         scriptdir="$(scriptdir)" \
+         FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
+         INSTALL_DATA="$(INSTALL_DATA)" \
++        INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
+         INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+         DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \
+         $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \
diff -r 9f8236525040 -r 4a7a8bd1797c shells/zsh-current/patches/patch-ah
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh-current/patches/patch-ah       Mon Dec 22 02:18:51 2008 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.3 2008/12/22 02:18:51 uebayasi Exp $
+
+--- Config/installfns.sh.orig  2007-07-26 17:56:37.000000000 +0900
++++ Config/installfns.sh
+@@ -45,9 +45,10 @@ for file in $allfuncs; do
+       esac
+     fi
+     test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
+-    $INSTALL_DATA $sdir_top/$file $instdir || exit 1
+     if test -x $sdir_top/$file; then
+-      chmod +x $instdir/`echo $file | sed -e 's%^.*/%%'`
++      $INSTALL_SCRIPT $sdir_top/$file $instdir || exit 1
++    else
++      $INSTALL_DATA $sdir_top/$file $instdir || exit 1
+     fi
+   fi
+ done