Last fall, people discussed and reviewed jsg's patch to update
devel/coccinelle to 1.0.5:
https://marc.info/?t=14746991551=1=2
Since then, 1.0.6 has been released.
It seems that jsg's patch stalled because there was, for an unknown
reason, a big regression in the test suite results. However, with the
below patch, I almost exactly the same score as the current port:
>
> total score
>
> good = 453/498
> Current score is equal to expected score; everything is fine
I don't know whether this is because of bugs fixed in the new version or
because of differences between our patches.
Aside from typical update fluff, my patch removes the mv command in the
port Makefile because the associated shared object seems like it's no
longer generated. Their changelog notes that they now only use the
bundled version of Pycaml:
http://coccinelle.lip6.fr/distrib/changes.html
That may be the cause of this change, but I'm not sure.
I also remove an additional pair of instances in which the -v flag is
passed to cp.
I'm interested to hear what people think.
Thanks for your time,
Mike
Index: Makefile
===
RCS file: /cvs/ports/devel/coccinelle/Makefile,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile
--- Makefile1 Nov 2016 22:02:59 - 1.34
+++ Makefile30 Apr 2017 21:55:37 -
@@ -4,9 +4,8 @@ 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.4
+DISTNAME = coccinelle-1.0.6
EXTRACT_SUFX = .tgz
-REVISION = 1
CATEGORIES = devel
@@ -67,8 +66,6 @@ pre-configure:
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/coccinelle/python/coccilib
- mv ${PREFIX}/lib/coccinelle/dllpycaml_stubs.so \
- ${PREFIX}/lib/ocaml/stublibs/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/coccinelle
cd ${WRKSRC}/docs/manual; \
${MAKE_PROGRAM} WEBDOCS=${PREFIX}/share/doc/coccinelle install
Index: distinfo
===
RCS file: /cvs/ports/devel/coccinelle/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- distinfo29 Oct 2015 15:41:36 - 1.12
+++ distinfo30 Apr 2017 21:55:37 -
@@ -1,2 +1,2 @@
-SHA256 (coccinelle-1.0.4.tgz) = f4I4E6LqKZwPbAHYQZuDxNxmFxFtMrqZ1yZEOhwisG0=
-SIZE (coccinelle-1.0.4.tgz) = 2484218
+SHA256 (coccinelle-1.0.6.tgz) = hFLtJlwgna6Zy7M7Z7x5Eucvi8oeJPM/Goi6PXmF6Qk=
+SIZE (coccinelle-1.0.6.tgz) = 6684278
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/coccinelle/patches/patch-Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile
--- patches/patch-Makefile 29 Oct 2015 15:41:36 - 1.10
+++ patches/patch-Makefile 30 Apr 2017 21:55:37 -
@@ -1,10 +1,22 @@
$OpenBSD: patch-Makefile,v 1.10 2015/10/29 15:41:36 sthen Exp $
Makefile.orig Wed Oct 28 14:07:59 2015
-+++ Makefile Thu Oct 29 15:36:45 2015
+--- Makefile.orig
Makefile
+@@ -267,9 +267,9 @@ purebytecode:
+ # copies the stubs libraries (if any) to the root directory
+ copy-stubs:
+ @if test -f ./bundles/pyml/dllpyml_stubs.so; then \
+- cp -fv ./bundles/pyml/dllpyml_stubs.so .; fi
++ cp -f ./bundles/pyml/dllpyml_stubs.so .; fi
+ @if test -f ./bundles/pcre/dllpcre_stubs.so; then \
+- cp -fv ./bundles/pcre/dllpcre_stubs.so .; fi
++ cp -f ./bundles/pcre/dllpcre_stubs.so .; fi
+
+ ##
+ # Build version information
@@ -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/spgen.1 $(DESTDIR)$(MANDIR)/man1/
- $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/
+ $(INSTALL_DATA) docs/Coccilib.3cocci $(DESTDIR)$(MANDIR)/man3/Coccilib.3
@@ -13,9 +25,9 @@ $OpenBSD: patch-Makefile,v 1.10 2015/10/
@@ -378,9 +378,9 @@ install-python:
install-stubs:
$(MKDIR_P) $(DESTDIR)$(LIBDIR)
- @if test -f ./bundles/pycaml/dllpycaml_stubs.so; then \
-- cp -fv ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR);
fi
-+ cp -f ./bundles/pycaml/dllpycaml_stubs.so $(DESTDIR)$(LIBDIR);
fi
+ @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
