cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Coccinelle 1.0.0rc5

Browse Source
This commit is contained in:
sthen 2011-08-16 08:26:16 +00:00
parent 19897ed407
commit 46fffdac37
6 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/coccinelle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2011/07/05 08:38:06 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2011/08/16 08:26:16 sthen Exp $
SHARED_ONLY = Yes
@ -6,7 +6,7 @@ COMMENT = program matching and transformation engine
# if updating, check for any additional use of diff/grep which
# may need to be switched to gdiff/ggrep
DISTNAME = coccinelle-1.0.0-rc4
DISTNAME = coccinelle-1.0.0-rc5
PKGNAME = ${DISTNAME:S/-rc/rc/}
EXTRACT_SUFX = .tgz

10
devel/coccinelle/distinfo
View File

@ -1,5 +1,5 @@
MD5 (coccinelle-1.0.0-rc4.tgz) = 2aKUQ/QwX99RHrC6DPUyuA==
RMD160 (coccinelle-1.0.0-rc4.tgz) = kJw2JQJhFuZ1hZ2dsUKn7WH7Lqs=
SHA1 (coccinelle-1.0.0-rc4.tgz) = C1Bp4RF2GYs30R2qATIDRalLXx4=
SHA256 (coccinelle-1.0.0-rc4.tgz) = rHng4d5C/0yg53Vd77E972N6+u8reQ2aMyka+UmRW1A=
SIZE (coccinelle-1.0.0-rc4.tgz) = 2313736
MD5 (coccinelle-1.0.0-rc5.tgz) = ZKJqKOLXolKBEro/iwKR9g==
RMD160 (coccinelle-1.0.0-rc5.tgz) = 1aG3xaUEeqRnefKK9i7BC24GNEU=
SHA1 (coccinelle-1.0.0-rc5.tgz) = /+FOU6XL7J4gn1l3x3aLTRzNWIo=
SHA256 (coccinelle-1.0.0-rc5.tgz) = 7xWpEzicwo29g9DfQzlqT4x7xH0xqonMkXoGeqlT2Es=
SIZE (coccinelle-1.0.0-rc5.tgz) = 2326927

