On Mon, Jul 06, 2020 at 12:00:15AM +0200, Klemens Nanni wrote:
On Sun, Jul 05, 2020 at 11:08:07PM +0200, Christopher Zimmermann wrote:
turns out the first diff broke bytecode only builds. The attached diff fixes
that. OK?
Builds fine (very verbose) but "make fake" fails with
gmake[3]: *** No rule to make target 'stdcompat__pervasives.cmt',
needed by 'all-am'. Stop.
Is this with the first or second diff? On which arch?
If it is with the second diff could you please share the complete build
log, because I cannot reproduce this error.
Can you resend the fixed diff to the list?
Sure. Attached the second diff, which works for me on amd64 and amd64
without ocamlopt (bytecode only).
Christopher
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/coccinelle/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 9 Jun 2020 17:34:13 -0000 1.41
+++ Makefile 5 Jul 2020 21:08:50 -0000
@@ -7,23 +7,23 @@ COMMENT = program matching and transform
# if updating, check for any additional use of diff/grep which
# may need to be switched to gdiff/ggrep
-DISTNAME = coccinelle-1.0.6
-REVISION = 2
-EXTRACT_SUFX = .tgz
CATEGORIES = devel
+GH_ACCOUNT = coccinelle
+GH_PROJECT = coccinelle
+GH_TAGNAME = 1.0.8
+
HOMEPAGE = http://coccinelle.lip6.fr/
# GPLv2 only
PERMIT_PACKAGE = Yes
-WANTLIB += c curses m pthread pcre ${MODPY_WANTLIB}
-
-MASTER_SITES = ${HOMEPAGE}distrib/
+WANTLIB += c m pcre pthread ${MODPY_WANTLIB}
MODULES = lang/ocaml \
lang/python
+MODPY_RUNDEP = yes
BUILD_DEPENDS = ${RUN_DEPENDS} \
print/texlive/base \
@@ -40,7 +40,9 @@ RUN_DEPENDS = devel/ocaml-parmap \
# asks questions at the end if it does better than expected
TEST_IS_INTERACTIVE = Yes
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = gnu autoreconf
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.16
CONFIGURE_ENV = MAKE_PROGRAM=${MAKE_PROGRAM}
# The PKG_CHECK_MODULES autoconf macro doesn't have a way to use .private
CONFIGURE_ENV += PYTHON_LIBS="`pkg-config --static --libs python`" \
@@ -57,7 +59,7 @@ CONFIGURE_ARGS += --disable-opt
USE_GMAKE = Yes
PORTHOME = ${WRKDIR}
-ALL_TARGET = all-release
+ALL_TARGET = all ocaml/coccilib.cmo docs
TEST_TARGET = test
TEST_DEPENDS = ${FULLPKGPATH}
@@ -71,13 +73,16 @@ post-build:
${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle html
post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/pycocci ${PREFIX}/bin/pycocci
+ sed -i -e "1s|.*|#!${MODPY_BIN}|" ${PREFIX}/bin/pycocci
+ mv ${PREFIX}/man/man3/Coccilib.3cocci ${PREFIX}/man/man3/Coccilib.3
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/coccinelle/python/coccilib
mv ${PREFIX}/lib/coccinelle/*.so \
${PREFIX}/lib/ocaml/stublibs/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinelle
${INSTALL_DATA} \
- ${WRKSRC}/docs/manual/*.{html,css,gif} \
+ ${WRKSRC}/docs/manual/*.{html,css,svg} \
${PREFIX}/share/doc/coccinelle/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/coccinelle/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 4 Mar 2019 12:51:12 -0000 1.13
+++ distinfo 5 Jul 2020 21:08:50 -0000
@@ -1,2 +1,2 @@
-SHA256 (coccinelle-1.0.6.tgz) = hFLtJlwgna6Zy7M7Z7x5Eucvi8oeJPM/Goi6PXmF6Qk=
-SIZE (coccinelle-1.0.6.tgz) = 6684278
+SHA256 (coccinelle-1.0.8.tar.gz) = n5lL+YvIjDM6x6VKA9T6GCYSLuxwFqHyLGsu8qakNH8=
+SIZE (coccinelle-1.0.8.tar.gz) = 2670961
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/devel/coccinelle/patches/patch-Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile
--- patches/patch-Makefile 4 Mar 2019 12:51:12 -0000 1.11
+++ patches/patch-Makefile 5 Jul 2020 21:08:50 -0000
@@ -1,38 +1,18 @@
-$OpenBSD: patch-Makefile,v 1.11 2019/03/04 12:51:12 chrisz Exp $
-
-Some future version of coccinelle will hopefully configure for unbundled num
-or use Zarith instead.
+$OpenBSD$
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -71,7 +71,7 @@ INCLUDEDIRSDEP=commons commons/ocamlextra \
- parsing_cocci parsing_c ocaml python engine popl09 extra \
- $(MAKELIBS)
-
--INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS)
-+INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS) +num
-
- ##############################################################################
- # Generic variables
-@@ -347,7 +347,7 @@ install-man:
- $(INSTALL_DATA) docs/spatch.1 $(DESTDIR)$(MANDIR)/man1/
- $(INSTALL_DATA) docs/pycocci.1 $(DESTDIR)$(MANDIR)/man1/
- $(INSTALL_DATA) docs/spgen.1 $(DESTDIR)$(MANDIR)/man1/
-- $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
-+ $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
-
- install-bash:
- @$(ECHO) "Installing bash completion in: ${DESTDIR}${BASH_COMPLETION_DIR}"
-@@ -378,9 +378,9 @@ install-python:
- install-stubs:
- $(MKDIR_P) $(DESTDIR)$(LIBDIR)
- @if test -f ./bundles/pyml/dllpyml_stubs.so; then \
-- cp -fv ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
-+ cp -f ./bundles/pyml/dllpyml_stubs.so $(DESTDIR)$(LIBDIR); fi
- @if test -f ./bundles/pcre/dllpcre_stubs.so; then \
-- cp -fv ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(LIBDIR); fi
-+ cp -f ./bundles/pcre/dllpcre_stubs.so $(DESTDIR)$(LIBDIR); fi
+@@ -308,8 +308,10 @@ install-spatch : spatch$(TOOLS_SUFFIX)
+ $(INSTALL_PROGRAM) spatch$(TOOLS_SUFFIX) $(DESTDIR)$(BINDIR)/spatch
+ $(INSTALL_DATA) standard.h $(DESTDIR)$(LIBDIR)
+ $(INSTALL_DATA) standard.iso $(DESTDIR)$(LIBDIR)
+- $(INSTALL_DATA) ocaml/*.cmi $(DESTDIR)$(LIBDIR)/ocaml/
+- $(INSTALL_DATA) ocaml/*.cmx $(DESTDIR)$(LIBDIR)/ocaml/
++ $(INSTALL_DATA) $(COMPILED_EXPOSED_MODULES) $(DESTDIR)$(LIBDIR)/ocaml/
++ $(INSTALL_DATA) \
++ $(foreach EXT,cmi $(ALL_OBJECTS),ocaml/coccilib.$(EXT)) \
++ $(DESTDIR)$(LIBDIR)/ocaml/
- install: install-common install-man install-stubs $(PYTHON_INSTALL_TARGET)
- rm -f $(DESTDIR)$(LIBDIR)/spatch
+ .PHONY : install-man
+ install-man :
Index: patches/patch-bundles_pyml_Makefile
===================================================================
RCS file: /cvs/ports/devel/coccinelle/patches/patch-bundles_pyml_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bundles_pyml_Makefile
--- patches/patch-bundles_pyml_Makefile 4 Mar 2019 12:51:12 -0000 1.1
+++ patches/patch-bundles_pyml_Makefile 5 Jul 2020 21:08:50 -0000
@@ -1,27 +1,29 @@
-$OpenBSD: patch-bundles_pyml_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-
-our builtin test/[ doesn't support the < comparator.
+$OpenBSD$
Index: bundles/pyml/Makefile
--- bundles/pyml/Makefile.orig
+++ bundles/pyml/Makefile
-@@ -14,7 +14,7 @@ LIBRARY=pyml
- SRC_DIR=$(PACKAGE_DIR)
-
- PYML_COMPAT=$(shell \
-- if [ "$(OCAMLVERSION)" "<" 4.03.0 ]; then \
-+ if /bin/\[ "$(OCAMLVERSION)" "<" 4.03.0 ]; then \
- echo pyml_compat312.ml; \
- else \
- echo pyml_compat403.ml; \
-@@ -52,8 +52,8 @@ $(SRC_DIR)/pyml_compat.cmx: $(SRC_DIR)/pyml_compat.ml
- $(SRC_DIR)/pyml_compat.cmo: $(SRC_DIR)/pyml_compat.ml $(SRC_DIR)/pyml_compat.cmi
- $(OCAMLC_CMD) -c $< -o $@
+@@ -25,13 +25,19 @@ GENERATED_SOURCE_FILES := $(SRC_DIR)/pywrappers.ml $(S
+ ARCH:=$(shell uname)
--$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmx $(SRC_DIR)/generate.cmx
-- $(OCAMLOPT) $^ -o $@
-+$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmo $(SRC_DIR)/generate.cmo
-+ $(OCAMLC_CMD) $^ -o $@
+ ifeq ($(ARCH),Linux)
+- PYML_ARCH=pyml_arch_linux.ml
++ PYML_ARCH=pyml_arch_linux.ml
+ else ifeq ($(ARCH),Darwin)
+- PYML_ARCH=pyml_arch_darwin.ml
++ PYML_ARCH=pyml_arch_darwin.ml
+ else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN)
+- PYML_ARCH=pyml_arch_cygwin.ml
++ PYML_ARCH=pyml_arch_cygwin.ml
++else ifeq ($(ARCH),OpenBSD)
++ PYML_ARCH=pyml_arch_linux.ml
++else ifeq ($(ARCH),NetBSD)
++ PYML_ARCH=pyml_arch_linux.ml
++else ifeq ($(ARCH),FreeBSD)
++ PYML_ARCH=pyml_arch_linux.ml
+ else
+- $(error Unsupported OS $(ARCH)
++ $(error Unsupported OS $(ARCH))
+ endif
- $(SRC_DIR)/generate.cmx: $(SRC_DIR)/generate.ml $(SRC_DIR)/pyml_compat.cmx
- $(OCAMLOPT_CMD) -c $< -o $@
+ include ../Makefile.bundles
Index: patches/patch-bundles_stdcompat_Makefile
===================================================================
RCS file: patches/patch-bundles_stdcompat_Makefile
diff -N patches/patch-bundles_stdcompat_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bundles_stdcompat_Makefile 5 Jul 2020 21:08:50 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: bundles/stdcompat/Makefile
+--- bundles/stdcompat/Makefile.orig
++++ bundles/stdcompat/Makefile
+@@ -1,6 +1,6 @@
+ .PHONY : all
+ all :
+- cd stdcompat-current; make && cp *.mli *.cmi *.cmx *.cma *.cmxa *.a ..
++ cd stdcompat-current; $(MAKE) && cp *.mli *.cmi *.cmx *.cma *.cmxa *.a ..
+
+ .PHONY : clean
+ clean :
Index: patches/patch-bundles_stdcompat_stdcompat-current_configure_ac
===================================================================
RCS file: patches/patch-bundles_stdcompat_stdcompat-current_configure_ac
diff -N patches/patch-bundles_stdcompat_stdcompat-current_configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bundles_stdcompat_stdcompat-current_configure_ac 5 Jul 2020 21:08:50 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+The existence of ocamlfind does not imply the existence of ocamlopt
+
+Index: bundles/stdcompat/stdcompat-current/configure.ac
+--- bundles/stdcompat/stdcompat-current/configure.ac.orig
++++ bundles/stdcompat/stdcompat-current/configure.ac
+@@ -31,7 +31,8 @@ AS_IF([test "x$OCAMLFIND" = "x"],
+ AC_SUBST([SEQ_PKG], [])
+ AC_SUBST([UCHAR_PKG], [])],
+ [AC_SUBST([OCAMLC], [["$OCAMLFIND ocamlc"]])
+- AC_SUBST([OCAMLOPT], [["$OCAMLFIND ocamlopt"]])
++ AS_IF([$OCAMLFIND ocamlopt],
++ AC_SUBST([OCAMLOPT], [["$OCAMLFIND ocamlopt"]]))
+ AC_SUBST([OCAMLDOC], [["$OCAMLFIND ocamldoc"]])
+ AC_SUBST([OCAMLDEP], [["$OCAMLFIND ocamldep"]])
+ AC_SUBST([OCAMLMKLIB], [["$OCAMLFIND ocamlmklib"]])
Index: patches/patch-cocci_ml
===================================================================
RCS file: /cvs/ports/devel/coccinelle/patches/patch-cocci_ml,v
retrieving revision 1.8
diff -u -p -r1.8 patch-cocci_ml
--- patches/patch-cocci_ml 4 Mar 2019 12:51:12 -0000 1.8
+++ patches/patch-cocci_ml 5 Jul 2020 21:08:50 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-cocci_ml,v 1.8 2019/03/0
Index: cocci.ml
--- cocci.ml.orig
+++ cocci.ml
-@@ -249,8 +249,8 @@ let show_or_not_diff2 cfile outfile =
+@@ -250,8 +250,8 @@ let show_or_not_diff2 cfile outfile =
let line =
match !Flag_parsing_c.diff_lines with
@@ -13,16 +13,16 @@ Index: cocci.ml
let res = Common.cmd_to_list line in
(match res with
[] -> ()
-@@ -528,7 +528,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
+@@ -531,7 +531,7 @@ let worth_trying2 cfiles (tokens,_,query,_) =
) in
let com =
- Printf.sprintf "egrep -q '(%s)' %s"
+ Printf.sprintf "gegrep -q '(%s)' %s"
- (String.concat "|" tokens) (String.concat " " cfiles) in
+ (String.concat "|" tokens)
+ (String.concat " " (List.map fst cfiles)) in
(match Sys.command com with
- | 0 (* success *) -> true
-@@ -2222,7 +2222,7 @@ let check_duplicate_modif2 xs =
+@@ -2357,7 +2357,7 @@ let check_duplicate_modif2 xs =
match res2 with
| None -> false
| Some res2 ->
Index: patches/patch-commons_common_ml
===================================================================
RCS file: /cvs/ports/devel/coccinelle/patches/patch-commons_common_ml,v
retrieving revision 1.7
diff -u -p -r1.7 patch-commons_common_ml
--- patches/patch-commons_common_ml 4 Mar 2019 12:51:12 -0000 1.7
+++ patches/patch-commons_common_ml 5 Jul 2020 21:08:50 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-commons_common_ml,v 1.7
Index: commons/common.ml
--- commons/common.ml.orig
+++ commons/common.ml
-@@ -3281,7 +3281,7 @@ let glob pattern =
+@@ -3308,7 +3308,7 @@ let glob pattern =
let files_of_dir_or_files ext xs =
xs +> List.map (fun x ->
if is_directory x
@@ -11,7 +11,7 @@ Index: commons/common.ml
else [x]
) +> List.concat
-@@ -3291,7 +3291,7 @@ let files_of_dir_or_files_no_vcs ext xs =
+@@ -3318,7 +3318,7 @@ let files_of_dir_or_files_no_vcs ext xs =
if is_directory x
then
cmd_to_list
@@ -20,7 +20,7 @@ Index: commons/common.ml
"| grep -v /.hg/ |grep -v /CVS/ | grep -v /.git/ |grep -v /_darcs/"
)
else [x]
-@@ -3304,7 +3304,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex xs
+@@ -3331,7 +3331,7 @@ let files_of_dir_or_files_no_vcs_post_filter regex xs
then
cmd_to_list
("find " ^ x ^
@@ -29,7 +29,7 @@ Index: commons/common.ml
)
+> List.filter (fun s -> s =~ regex)
else [x]
-@@ -5256,7 +5256,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
+@@ -5304,7 +5304,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
write_file file1 (unwords xs);
write_file file2 (unwords ys);
command2
@@ -38,7 +38,7 @@ Index: commons/common.ml
let res = cat fileresult in
let a = ref 0 in
let b = ref 0 in
-@@ -5284,7 +5284,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
+@@ -5332,7 +5332,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
write_file "/tmp/diff1" xstr;
write_file "/tmp/diff2" ystr;
command2
@@ -47,13 +47,3 @@ Index: commons/common.ml
"/tmp/diff1 /tmp/diff2 > /tmp/diffresult");
let res = cat "/tmp/diffresult" in
let a = ref 0 in
-@@ -5308,7 +5308,8 @@ let parserCommon lexbuf parserer lexer =
- let result = parserer lexer lexbuf in
- result
- with Parsing.Parse_error ->
-- print_string "buf: "; print_string lexbuf.Lexing.lex_buffer;
-+ print_string "buf: ";
-+ print_string (Bytes.to_string lexbuf.Lexing.lex_buffer);
- print_string "\n";
- print_string "current: "; print_int lexbuf.Lexing.lex_curr_pos;
- print_string "\n";
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 4 Mar 2019 12:51:12 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-configure,v 1.6 2019/03/04 12:51:12 chrisz Exp $
-
-This does not set a default options as suggested in configure.ac,
-but overrides the user-provided setting.
-
-Index: configure
---- configure.orig
-+++ configure
-@@ -14416,7 +14416,6 @@ fi
-
- fi
-
--enable_opt="yes"
-
-
- if test "x$enable_opt" = xyes; then :
Index: patches/patch-parsing_c_Makefile
===================================================================
RCS file: patches/patch-parsing_c_Makefile
diff -N patches/patch-parsing_c_Makefile
--- patches/patch-parsing_c_Makefile 4 Mar 2019 12:51:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-parsing_c_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-
-Some future version of coccinelle will hopefully configure for unbundled num
-or use Zarith instead.
-
-Index: parsing_c/Makefile
---- parsing_c/Makefile.orig
-+++ parsing_c/Makefile
-@@ -42,9 +42,9 @@ LIBS=../commons/commons.cma ../globals/globals.cma \
- INCLUDESDEP= -I ../commons -I ../commons/ocamlextra \
- -I ../globals -I ../parsing_cocci
-
--INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE)
-+INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE) -I +num
-
--SYSLIBS= str.cma unix.cma num.cma
-+SYSLIBS= str.cma unix.cma nums.cma
-
- ##############################################################################
- # Generic variables
Index: patches/patch-parsing_c_compare_c_ml
===================================================================
RCS file: /cvs/ports/devel/coccinelle/patches/patch-parsing_c_compare_c_ml,v
retrieving revision 1.2
diff -u -p -r1.2 patch-parsing_c_compare_c_ml
--- patches/patch-parsing_c_compare_c_ml 13 Sep 2015 15:21:15 -0000 1.2
+++ patches/patch-parsing_c_compare_c_ml 5 Jul 2020 21:08:50 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-parsing_c_compare_c_ml,v 1.2 2015/09/13 15:21:15 sthen Exp $
---- parsing_c/compare_c.ml.orig Sat Apr 18 14:37:23 2015
-+++ parsing_c/compare_c.ml Sat Apr 25 10:42:50 2015
-@@ -204,9 +204,9 @@ let is_normal_space_or_comment to_expected = function
+Index: parsing_c/compare_c.ml
+--- parsing_c/compare_c.ml.orig
++++ parsing_c/compare_c.ml
+@@ -211,9 +211,9 @@ let is_normal_space_or_comment to_expected = function
let get_diff filename1 filename2 bs =
let com =
match !Flag_parsing_c.diff_lines with
Index: patches/patch-parsing_c_test_parsing_c_ml
===================================================================
RCS file: patches/patch-parsing_c_test_parsing_c_ml
diff -N patches/patch-parsing_c_test_parsing_c_ml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-parsing_c_test_parsing_c_ml 5 Jul 2020 21:08:50 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: parsing_c/test_parsing_c.ml
+--- parsing_c/test_parsing_c.ml.orig
++++ parsing_c/test_parsing_c.ml
+@@ -306,7 +306,7 @@ let test_parse_unparse infile =
+ Unparse_c.pp_program program2_with_ppmethod tmpfile;
+ Common.command2 ("cat " ^ tmpfile);
+ (* if want see diff of space => no -b -B *)
+- Common.command2 (spf "diff -u -p %s %s" infile tmpfile);
++ Common.command2 (spf "gdiff -u -p %s %s" infile tmpfile);
+ (* +> Transformation.test_simple_trans1;*)
+ ()
+
Index: patches/patch-parsing_c_unparse_c_ml
===================================================================
RCS file: patches/patch-parsing_c_unparse_c_ml
diff -N patches/patch-parsing_c_unparse_c_ml
--- patches/patch-parsing_c_unparse_c_ml 4 Mar 2019 12:51:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-parsing_c_unparse_c_ml,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-
-just two simple occurences of string modification. Great!
-
-Index: parsing_c/unparse_c.ml
---- parsing_c/unparse_c.ml.orig
-+++ parsing_c/unparse_c.ml
-@@ -2362,11 +2362,11 @@ let start_mark = function
- *)
- module String = struct
- let init n f =
-- let s = String.make n ' ' in
-+ let s = Bytes.make n ' ' in
- for i = 0 to n - 1 do
- s.[i] <- f i
- done;
-- s
-+ Bytes.unsafe_to_string s
-
- let map f s =
- init (String.length s) (fun i -> f s.[i])
Index: patches/patch-tools_spgen_source_Makefile
===================================================================
RCS file: patches/patch-tools_spgen_source_Makefile
diff -N patches/patch-tools_spgen_source_Makefile
--- patches/patch-tools_spgen_source_Makefile 4 Mar 2019 12:51:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-tools_spgen_source_Makefile,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-
-Some future version of coccinelle will hopefully configure for unbundled num
-or use Zarith instead.
-
-Index: tools/spgen/source/Makefile
---- tools/spgen/source/Makefile.orig
-+++ tools/spgen/source/Makefile
-@@ -39,7 +39,7 @@ LIBS_OPT = $(LIBS:=.cmxa)
-
- INCLUDEDIRS= $(COCCIDIR)/commons $(COCCIDIR)/commons/ocamlextra \
- $(COCCIDIR)/globals $(COCCIDIR)/parsing_cocci $(COCCIDIR)/parsing_c \
-- $(PCREDIR)
-+ $(PCREDIR) +num
-
- INCLUDES=$(INCLUDEDIRS:%=-I %)
-
Index: pkg/PFRAG.dynlink
===================================================================
RCS file: pkg/PFRAG.dynlink
diff -N pkg/PFRAG.dynlink
--- pkg/PFRAG.dynlink 13 Sep 2015 15:21:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.dynlink,v 1.2 2015/09/13 15:21:15 sthen Exp $
-bin/spatch.opt
-@bin lib/coccinelle/spatch.opt
Index: pkg/PFRAG.dynlink-native
===================================================================
RCS file: pkg/PFRAG.dynlink-native
diff -N pkg/PFRAG.dynlink-native
--- pkg/PFRAG.dynlink-native 4 Mar 2019 12:51:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.dynlink-native,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-bin/spatch.opt
-@bin lib/coccinelle/spatch.opt
Index: pkg/PFRAG.native
===================================================================
RCS file: /cvs/ports/devel/coccinelle/pkg/PFRAG.native,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.native
--- pkg/PFRAG.native 4 Mar 2019 12:51:12 -0000 1.3
+++ pkg/PFRAG.native 5 Jul 2020 21:08:50 -0000
@@ -1,4 +1,20 @@
@comment $OpenBSD: PFRAG.native,v 1.3 2019/03/04 12:51:12 chrisz Exp $
-%%dynlink%%
-@bin lib/coccinelle/spgen/spgen.opt
-lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
+lib/coccinelle/ocaml/ast0_cocci.cmx
+lib/coccinelle/ocaml/ast_c.cmx
+lib/coccinelle/ocaml/ast_cocci.cmx
+lib/coccinelle/ocaml/coccilib.cmx
+lib/coccinelle/ocaml/commands.cmx
+lib/coccinelle/ocaml/common.cmx
+lib/coccinelle/ocaml/config.cmx
+lib/coccinelle/ocaml/dumper.cmx
+lib/coccinelle/ocaml/flag.cmx
+lib/coccinelle/ocaml/flag_parsing_c.cmx
+lib/coccinelle/ocaml/iteration.cmx
+lib/coccinelle/ocaml/lexer_c.cmx
+lib/coccinelle/ocaml/lib_parsing_c.cmx
+lib/coccinelle/ocaml/parse_c.cmx
+lib/coccinelle/ocaml/parser_c.cmx
+lib/coccinelle/ocaml/pretty_print_c.cmx
+lib/coccinelle/ocaml/regexp.cmx
+lib/coccinelle/ocaml/token_c.cmx
+lib/coccinelle/ocaml/visitor_c.cmx
Index: pkg/PFRAG.no-native
===================================================================
RCS file: pkg/PFRAG.no-native
diff -N pkg/PFRAG.no-native
--- pkg/PFRAG.no-native 4 Mar 2019 12:51:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-native,v 1.1 2019/03/04 12:51:12 chrisz Exp $
-lib/coccinelle/ocaml/no_prepare_ocamlcocci.cmi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/coccinelle/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 4 Mar 2019 12:51:12 -0000 1.13
+++ pkg/PLIST 5 Jul 2020 21:08:50 -0000
@@ -1,30 +1,48 @@
@comment $OpenBSD: PLIST,v 1.13 2019/03/04 12:51:12 chrisz Exp $
%%native%%
bin/pycocci
-bin/spatch
-bin/spgen
+@bin bin/spatch
+@bin bin/spgen
lib/coccinelle/
lib/coccinelle/ocaml/
lib/coccinelle/ocaml/ast0_cocci.cmi
+lib/coccinelle/ocaml/ast0_cocci.cmo
lib/coccinelle/ocaml/ast_c.cmi
+lib/coccinelle/ocaml/ast_c.cmo
lib/coccinelle/ocaml/ast_cocci.cmi
+lib/coccinelle/ocaml/ast_cocci.cmo
lib/coccinelle/ocaml/coccilib.cmi
+lib/coccinelle/ocaml/coccilib.cmo
+lib/coccinelle/ocaml/commands.cmi
+lib/coccinelle/ocaml/commands.cmo
lib/coccinelle/ocaml/common.cmi
+lib/coccinelle/ocaml/common.cmo
lib/coccinelle/ocaml/config.cmi
-lib/coccinelle/ocaml/exposed_modules.cmi
-lib/coccinelle/ocaml/externalanalysis.cmi
+lib/coccinelle/ocaml/config.cmo
+lib/coccinelle/ocaml/dumper.cmi
+lib/coccinelle/ocaml/dumper.cmo
lib/coccinelle/ocaml/flag.cmi
+lib/coccinelle/ocaml/flag.cmo
+lib/coccinelle/ocaml/flag_parsing_c.cmi
+lib/coccinelle/ocaml/flag_parsing_c.cmo
lib/coccinelle/ocaml/iteration.cmi
+lib/coccinelle/ocaml/iteration.cmo
lib/coccinelle/ocaml/lexer_c.cmi
+lib/coccinelle/ocaml/lexer_c.cmo
lib/coccinelle/ocaml/lib_parsing_c.cmi
-lib/coccinelle/ocaml/ocamlcocci_aux.cmi
+lib/coccinelle/ocaml/lib_parsing_c.cmo
lib/coccinelle/ocaml/parse_c.cmi
+lib/coccinelle/ocaml/parse_c.cmo
lib/coccinelle/ocaml/parser_c.cmi
-lib/coccinelle/ocaml/prepare_ocamlcocci.cmi
+lib/coccinelle/ocaml/parser_c.cmo
lib/coccinelle/ocaml/pretty_print_c.cmi
+lib/coccinelle/ocaml/pretty_print_c.cmo
lib/coccinelle/ocaml/regexp.cmi
-lib/coccinelle/ocaml/run_ocamlcocci.cmi
+lib/coccinelle/ocaml/regexp.cmo
+lib/coccinelle/ocaml/token_c.cmi
+lib/coccinelle/ocaml/token_c.cmo
lib/coccinelle/ocaml/visitor_c.cmi
+lib/coccinelle/ocaml/visitor_c.cmo
lib/coccinelle/python/
lib/coccinelle/python/coccilib/
lib/coccinelle/python/coccilib/__init__.py
@@ -45,17 +63,18 @@ lib/coccinelle/python/coccilib/output.py
lib/coccinelle/python/coccilib/report.py
lib/coccinelle/python/coccilib/trac.py
lib/coccinelle/python/coccilib/xml_firehose.py
-lib/coccinelle/spgen/
-@bin lib/coccinelle/spgen/spgen
lib/coccinelle/standard.h
lib/coccinelle/standard.iso
-lib/ocaml/stublibs/dllpyml_stubs.so
+@so lib/ocaml/stublibs/dllpyml_stubs.so
@man man/man1/pycocci.1
@man man/man1/spatch.1
@man man/man1/spgen.1
@man man/man3/Coccilib.3
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/spatch
share/doc/coccinelle/
-share/doc/coccinelle/contents_motif.gif
+share/doc/coccinelle/contents_motif.svg
share/doc/coccinelle/index.html
share/doc/coccinelle/main_grammar.css
share/doc/coccinelle/main_grammar.html
@@ -76,5 +95,5 @@ share/doc/coccinelle/main_grammar014.htm
share/doc/coccinelle/main_grammar015.html
share/doc/coccinelle/main_grammar016.html
share/doc/coccinelle/main_grammar017.html
-share/doc/coccinelle/next_motif.gif
-share/doc/coccinelle/previous_motif.gif
+share/doc/coccinelle/next_motif.svg
+share/doc/coccinelle/previous_motif.svg
