Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Wed Jul 8 00:12:41 2020 +0200
Changeset: 1c4a34ef8c53ace7b218aa9f799b1075dabda795
Modified Files:
coccinelle/PLIST
coccinelle/TODO
coccinelle/distinfo
Added Files:
coccinelle/patches/patch-bundles_pyml_Makefile
Log Message:
coccinelle: Add support for *BSD
There is nothing specific to Linux in pyml_arch_linux.ml.
All related definitions should applies to any Unix-like systems
with which(1) and .so.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c4a34ef8c53ace7b218aa9f799b1075dabda795
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coccinelle/PLIST | 37 ++++++++++++++++++++++----
coccinelle/TODO | 13 ---------
coccinelle/distinfo | 1 +
coccinelle/patches/patch-bundles_pyml_Makefile | 15 +++++++++++
4 files changed, 48 insertions(+), 18 deletions(-)
diffs:
diff --git a/coccinelle/PLIST b/coccinelle/PLIST
index dd036ff061..33e37213cc 100644
--- a/coccinelle/PLIST
+++ b/coccinelle/PLIST
@@ -1,29 +1,58 @@
@comment $NetBSD$
-bin/pycocci
bin/spatch
-bin/spatch.opt
bin/spgen
lib/coccinelle/ocaml/ast0_cocci.cmi
+lib/coccinelle/ocaml/ast0_cocci.cmx
lib/coccinelle/ocaml/ast_c.cmi
+lib/coccinelle/ocaml/ast_c.cmx
lib/coccinelle/ocaml/ast_cocci.cmi
+lib/coccinelle/ocaml/ast_cocci.cmx
lib/coccinelle/ocaml/coccilib.cmi
+lib/coccinelle/ocaml/coccilib.cmx
+lib/coccinelle/ocaml/commands.cmi
+lib/coccinelle/ocaml/commands.cmx
lib/coccinelle/ocaml/common.cmi
+lib/coccinelle/ocaml/common.cmx
lib/coccinelle/ocaml/config.cmi
+lib/coccinelle/ocaml/config.cmx
+lib/coccinelle/ocaml/dumper.cmi
+lib/coccinelle/ocaml/dumper.cmx
lib/coccinelle/ocaml/exposed_modules.cmi
+lib/coccinelle/ocaml/exposed_modules.cmx
lib/coccinelle/ocaml/externalanalysis.cmi
+lib/coccinelle/ocaml/externalanalysis.cmx
lib/coccinelle/ocaml/flag.cmi
+lib/coccinelle/ocaml/flag.cmx
+lib/coccinelle/ocaml/flag_parsing_c.cmi
+lib/coccinelle/ocaml/flag_parsing_c.cmx
lib/coccinelle/ocaml/iteration.cmi
+lib/coccinelle/ocaml/iteration.cmx
lib/coccinelle/ocaml/lexer_c.cmi
+lib/coccinelle/ocaml/lexer_c.cmx
lib/coccinelle/ocaml/lib_parsing_c.cmi
+lib/coccinelle/ocaml/lib_parsing_c.cmx
lib/coccinelle/ocaml/ocamlcocci_aux.cmi
+lib/coccinelle/ocaml/ocamlcocci_aux.cmx
+lib/coccinelle/ocaml/parmap.cmi
+lib/coccinelle/ocaml/parmap.cmx
lib/coccinelle/ocaml/parse_c.cmi
+lib/coccinelle/ocaml/parse_c.cmx
lib/coccinelle/ocaml/parser_c.cmi
+lib/coccinelle/ocaml/parser_c.cmx
lib/coccinelle/ocaml/prepare_ocamlcocci.cmi
+lib/coccinelle/ocaml/prepare_ocamlcocci.cmx
lib/coccinelle/ocaml/pretty_print_c.cmi
+lib/coccinelle/ocaml/pretty_print_c.cmx
lib/coccinelle/ocaml/regexp.cmi
+lib/coccinelle/ocaml/regexp.cmx
lib/coccinelle/ocaml/run_ocamlcocci.cmi
+lib/coccinelle/ocaml/run_ocamlcocci.cmx
+lib/coccinelle/ocaml/token_c.cmi
+lib/coccinelle/ocaml/token_c.cmx
lib/coccinelle/ocaml/visitor_c.cmi
+lib/coccinelle/ocaml/visitor_c.cmx
lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
+lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmx
lib/coccinelle/python/coccilib/__init__.py
lib/coccinelle/python/coccilib/coccigui/__init__.py
lib/coccinelle/python/coccilib/coccigui/coccigui.py
@@ -41,12 +70,10 @@ 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/spatch.opt
-lib/coccinelle/spgen/spgen
-lib/coccinelle/spgen/spgen.opt
lib/coccinelle/standard.h
lib/coccinelle/standard.iso
man/man1/pycocci.1
man/man1/spatch.1
man/man1/spgen.1
man/man3/Coccilib.3
+share/bash-completion/completions/spatch
diff --git a/coccinelle/TODO b/coccinelle/TODO
index 28d87580f5..ed191503dc 100644
--- a/coccinelle/TODO
+++ b/coccinelle/TODO
@@ -1,19 +1,6 @@
Still not ready for using it to update devel/coccinelle. The following issues
should be investigated further and if possible fixed:
- - Build fails with:
-
- /usr/pkg/bin/gmake -C bundles/pyml all
- gmake[1]: Entering directory
- '/tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml'
- Makefile:34: *** recipe commences before first target. Stop.
- gmake[1]: Leaving directory
- '/tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml'
- gmake: *** [Makefile:480:
- /tmp/pkgsrc/wip/coccinelle/work/coccinelle-1.0.8/bundles/pyml/pyml.cmxa] Error 2
-
- -- leot (2020/07/07)
-
- Update to coccinelle-1.0.6 breaks textproc/coccigrep
XXXleot: provide a simple command to test that.
diff --git a/coccinelle/distinfo b/coccinelle/distinfo
index aaa646edf6..5142c37fd2 100644
--- a/coccinelle/distinfo
+++ b/coccinelle/distinfo
@@ -5,6 +5,7 @@ RMD160 (coccinelle-1.0.8.tar.gz) = 2c7676dc5c0bdb6839b665e78cc7ca65db0c15f0
SHA512 (coccinelle-1.0.8.tar.gz) = 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
Size (coccinelle-1.0.8.tar.gz) = 2670961 bytes
SHA1 (patch-Makefile) = 834190a7229cfd4c5942c31cb59e9b77cda16a30
+SHA1 (patch-bundles_pyml_Makefile) = f299bec6cdc082e00a8496e5da94fb3b4720692b
SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____arrayLabels__s.mli.in) = ce10bd3db37f072fe4842ed294462567129d5bf8
SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____array__s.mli.in) = 138eadb0fbe37118c1676459e9247732e3443cfd
SHA1 (patch-bundles_stdcompat_stdcompat-current_stdcompat____buffer__s.mli.in) = 16d56373a98f5be8b2dc0eb64a4e07f2bfdf97d4
diff --git a/coccinelle/patches/patch-bundles_pyml_Makefile b/coccinelle/patches/patch-bundles_pyml_Makefile
new file mode 100644
index 0000000000..68c6f93c84
--- /dev/null
+++ b/coccinelle/patches/patch-bundles_pyml_Makefile
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add support for *BSD.
+
+--- bundles/pyml/Makefile.orig 2019-09-25 09:19:54.000000000 +0000
++++ bundles/pyml/Makefile
+@@ -30,6 +30,8 @@ else ifeq ($(ARCH),Darwin)
+ PYML_ARCH=pyml_arch_darwin.ml
+ else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN)
+ PYML_ARCH=pyml_arch_cygwin.ml
++else ifeq ($(findstring BSD,$(ARCH)),BSD)
++ PYML_ARCH=pyml_arch_linux.ml
+ else
+ $(error Unsupported OS $(ARCH)
+ endif