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

update to coccinelle 1.0 rc7

Browse Source 
Note: !=~ has changed to !~
This commit is contained in:
sthen 2011-08-30 10:20:11 +00:00
parent acc69348be
commit a0ae5de39d
6 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/coccinelle/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2011/08/22 00:37:49 sthen Exp $
# $OpenBSD: Makefile,v 1.10 2011/08/30 10:20:11 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-rc6
DISTNAME = coccinelle-1.0.0-rc7
PKGNAME = ${DISTNAME:S/-rc/rc/}
EXTRACT_SUFX = .tgz
@ -34,6 +34,7 @@ REGRESS_DEPENDS = ${FULLPKGPATH}
RUN_DEPENDS = sysutils/findlib \
sysutils/ggrep \
textproc/gdiff
# later: devel/ocaml-pcre
# asks questions at the end if it does better than expected
REGRESS_IS_INTERACTIVE = Yes

10
devel/coccinelle/distinfo
View File

@ -1,5 +1,5 @@
MD5 (coccinelle-1.0.0-rc6.tgz) = dZLnz+oiq4MG0E3l/tHqjg==
RMD160 (coccinelle-1.0.0-rc6.tgz) = E/QKAYUeE44pI8q2N9GdjINQFzI=
SHA1 (coccinelle-1.0.0-rc6.tgz) = NZFOID/RSHFd8q5k2efv+3nGI9s=
SHA256 (coccinelle-1.0.0-rc6.tgz) = QEGk7Pa/Mq7l+dMeSbIrMrd+DIPn5T4lyTDRjw9S5eE=
SIZE (coccinelle-1.0.0-rc6.tgz) = 2332592
MD5 (coccinelle-1.0.0-rc7.tgz) = QVJ1cKAyhwjDhUDfU8RRyA==
RMD160 (coccinelle-1.0.0-rc7.tgz) = WpmedR5VIyAVwnQaJepPmDWpGXw=
SHA1 (coccinelle-1.0.0-rc7.tgz) = QlRLpbVZd5NiCxezMWEjiGCe+fo=
SHA256 (coccinelle-1.0.0-rc7.tgz) = t0q2BpOM1IG9RRW3fzMOZuIexjQLEApvbc/ZJnquU7o=
SIZE (coccinelle-1.0.0-rc7.tgz) = 2337344

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.3 2011/08/22 00:37:50 sthen Exp $
--- Makefile.orig Sun Aug 21 07:34:48 2011
+++ Makefile Mon Aug 22 01:24:21 2011
@@ -345,7 +345,7 @@ install-man:
$OpenBSD: patch-Makefile,v 1.4 2011/08/30 10:20:11 sthen Exp $
--- Makefile.orig Sat Aug 27 07:26:44 2011
+++ Makefile Sat Aug 27 21:27:42 2011
@@ -344,7 +344,7 @@ install-man:
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
$(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2011/08/16 08:26:16 sthen Exp $
$OpenBSD: patch-configure,v 1.3 2011/08/30 10:20:11 sthen Exp $
--- configure.orig Wed Aug 10 13:32:11 2011
+++ configure Thu Aug 11 14:44:53 2011
+++ configure Sat Aug 27 21:28:10 2011
@@ -186,7 +186,7 @@ if ($opt eq ".opt") {
pr2 "";
@ -30,7 +30,7 @@ $OpenBSD: patch-configure,v 1.2 2011/08/16 08:26:16 sthen Exp $
my $python_hdr = "$PY_PREFIX/include/python$PY_VERSION/Python.h";
if(check_config(
"ls $python_hdr 2> /dev/null | ",
@@ -405,11 +405,11 @@ OPTBIN=$opt
@@ -405,16 +405,16 @@ OPTBIN=$opt
my $pythonprefix = $python ? "yes" : "no";
pr2 "Support for python scripting: $pythonprefix";
`cd python; ln -sf ${pythonprefix}_pycocci.ml pycocci.ml; `;
@ -44,3 +44,9 @@ $OpenBSD: patch-configure,v 1.2 2011/08/16 08:26:16 sthen Exp $
my $pcresuffix = $pcre ? "pcre" : "str";
pr2 "Support for regexp: $pcresuffix";
`cd globals; ln -sf regexp_${pcresuffix}.ml regexp.ml; touch regexp.ml;`;
-`cd globals; make depend`;
+`cd globals; ${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";

15
devel/coccinelle/patches/patch-demos_regexp_cocci Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-demos_regexp_cocci,v 1.1 2011/08/30 10:20:11 sthen Exp $
syntax changed in rc7
--- demos/regexp.cocci.orig Sat Aug 27 21:59:25 2011
+++ demos/regexp.cocci Sat Aug 27 21:59:30 2011
@@ -30,7 +30,7 @@ print "Contains foo: %s" % x
@nocontain@
type t;
-identifier foo !=~ "foo";
+identifier foo !~ "foo";
@@
t foo () {

27
devel/coccinelle/patches/patch-parsing_cocci_function_prototypes_ml Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-parsing_cocci_function_prototypes_ml,v 1.1 2011/08/30 10:20:11 sthen Exp $
--- parsing_cocci/function_prototypes.ml.orig Sat Aug 27 07:26:45 2011
+++ parsing_cocci/function_prototypes.ml Sun Aug 28 11:47:32 2011
@@ -153,18 +153,19 @@ and strip =
ref [],-1) in
(* need a case for everything that has an unvisited component and can be in
- a function prototype *)
+ a function prototype. Also get rid of constraints because pcre
+ constraints cannot be compared. *)
let ident r k e =
donothing r k
(Ast0.rewrap e
(match Ast0.unwrap e with
Ast0.MetaId(nm,constraints,seed,pure) ->
- Ast0.MetaId(nm,constraints,seed,Ast0.Pure)
+ Ast0.MetaId(nm,Ast.IdNoConstraint,seed,Ast0.Pure)
| Ast0.MetaFunc(nm,constraints,pure) ->
- Ast0.MetaFunc(nm,constraints,Ast0.Pure)
+ Ast0.MetaFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
| Ast0.MetaLocalFunc(nm,constraints,pure) ->
- Ast0.MetaLocalFunc(nm,constraints,Ast0.Pure)
+ Ast0.MetaLocalFunc(nm,Ast.IdNoConstraint,Ast0.Pure)
| e -> e)) in
let typeC r k e =