Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2024 00:59:08 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 0bd1352ad290 - main - devel/coccinelle: Update to 1.3
Message-ID:  <202412170059.4BH0x8d9095197@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd1352ad290f0289a4cd4e56942e939c362e714

commit 0bd1352ad290f0289a4cd4e56942e939c362e714
Author:     Benjamin Jacobs <freebsd@dev.thsi.be>
AuthorDate: 2024-12-13 22:41:57 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-12-17 00:57:21 +0000

    devel/coccinelle: Update to 1.3
    
    Switch to DISTFILES/MASTER_SITES.
    Update WWW.
    Install editor syntax plugins.
    Test target.
    
    Changelog: https://coccinelle.gitlabpages.inria.fr/website/distrib/changes.html
    
    PR:             283321
---
 devel/coccinelle/Makefile  | 35 +++++++++++++++++++++++++++++++----
 devel/coccinelle/distinfo  |  6 +++---
 devel/coccinelle/pkg-plist | 10 +++++++---
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index a63b0ecabefc..206906a14402 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	coccinelle
-PORTVERSION=	1.2
+DISTVERSION=	1.3
 CATEGORIES=	devel
+MASTER_SITES=	https://coccinelle.gitlabpages.inria.fr/website/distrib/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Program matching and transformation engine
-WWW=		http://coccinelle.lip6.fr/
+WWW=		https://coccinelle.gitlabpages.inria.fr/website/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license.txt
@@ -13,19 +15,31 @@ BUILD_DEPENDS=	menhir:devel/menhir \
 		ocaml-parmap>=0:devel/ocaml-parmap \
 		ocaml-pcre>=0:devel/ocaml-pcre
 LIB_DEPENDS=	libpcre.so:devel/pcre
+TEST_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf gmake perl5 pkgconfig:build python shebangfix
-USE_GITHUB=	yes
+USE_GITHUB=	nodefault
 # until coccinelle/stdcompat releases with ocaml 5.2 support.
 GH_TUPLE=	thierry-martinez:stdcompat:d53390d788027fe0a2282c4745eb3d1626341f99:stdcompat
 USE_OCAML=	3.0+
 USE_OCAML_CAMLP4=	yes
 USE_PERL5=	build
-SHEBANG_FILES=	tools/pycocci
+SHEBANG_FILES=	tools/pycocci scripts/cpptests.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}" PYVER="${PYTHON_VER}"
 MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"
 BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake
+TEST_TARGET=	check check-cpp
+
+OPTIONS_DEFINE=		EMACS VIM
+OPTIONS_DEFAULT=	EMACS VIM
+OPTIONS_SUB=	yes
+
+EMACS_DESC=	Emacs plugin
+VIM_DESC=	Vim plugin
+
+EMACS_USES=	emacs
+EMACS_NO_DEPENDS=	yes
 
 post-extract:
 	${RM} -r ${WRKSRC}/bundles/stdcompat/stdcompat-current
@@ -37,4 +51,17 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so
 
+post-install-EMACS-on:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/cocci
+	cd ${WRKSRC}/editors/emacs && \
+		${INSTALL_DATA} cocci-ediff.el cocci.el \
+		${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/cocci
+
+post-install-VIM-on:
+.for d in ftdetect syntax
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles/${d}
+	${INSTALL_DATA} ${WRKSRC}/editors/vim/${d}/cocci.vim \
+		${STAGEDIR}${PREFIX}/share/vim/vimfiles/${d}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/devel/coccinelle/distinfo b/devel/coccinelle/distinfo
index c01146f6a5f0..ad775781d77d 100644
--- a/devel/coccinelle/distinfo
+++ b/devel/coccinelle/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1717434330
-SHA256 (coccinelle-coccinelle-1.2_GH0.tar.gz) = 095dbcddce82c8e3bc3e1ab8c83c0ed6feae8a26c921045a3e73d72f0ae13f33
-SIZE (coccinelle-coccinelle-1.2_GH0.tar.gz) = 2948051
+TIMESTAMP = 1734128873
+SHA256 (coccinelle-1.3.tar.gz) = d214410c502951bb30b86f46ecd51c02ba5cfbcb2c1eee7268428a162b18f985
+SIZE (coccinelle-1.3.tar.gz) = 4613759
 SHA256 (thierry-martinez-stdcompat-d53390d788027fe0a2282c4745eb3d1626341f99_GH0.tar.gz) = 1324c4c5a2fdcefe254459f81083dedd1e6dd61efe59498e9b4aa27d5e0a3d4d
 SIZE (thierry-martinez-stdcompat-d53390d788027fe0a2282c4745eb3d1626341f99_GH0.tar.gz) = 617733
diff --git a/devel/coccinelle/pkg-plist b/devel/coccinelle/pkg-plist
index 0fab15a46a90..329a3298cdc1 100644
--- a/devel/coccinelle/pkg-plist
+++ b/devel/coccinelle/pkg-plist
@@ -7,14 +7,14 @@ 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/cocciconfig.cmi
+lib/coccinelle/ocaml/cocciconfig.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
@@ -63,8 +63,12 @@ lib/coccinelle/python/coccilib/trac.py
 lib/coccinelle/python/coccilib/xml_firehose.py
 lib/coccinelle/standard.h
 lib/coccinelle/standard.iso
+share/bash-completion/completions/spatch
 share/man/man1/pycocci.1.gz
 share/man/man1/spatch.1.gz
 share/man/man1/spgen.1.gz
 share/man/man3/Coccilib.3cocci.gz
-share/bash-completion/completions/spatch
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/cocci/cocci-ediff.el
+%%EMACS%%%%EMACS_SITE_LISPDIR%%/cocci/cocci.el
+%%VIM%%share/vim/vimfiles/ftdetect/cocci.vim
+%%VIM%%share/vim/vimfiles/syntax/cocci.vim



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412170059.4BH0x8d9095197>