From 52ecaa6900befe3256ebaca4f51523aec9cda0fb Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Thu, 2 Jan 2014 04:18:49 +0000
Subject: Remove flagrantly wrong shell syntax (trailing &&) appearing in the
 upstream makefile. Dunno how this failed to be noticed a long time ago...
 looks like netbsd's sh has a bug.

---
 lang/kali/distinfo         |  4 ++--
 lang/kali/patches/patch-aa | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'lang')

diff --git a/lang/kali/distinfo b/lang/kali/distinfo
index ad9ec4285fc..b5240d819f9 100644
--- a/lang/kali/distinfo
+++ b/lang/kali/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2010/08/21 14:16:18 asau Exp $
+$NetBSD: distinfo,v 1.7 2014/01/02 04:18:49 dholland Exp $
 
 SHA1 (kali-0.52.2.tar.gz) = 85e2fe2f2d01c867ab15a513a4ec7313ebd5155e
 RMD160 (kali-0.52.2.tar.gz) = 012889783fcc2247130d3705ca7c9423cc0e5ac3
 Size (kali-0.52.2.tar.gz) = 1065604 bytes
-SHA1 (patch-aa) = 7c8cf832e00eadd0fc88826cb8390665d1b03e92
+SHA1 (patch-aa) = 00993a9420db03c08d8089ea1a7022ce3b71f071
diff --git a/lang/kali/patches/patch-aa b/lang/kali/patches/patch-aa
index 24dca775012..bc4cf4db209 100644
--- a/lang/kali/patches/patch-aa
+++ b/lang/kali/patches/patch-aa
@@ -1,10 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2010/08/21 14:16:18 asau Exp $
+$NetBSD: patch-aa,v 1.4 2014/01/02 04:18:50 dholland Exp $
 
-Staged installation support.
+- Staged installation support.
+- Remove wrong shell syntax (trailing &&).
 
---- Makefile.in.orig	1999-02-12 16:42:56.000000000 +0300
-+++ Makefile.in	2010-08-21 18:09:54.000000000 +0400
-@@ -98,7 +98,7 @@
+--- Makefile.in.orig	1999-02-12 13:42:56.000000000 +0000
++++ Makefile.in
+@@ -98,7 +98,7 @@ CONFIG_FILES = scheme/interfaces.scm sch
  
  # The following is the first rule and therefore the "make" command's
  # default target.
@@ -13,7 +14,7 @@ Staged installation support.
  
  # The developers are curious to know.  Don't be concerned if this fails.
  .notify: build/minor-version-number
-@@ -150,21 +150,21 @@
+@@ -150,21 +150,21 @@ $(IMAGE): $(VM) scheme/env/init-defpacka
  install: enough dirs inst-script inst-vm inst-misc inst-man inst-inc inst-image
  
  inst-vm:
@@ -39,7 +40,7 @@ Staged installation support.
  		rm $(MANPAGE);						   \
  	else								   \
  		echo "$(mandir) not writable dir, not installing man page" \
-@@ -172,26 +172,26 @@
+@@ -172,26 +172,26 @@ inst-man:
  	fi
  
  inst-inc:
@@ -55,8 +56,9 @@ Staged installation support.
  	done &&								\
  	for f in scheme/rts/*num.scm scheme/rts/jar-defrecord.scm; do	\
 -		$(INSTALL_DATA) $$f $(LIB)/rts || exit 1;		\
+-	done &&
 +		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/rts || exit 1;	\
- 	done &&
++	done
  
  inst-script:
  	script=$(bindir)/$(RUNNABLE) &&					\
@@ -74,7 +76,7 @@ Staged installation support.
  
  # Script to run kali in this directory.
  go:
-@@ -204,17 +204,17 @@
+@@ -204,17 +204,17 @@ go:
  
  dirs:
  	for dir in $(libdir) $(bindir) $(incdir); do			 \
-- 
cgit v1.2.3