Index: Makefile =================================================================== diff --git a/head/devel/coccinelle/Makefile b/head/devel/coccinelle/Makefile --- a/head/devel/coccinelle/Makefile (revision 335091) +++ b/head/devel/coccinelle/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= coccinelle -DISTVERSION= 0.2.4rc5 +DISTVERSION= 1.0.0-rc18 CATEGORIES= devel MASTER_SITES= http://coccinelle.lip6.fr/distrib/ EXTRACT_SUFX= .tgz @@ -13,17 +13,15 @@ USES= shebangfix gmake perl5 GNU_CONFIGURE= yes USE_PERL5= build -USE_PYTHON= 2.5+ +USE_PYTHON= 2.6+ USE_OCAML= 3.0+ -SHEBANG_FILES= configure +bash_CMD= ${SH} +SHEBANG_FILES= setup/echo.sh +MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER} -MAN1= spatch.1 +post-install: + ${STRIP_CMD} ${STAGEDIR}${DATADIR}/dllpcre_stubs.so \ + ${STAGEDIR}${DATADIR}/dllpycaml_stubs.so \ + ${STAGEDIR}${DATADIR}/spatch -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} 's|CAMLreturn0|return 0|' \ - ${WRKSRC}/pycaml/pycaml_ml.c - @${REINPLACE_CMD} 's|shell python|shell ${PYTHON_CMD}|' \ - ${WRKSRC}/pycaml/Makefile - .include Index: distinfo =================================================================== diff --git a/head/devel/coccinelle/distinfo b/head/devel/coccinelle/distinfo --- a/head/devel/coccinelle/distinfo (revision 335091) +++ b/head/devel/coccinelle/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (coccinelle-0.2.4rc5.tgz) = bfb4baad0a45bf187a38bccc32b1cc719c6c6ab7696f3f5c174b4d84eb1c58b8 -SIZE (coccinelle-0.2.4rc5.tgz) = 2273461 +SHA256 (coccinelle-1.0.0-rc18.tgz) = e5e66b28f7e91226bef00a3795d4f300bdaca1d381a2384b5d855f60cf595c1f +SIZE (coccinelle-1.0.0-rc18.tgz) = 3120697 Index: files/patch-configure =================================================================== diff --git a/head/devel/coccinelle/files/patch-configure b/head/devel/coccinelle/files/patch-configure deleted file mode 10644 --- a/head/devel/coccinelle/files/patch-configure (revision 335091) +++ /dev/null (working copy) @@ -1,47 +0,0 @@ ---- configure 2010-07-03 01:08:25.000000000 +0300 -+++ configure 2010-09-09 13:28:04.692352989 +0300 -@@ -176,6 +176,6 @@ - pr2 ""; - - $error += check_config( -- "make -v 2>&1 |grep Make|", -+ "gmake -v 2>&1 |grep Make|", - "GNU Make [^0-9]*3\.[0-9]+.*", #version 3.79.1, 3.81 - "make (gnu version) is present.", -@@ -255,17 +255,17 @@ - All seems fine for $project. - - To compile $project type: -- \$ make depend -- \$ make all -+ \$ gmake depend -+ \$ gmake all - - Or alternatively, for the optimized version: -- \$ make all.opt -+ \$ gmake all.opt - If you want both, you could use: -- \$ make world -+ \$ gmake world - - - To install type: -- \$ make install -+ \$ gmake install - - Then, to test $project simply type: - \$ $projectcmdline -@@ -331,11 +331,11 @@ - my $pythonprefix = $python ? "yes" : "no"; - pr2 "Support for python scripting : $pythonprefix"; - `cd python; ln -sf ${pythonprefix}_pycocci.ml pycocci.ml; `; --`cd python; make depend`; -+`cd python; gmake depend`; - - pr2 "Support for ocaml scripting : $ocamlprefix"; - `cd ocaml; ln -sf ${ocamlprefix}_prepare_ocamlcocci.ml prepare_ocamlcocci.ml;`; --`cd ocaml; make depend`; -+`cd ocaml; gmake depend`; - - pr2 "Modifying globals/config.ml"; - my $command = "perl -p -e 's#Not_found.\*#Not_found->\\\"$src\\\"#' globals/config.ml.in > globals/config.ml"; Index: files/patch-pycaml-Makefile =================================================================== diff --git a/head/devel/coccinelle/files/patch-pycaml-Makefile b/head/devel/coccinelle/files/patch-pycaml-Makefile deleted file mode 10644 --- a/head/devel/coccinelle/files/patch-pycaml-Makefile (revision 335091) +++ /dev/null (working copy) @@ -1,11 +0,0 @@ ---- pycaml/Makefile.orig 2009-04-06 12:59:15.000000000 +0200 -+++ pycaml/Makefile 2009-04-06 12:59:20.000000000 +0200 -@@ -3,7 +3,7 @@ - OCAMLMAKEFILE = OCamlMakefile - PY_PREFIX = $(shell python getprefix.py) - PY_VERSION = $(shell python getversion.py) --CLIBS = python$(PY_VERSION) pthread dl util m c -+CLIBS = python$(PY_VERSION) pthread util m c - - SOURCES = pycaml.ml pycaml_ml.c - RESULT = pycaml Index: pkg-plist =================================================================== diff --git a/head/devel/coccinelle/pkg-plist b/head/devel/coccinelle/pkg-plist --- a/head/devel/coccinelle/pkg-plist (revision 335091) +++ b/head/devel/coccinelle/pkg-plist (working copy) @@ -1,76 +1,31 @@ bin/spatch -lib/dllpycaml_stubs.so -share/coccinelle/commons/common.cmi -share/coccinelle/commons/common_extra.cmi -share/coccinelle/commons/glimpse.cmi -share/coccinelle/commons/interfaces.cmi -share/coccinelle/commons/oarray.cmi -share/coccinelle/commons/oassoc.cmi -share/coccinelle/commons/objet.cmi -share/coccinelle/commons/ocollection.cmi -share/coccinelle/commons/ofullcommon.cmi -share/coccinelle/commons/ograph.cmi -share/coccinelle/commons/ograph_extended.cmi -share/coccinelle/commons/ograph_simple.cmi -share/coccinelle/commons/osequence.cmi -share/coccinelle/commons/oset.cmi -share/coccinelle/commons/parser_combinators.cmi -share/coccinelle/commons/seti.cmi -share/coccinelle/commons/sexp_common.cmi -share/coccinelle/ocaml/coccilib.cmi -share/coccinelle/parsing_c/ast_c.cmi -share/coccinelle/parsing_c/comment_annotater_c.cmi -share/coccinelle/parsing_c/compare_c.cmi -share/coccinelle/parsing_c/control_flow_c.cmi -share/coccinelle/parsing_c/control_flow_c_build.cmi -share/coccinelle/parsing_c/cpp_analysis_c.cmi -share/coccinelle/parsing_c/cpp_ast_c.cmi -share/coccinelle/parsing_c/cpp_token_c.cmi -share/coccinelle/parsing_c/flag_parsing_c.cmi -share/coccinelle/parsing_c/lexer_c.cmi -share/coccinelle/parsing_c/lexer_parser.cmi -share/coccinelle/parsing_c/lib_parsing_c.cmi -share/coccinelle/parsing_c/parse_c.cmi -share/coccinelle/parsing_c/parser_c.cmi -share/coccinelle/parsing_c/parsing_consistency_c.cmi -share/coccinelle/parsing_c/parsing_hacks.cmi -share/coccinelle/parsing_c/parsing_recovery_c.cmi -share/coccinelle/parsing_c/parsing_stat.cmi -share/coccinelle/parsing_c/pretty_print_c.cmi -share/coccinelle/parsing_c/semantic_c.cmi -share/coccinelle/parsing_c/sexp_ast_c.cmi -share/coccinelle/parsing_c/test_parsing_c.cmi -share/coccinelle/parsing_c/token_c.cmi -share/coccinelle/parsing_c/token_helpers.cmi -share/coccinelle/parsing_c/token_views_c.cmi -share/coccinelle/parsing_c/type_annoter_c.cmi -share/coccinelle/parsing_c/type_c.cmi -share/coccinelle/parsing_c/unparse_c.cmi -share/coccinelle/parsing_c/unparse_cocci.cmi -share/coccinelle/parsing_c/unparse_hrule.cmi -share/coccinelle/parsing_c/visitor_c.cmi -share/coccinelle/python/coccilib/__init__.py -share/coccinelle/python/coccilib/coccigui/__init__.py -share/coccinelle/python/coccilib/coccigui/coccigui.py -share/coccinelle/python/coccilib/coccigui/pycoccimodel.py -share/coccinelle/python/coccilib/coccigui/pygui.glade -share/coccinelle/python/coccilib/coccigui/pygui.gladep -share/coccinelle/python/coccilib/coccigui/vim.py -share/coccinelle/python/coccilib/coccigui/vimcom.py -share/coccinelle/python/coccilib/coccigui/vimeditor.py -share/coccinelle/python/coccilib/coccigui/vimembed.py -share/coccinelle/python/coccilib/elems.py -share/coccinelle/python/coccilib/org.py -share/coccinelle/python/coccilib/output.py -share/coccinelle/python/coccilib/report.py -share/coccinelle/python/coccilib/trac.py -share/coccinelle/spatch -share/coccinelle/standard.h -share/coccinelle/standard.iso -@dirrm share/coccinelle/python/coccilib/coccigui -@dirrm share/coccinelle/python/coccilib -@dirrm share/coccinelle/python -@dirrm share/coccinelle/parsing_c -@dirrm share/coccinelle/ocaml -@dirrm share/coccinelle/commons -@dirrm share/coccinelle +bin/spatch.byte +man/man1/spatch.1.gz +man/man3/Coccilib.3cocci.gz +%%DATADIR%%/dllpcre_stubs.so +%%DATADIR%%/dllpycaml_stubs.so +%%DATADIR%%/ocaml/coccilib.cmi +%%DATADIR%%/python/coccilib/__init__.py +%%DATADIR%%/python/coccilib/coccigui/__init__.py +%%DATADIR%%/python/coccilib/coccigui/coccigui.py +%%DATADIR%%/python/coccilib/coccigui/pycoccimodel.py +%%DATADIR%%/python/coccilib/coccigui/pygui.glade +%%DATADIR%%/python/coccilib/coccigui/pygui.gladep +%%DATADIR%%/python/coccilib/coccigui/vim.py +%%DATADIR%%/python/coccilib/coccigui/vimcom.py +%%DATADIR%%/python/coccilib/coccigui/vimeditor.py +%%DATADIR%%/python/coccilib/coccigui/vimembed.py +%%DATADIR%%/python/coccilib/elems.py +%%DATADIR%%/python/coccilib/org.py +%%DATADIR%%/python/coccilib/output.py +%%DATADIR%%/python/coccilib/report.py +%%DATADIR%%/python/coccilib/trac.py +%%DATADIR%%/python/coccilib/xml_firehose.py +%%DATADIR%%/spatch +%%DATADIR%%/standard.h +%%DATADIR%%/standard.iso +@dirrm %%DATADIR%%/python/coccilib/coccigui +@dirrm %%DATADIR%%/python/coccilib +@dirrm %%DATADIR%%/python +@dirrm %%DATADIR%%/ocaml +@dirrm %%DATADIR%%