Index: head/devel/coccinelle/Makefile
===================================================================
--- head/devel/coccinelle/Makefile	(revision 521895)
+++ head/devel/coccinelle/Makefile	(revision 521896)
@@ -1,36 +1,36 @@
 # Created by: Andriy Gapon
 # $FreeBSD$
 
 PORTNAME=	coccinelle
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.0.7
 CATEGORIES=	devel
 MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	Program matching and transformation engine
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 BUILD_DEPENDS=	menhir:devel/menhir \
 		ocaml-parmap>=0:devel/ocaml-parmap \
 		ocaml-pcre>=0:devel/ocaml-pcre
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USE_OCAML=	3.0+
 USE_OCAML_CAMLP4=yes
 
-USES=		gmake perl5 pkgconfig:build python shebangfix tar:tgz
+USES=		autoreconf gmake perl5 pkgconfig:build python shebangfix
+BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake
 SHEBANG_FILES=	tools/pycocci
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
 MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"
 
 post-install:
-	# FIXME: Stripping spatch(1) breaks the executable.
-	# ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/spatch
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so
 
 .include <bsd.port.mk>
Index: head/devel/coccinelle/distinfo
===================================================================
--- head/devel/coccinelle/distinfo	(revision 521895)
+++ head/devel/coccinelle/distinfo	(revision 521896)
@@ -1,2 +1,3 @@
-SHA256 (coccinelle-1.0.4.tgz) = 7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d
-SIZE (coccinelle-1.0.4.tgz) = 2484218
+TIMESTAMP = 1578014897
+SHA256 (coccinelle-1.0.7.tar.gz) = 475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b
+SIZE (coccinelle-1.0.7.tar.gz) = 6607407
Index: head/devel/coccinelle/pkg-plist
===================================================================
--- head/devel/coccinelle/pkg-plist	(revision 521895)
+++ head/devel/coccinelle/pkg-plist	(revision 521896)
@@ -1,47 +1,79 @@
-bin/pycocci
 bin/spatch
-bin/spatch.byte
-lib/coccinelle/dllpycaml_stubs.so
+bin/spgen
+lib/coccinelle/dllpyml_stubs.so
 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/type_cocci.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
 lib/coccinelle/python/coccilib/coccigui/pycoccimodel.py
 lib/coccinelle/python/coccilib/coccigui/pygui.glade
 lib/coccinelle/python/coccilib/coccigui/pygui.gladep
 lib/coccinelle/python/coccilib/coccigui/vim.py
 lib/coccinelle/python/coccilib/coccigui/vimcom.py
 lib/coccinelle/python/coccilib/coccigui/vimeditor.py
 lib/coccinelle/python/coccilib/coccigui/vimembed.py
 lib/coccinelle/python/coccilib/elems.py
+lib/coccinelle/python/coccilib/iteration.py
 lib/coccinelle/python/coccilib/org.py
 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
 lib/coccinelle/standard.h
 lib/coccinelle/standard.iso
 man/man1/pycocci.1.gz
 man/man1/spatch.1.gz
+man/man1/spgen.1.gz
 man/man3/Coccilib.3cocci.gz
+share/bash-completion/completions/spatch