8
devel/coccinelle/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1 2011/06/16 23:24:49 sthen Exp $
--- Makefile.orig Thu Jun 16 23:49:44 2011
+++ Makefile Thu Jun 16 23:50:02 2011
@@ -331,7 +331,7 @@ install-common:
$OpenBSD: patch-Makefile,v 1.2 2011/08/16 08:26:16 sthen Exp $
--- Makefile.orig Wed Aug 10 20:10:48 2011
+++ Makefile Thu Aug 11 14:44:53 2011
@@ -341,7 +341,7 @@ install-common:
$(INSTALL_DATA) commons/*.cmi $(DESTDIR)$(SHAREDIR)/commons/
$(INSTALL_DATA) globals/iteration.cmi $(DESTDIR)$(SHAREDIR)/globals/
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/

18
devel/coccinelle/patches/patch-cocci_ml
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-cocci_ml,v 1.2 2011/06/16 23:24:49 sthen Exp $
--- cocci.ml.orig Fri Jun 3 17:55:52 2011
+++ cocci.ml Thu Jun 16 23:48:24 2011
@@ -263,8 +263,8 @@ let show_or_not_diff2 cfile outfile =
$OpenBSD: patch-cocci_ml,v 1.3 2011/08/16 08:26:16 sthen Exp $
--- cocci.ml.orig Wed Aug 10 20:10:48 2011
+++ cocci.ml Thu Aug 11 15:49:26 2011
@@ -266,8 +266,8 @@ let show_or_not_diff2 cfile outfile =
let line =
match !Flag_parsing_c.diff_lines with
@ -9,10 +9,10 @@ $OpenBSD: patch-cocci_ml,v 1.2 2011/06/16 23:24:49 sthen Exp $
- | Some n -> "diff -U "^n^" -p "^cfile^" "^outfile in
+ | None -> "gdiff -u -p " ^ cfile ^ " " ^ outfile
+ | Some n -> "gdiff -U "^n^" -p "^cfile^" "^outfile in
let xs =
let res = Common.cmd_to_list line in
match (!Flag.patch,res) with
@@ -501,7 +501,7 @@ let worth_trying cfiles tokens =
let res = Common.cmd_to_list line in
let res =
List.map
@@ -526,7 +526,7 @@ let worth_trying cfiles tokens =
| _ -> s
) in
@ -21,7 +21,7 @@ $OpenBSD: patch-cocci_ml,v 1.2 2011/06/16 23:24:49 sthen Exp $
in
(match Sys.command com with
| 0 (* success *) -> true
@@ -1995,7 +1995,7 @@ let check_duplicate_modif2 xs =
@@ -2032,7 +2032,7 @@ let check_duplicate_modif2 xs =
match res2 with
| None -> false
| Some res2 ->

21
devel/coccinelle/patches/patch-commons_common_ml Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-commons_common_ml,v 1.1 2011/08/16 08:26:16 sthen Exp $
--- commons/common.ml.orig Thu Aug 11 15:51:39 2011
+++ commons/common.ml Thu Aug 11 15:52:01 2011
@@ -5347,7 +5347,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
write_file file1 (unwords xs);
write_file file2 (unwords ys);
command2
- ("diff --side-by-side -W 1 " ^ file1 ^ " " ^ file2 ^ " > " ^ fileresult);
+ ("gdiff --side-by-side -W 1 " ^ file1 ^ " " ^ file2 ^ " > " ^ fileresult);
let res = cat fileresult in
let a = ref 0 in
let b = ref 0 in
@@ -5375,7 +5375,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
write_file "/tmp/diff1" xstr;
write_file "/tmp/diff2" ystr;
command2
- ("diff --side-by-side --left-column -W 1 " ^
+ ("gdiff --side-by-side --left-column -W 1 " ^
"/tmp/diff1 /tmp/diff2 > /tmp/diffresult");
let res = cat "/tmp/diffresult" in
let a = ref 0 in

18
devel/coccinelle/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
--- configure.orig Fri Jan 28 22:37:25 2011
+++ configure Thu May 5 22:19:13 2011
@@ -179,7 +179,7 @@ if ($opt eq ".opt") {
$OpenBSD: patch-configure,v 1.2 2011/08/16 08:26:16 sthen Exp $
--- configure.orig Wed Aug 10 13:32:11 2011
+++ configure Thu Aug 11 14:44:53 2011
@@ -186,7 +186,7 @@ if ($opt eq ".opt") {
pr2 "";
$error += check_config(
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
"GNU Make [^0-9]*3\.[0-9]+.*", #version 3.79.1, 3.81
"make (gnu version) is present.",
"The program gnu make is missing or is not a good version.
@@ -198,7 +198,7 @@ We need 3.XX",
@@ -205,7 +205,7 @@ We need 3.XX",
my $PY_VERSION;
if($python) {
if(check_config(
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
'^Python 2\.([4567]|[4567]\.\S*)$',
"python is present",
"python is missing or is not a good version."
@@ -207,8 +207,8 @@ if($python) {
@@ -214,8 +214,8 @@ if($python) {
$python=0;
}
if($python) {
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
my $python_hdr = "$PY_PREFIX/include/python$PY_VERSION/Python.h";
if(check_config(
"ls $python_hdr 2> /dev/null | ",
@@ -377,11 +377,11 @@ OPTBIN=$opt
@@ -405,11 +405,11 @@ OPTBIN=$opt
my $pythonprefix = $python ? "yes" : "no";
pr2 "Support for python scripting: $pythonprefix";
`cd python; ln -sf ${pythonprefix}_pycocci.ml pycocci.ml; `;
@ -42,5 +42,5 @@ $OpenBSD: patch-configure,v 1.1.1.1 2011/05/14 15:02:50 sthen Exp $
-`cd ocaml; make depend`;
+`cd ocaml; ${MAKE_PROGRAM} depend`;
pr2 "Modifying globals/config.ml";
my $command = "perl -p -e 's#Not_found.\*#Not_found->\\\"$src\\\"#' globals/config.ml.in > globals/config.ml";
my $pcresuffix = $pcre ? "pcre" : "str";
pr2 "Support for regexp: $pcresuffix";