[pkgsrc/trunk]: pkgsrc/devel/coccinelle Don't hardcode /bin/bash, /bin/sh is ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d42370c9ca7b
branches:  trunk
changeset: 556543:d42370c9ca7b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Mar 22 17:51:36 2009 +0000

description:
Don't hardcode /bin/bash, /bin/sh is sufficient.
Some shell code cleanups while here.
Tested by apb.

Bump PKGREVISION.

diffstat:

 devel/coccinelle/Makefile         |   5 +++--
 devel/coccinelle/distinfo         |   4 +++-
 devel/coccinelle/patches/patch-ab |  13 +++++++++++++
 devel/coccinelle/patches/patch-ac |  32 ++++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 3 deletions(-)

diffs (87 lines):

diff -r 369458a60401 -r d42370c9ca7b devel/coccinelle/Makefile
--- a/devel/coccinelle/Makefile Sun Mar 22 17:37:53 2009 +0000
+++ b/devel/coccinelle/Makefile Sun Mar 22 17:51:36 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/21 23:50:53 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.2 2009/03/22 17:51:36 wiz Exp $
 
 DISTNAME=      coccinelle-0.1.6
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  http://www.emn.fr/x-info/coccinelle/distrib/
 EXTRACT_SUFX=  .tgz
@@ -15,6 +15,7 @@
 HAS_CONFIGURE= yes
 USE_TOOLS=     gmake perl
 REPLACE_PERL=  configure
+REPLACE_SH=    runspatch.opt scripts/spatch.sh
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIG_SHELL=  ${PERL5}
diff -r 369458a60401 -r d42370c9ca7b devel/coccinelle/distinfo
--- a/devel/coccinelle/distinfo Sun Mar 22 17:37:53 2009 +0000
+++ b/devel/coccinelle/distinfo Sun Mar 22 17:51:36 2009 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/21 23:50:53 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/03/22 17:51:36 wiz Exp $
 
 SHA1 (coccinelle-0.1.6.tgz) = f027dc3f14b7e9b9ad0c28d73e57c01dc7ac02a6
 RMD160 (coccinelle-0.1.6.tgz) = 2836e816aa16147d18051265563164b6de73a447
 Size (coccinelle-0.1.6.tgz) = 3308204 bytes
 SHA1 (patch-aa) = 4322764ba5a7572aafe9d5fdd8d8ce7e6bc43cc1
+SHA1 (patch-ab) = 9f66851118d443140ded2c2e84177b746c676b2b
+SHA1 (patch-ac) = bbf01eab3030f897c910add77c48f320795baf4a
diff -r 369458a60401 -r d42370c9ca7b devel/coccinelle/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/coccinelle/patches/patch-ab Sun Mar 22 17:51:36 2009 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2009/03/22 17:51:36 wiz Exp $
+
+--- tools/alloc_free.ml.orig   2009-03-22 17:22:38.000000000 +0000
++++ tools/alloc_free.ml
+@@ -167,7 +167,7 @@ let _ =
+   then
+     begin
+       let o = open_out (Printf.sprintf "%s/files" !dir) in
+-      Printf.fprintf o "#!/bin/bash\n\n";
++      Printf.fprintf o "#!/bin/sh\n\n";
+       sedify o !gen !dir l;
+       sedify_ors o !gen !dir l;
+       Printf.fprintf o "\nwait\n/bin/rm tmp*out\n";
diff -r 369458a60401 -r d42370c9ca7b devel/coccinelle/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/coccinelle/patches/patch-ac Sun Mar 22 17:51:36 2009 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1 2009/03/22 17:51:36 wiz Exp $
+
+--- scripts/spatch.sh.orig     2009-03-19 10:42:38.000000000 +0000
++++ scripts/spatch.sh
+@@ -1,20 +1,20 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo setting COCCINELLE_HOME=${COCCINELLE_HOME:=SHAREDIR}
+ 
+-if [ ! -r $COCCINELLE_HOME/standard.iso ] ; then
++if [ ! -r "$COCCINELLE_HOME"/standard.iso ] ; then
+     echo "There is no standard.iso in SHAREDIR."
+     echo "Are you sure you run a properly installed version of spatch ?\n"
+ else
+ 
+  export COCCINELLE_HOME
+- export LD_LIBRARY_PATH=$COCCINELLE_HOME:$LD_LIBRARY_PATH
+- export PYTHONPATH=$COCCINELLE_HOME/python:$PYTHONPATH
++ export LD_LIBRARY_PATH="$COCCINELLE_HOME:$LD_LIBRARY_PATH"
++ export PYTHONPATH="$COCCINELLE_HOME/python:$PYTHONPATH"
+  
+- echo setting LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+- echo setting PYTHONPATH=$PYTHONPATH
++ echo setting LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
++ echo setting PYTHONPATH="$PYTHONPATH"
+ 
+ fi
+ 
+-$COCCINELLE_HOME/spatch.opt $*
++"$COCCINELLE_HOME"/spatch.opt "$@"
+