Attachment #210406 for bug #243047

View | Details | Raw Unified | Return to bug 243047
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	coccinelle
PORTVERSION=	1.0.7
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://coccinelle.lip6.fr/distrib/


USE_OCAML=	3.0+
USE_OCAML_CAMLP4=yes

USES=		autoreconf gmake perl5 pkgconfig:build python shebangfix
BINARY_ALIAS=	make=${LOCALBASE}/bin/gmake
SHEBANG_FILES=	tools/pycocci
USE_PERL5=	build
GNU_CONFIGURE=	yes

MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VER}"

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)devel/coccinelle/distinfo (-2 / +3 lines)
1	SHA256 (coccinelle-1.0.4.tgz) = 7f823813a2ea299c0f6c01d8419b83c4dc6617116d32ba99d726443a1c22b06d	1	TIMESTAMP = 1578014897
2	SIZE (coccinelle-1.0.4.tgz) = 2484218	2	SHA256 (coccinelle-1.0.7.tar.gz) = 475e2bed5486023d19d9e0dec5e109b04b872a9917b62faf83ce3521676f728b
		3	SIZE (coccinelle-1.0.7.tar.gz) = 6607407




--- bundles/pyml/Makefile.orig	2018-08-31 14:36:59 UTC
+++ bundles/pyml/Makefile
@@ -21,16 +21,18 @@ CLEANOTHERS=pyml-current/generate pyml-current/generat
 	pyml-current/pyml.cma pyml-current/pyml.cmxa \
 	pyml-current/dllpyml_stubs.so
 
-ARCH:=$(shell uname)
+UNAME_ARCH:=$(shell uname)
 
-ifeq ($(ARCH),Linux)
+ifeq ($(UNAME_ARCH),Linux)
 	PYML_ARCH=pyml_arch_linux.ml
-else ifeq ($(ARCH),Darwin)
+else ifeq ($(UNAME_ARCH),Darwin)
 	PYML_ARCH=pyml_arch_darwin.ml
-else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN)
+else ifeq ($(UNAME_ARCH),FreeBSD)
+	PYML_ARCH=pyml_arch_freebsd.ml
+else ifeq ($(findstring CYGWIN,$(UNAME_ARCH)),CYGWIN)
 	PYML_ARCH=pyml_arch_cygwin.ml
 else
-	$(error Unsupported OS $(ARCH)
+	$(error Unsupported OS $(UNAME_ARCH))
 endif
 
 include ../Makefile.bundles




--- bundles/pyml/pyml-current/pyml_arch_freebsd.ml.orig	2020-01-03 01:59:43 UTC
+++ bundles/pyml/pyml-current/pyml_arch_freebsd.ml
@@ -0,0 +1,12 @@
+let library_patterns: (int -> int -> string, unit, string) format list =
+  ["libpython%d.%dm.so"; "libpython%d.%d.so"]
+
+let library_suffix = ".so"
+
+let ensure_executable_suffix executable = executable
+
+let which = "which"
+
+external fd_of_int: int -> Unix.file_descr = "%identity"
+
+let path_separator = ":"

Lines 1-28 Link Here

(-)devel/coccinelle/pkg-plist (-5 / +37 lines)
1	bin/pycocci
2	bin/spatch	1	bin/spatch
3	bin/spatch.byte	2	bin/spgen
4	lib/coccinelle/dllpycaml_stubs.so	3	lib/coccinelle/dllpyml_stubs.so
5	lib/coccinelle/ocaml/ast0_cocci.cmi	4	lib/coccinelle/ocaml/ast0_cocci.cmi
		5	lib/coccinelle/ocaml/ast0_cocci.cmx
6	lib/coccinelle/ocaml/ast_c.cmi	6	lib/coccinelle/ocaml/ast_c.cmi
		7	lib/coccinelle/ocaml/ast_c.cmx
7	lib/coccinelle/ocaml/ast_cocci.cmi	8	lib/coccinelle/ocaml/ast_cocci.cmi
		9	lib/coccinelle/ocaml/ast_cocci.cmx
8	lib/coccinelle/ocaml/coccilib.cmi	10	lib/coccinelle/ocaml/coccilib.cmi
		11	lib/coccinelle/ocaml/coccilib.cmx
		12	lib/coccinelle/ocaml/commands.cmi
		13	lib/coccinelle/ocaml/commands.cmx
9	lib/coccinelle/ocaml/common.cmi	14	lib/coccinelle/ocaml/common.cmi
		15	lib/coccinelle/ocaml/common.cmx
10	lib/coccinelle/ocaml/config.cmi	16	lib/coccinelle/ocaml/config.cmi
		17	lib/coccinelle/ocaml/config.cmx
		18	lib/coccinelle/ocaml/dumper.cmi
		19	lib/coccinelle/ocaml/dumper.cmx
11	lib/coccinelle/ocaml/exposed_modules.cmi	20	lib/coccinelle/ocaml/exposed_modules.cmi
		21	lib/coccinelle/ocaml/exposed_modules.cmx
		22	lib/coccinelle/ocaml/externalanalysis.cmi
		23	lib/coccinelle/ocaml/externalanalysis.cmx
12	lib/coccinelle/ocaml/flag.cmi	24	lib/coccinelle/ocaml/flag.cmi
		25	lib/coccinelle/ocaml/flag.cmx
		26	lib/coccinelle/ocaml/flag_parsing_c.cmi
		27	lib/coccinelle/ocaml/flag_parsing_c.cmx
13	lib/coccinelle/ocaml/iteration.cmi	28	lib/coccinelle/ocaml/iteration.cmi
		29	lib/coccinelle/ocaml/iteration.cmx
14	lib/coccinelle/ocaml/lexer_c.cmi	30	lib/coccinelle/ocaml/lexer_c.cmi
		31	lib/coccinelle/ocaml/lexer_c.cmx
15	lib/coccinelle/ocaml/lib_parsing_c.cmi	32	lib/coccinelle/ocaml/lib_parsing_c.cmi
		33	lib/coccinelle/ocaml/lib_parsing_c.cmx
16	lib/coccinelle/ocaml/ocamlcocci_aux.cmi	34	lib/coccinelle/ocaml/ocamlcocci_aux.cmi
		35	lib/coccinelle/ocaml/ocamlcocci_aux.cmx
		36	lib/coccinelle/ocaml/parmap.cmi
		37	lib/coccinelle/ocaml/parmap.cmx
17	lib/coccinelle/ocaml/parse_c.cmi	38	lib/coccinelle/ocaml/parse_c.cmi
		39	lib/coccinelle/ocaml/parse_c.cmx
18	lib/coccinelle/ocaml/parser_c.cmi	40	lib/coccinelle/ocaml/parser_c.cmi
		41	lib/coccinelle/ocaml/parser_c.cmx
19	lib/coccinelle/ocaml/prepare_ocamlcocci.cmi	42	lib/coccinelle/ocaml/prepare_ocamlcocci.cmi
		43	lib/coccinelle/ocaml/prepare_ocamlcocci.cmx
20	lib/coccinelle/ocaml/pretty_print_c.cmi	44	lib/coccinelle/ocaml/pretty_print_c.cmi
		45	lib/coccinelle/ocaml/pretty_print_c.cmx
21	lib/coccinelle/ocaml/regexp.cmi	46	lib/coccinelle/ocaml/regexp.cmi
		47	lib/coccinelle/ocaml/regexp.cmx
22	lib/coccinelle/ocaml/run_ocamlcocci.cmi	48	lib/coccinelle/ocaml/run_ocamlcocci.cmi
23	lib/coccinelle/ocaml/type_cocci.cmi	49	lib/coccinelle/ocaml/run_ocamlcocci.cmx
		50	lib/coccinelle/ocaml/token_c.cmi
		51	lib/coccinelle/ocaml/token_c.cmx
24	lib/coccinelle/ocaml/visitor_c.cmi	52	lib/coccinelle/ocaml/visitor_c.cmi
		53	lib/coccinelle/ocaml/visitor_c.cmx
25	lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi	54	lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmi
		55	lib/coccinelle/ocaml/yes_prepare_ocamlcocci.cmx
26	lib/coccinelle/python/coccilib/__init__.py	56	lib/coccinelle/python/coccilib/__init__.py
27	lib/coccinelle/python/coccilib/coccigui/__init__.py	57	lib/coccinelle/python/coccilib/coccigui/__init__.py
28	lib/coccinelle/python/coccilib/coccigui/coccigui.py	58	lib/coccinelle/python/coccilib/coccigui/coccigui.py
Lines 34-47 Link Here
34	lib/coccinelle/python/coccilib/coccigui/vimeditor.py	64	lib/coccinelle/python/coccilib/coccigui/vimeditor.py
35	lib/coccinelle/python/coccilib/coccigui/vimembed.py	65	lib/coccinelle/python/coccilib/coccigui/vimembed.py
36	lib/coccinelle/python/coccilib/elems.py	66	lib/coccinelle/python/coccilib/elems.py
		67	lib/coccinelle/python/coccilib/iteration.py
37	lib/coccinelle/python/coccilib/org.py	68	lib/coccinelle/python/coccilib/org.py
38	lib/coccinelle/python/coccilib/output.py	69	lib/coccinelle/python/coccilib/output.py
39	lib/coccinelle/python/coccilib/report.py	70	lib/coccinelle/python/coccilib/report.py
40	lib/coccinelle/python/coccilib/trac.py	71	lib/coccinelle/python/coccilib/trac.py
41	lib/coccinelle/python/coccilib/xml_firehose.py	72	lib/coccinelle/python/coccilib/xml_firehose.py
42	lib/coccinelle/spatch
43	lib/coccinelle/standard.h	73	lib/coccinelle/standard.h
44	lib/coccinelle/standard.iso	74	lib/coccinelle/standard.iso
45	man/man1/pycocci.1.gz	75	man/man1/pycocci.1.gz
46	man/man1/spatch.1.gz	76	man/man1/spatch.1.gz
		77	man/man1/spgen.1.gz
47	man/man3/Coccilib.3cocci.gz	78	man/man3/Coccilib.3cocci.gz
		79	share/bash-completion/completions/spatch

Return to bug 243047

Lines 2-9 Link Here

(-)devel/coccinelle/Makefile (-5 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= coccinelle	4	PORTNAME= coccinelle
5	PORTVERSION= 1.0.4	5	PORTVERSION= 1.0.7
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://coccinelle.lip6.fr/distrib/	7	MASTER_SITES= http://coccinelle.lip6.fr/distrib/
9		8
Lines 21-27 Link Here
21	USE_OCAML= 3.0+	20	USE_OCAML= 3.0+
22	USE_OCAML_CAMLP4=yes	21	USE_OCAML_CAMLP4=yes
23		22
24	USES= gmake perl5 pkgconfig:build python shebangfix tar:tgz	23	USES= autoreconf gmake perl5 pkgconfig:build python shebangfix
		24	BINARY_ALIAS= make=${LOCALBASE}/bin/gmake
25	SHEBANG_FILES= tools/pycocci	25	SHEBANG_FILES= tools/pycocci
26	USE_PERL5= build	26	USE_PERL5= build
27	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
Lines 29-36 Link Here
29	MAKE_ARGS= PYTHON_VERSION="${PYTHON_VER}"	29	MAKE_ARGS= PYTHON_VERSION="${PYTHON_VER}"
30		30
31	post-install:	31	post-install:
32	# FIXME: Stripping spatch(1) breaks the executable.	32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spatch
33	# ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/spatch	33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/spgen
34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so	34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/coccinelle/*.so
35		35
36	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/coccinelle/files/patch-bundles_pyml_Makefile (+26 lines)
	1	--- bundles/pyml/Makefile.orig 2018-08-31 14:36:59 UTC
	2	+++ bundles/pyml/Makefile
	3	@@ -21,16 +21,18 @@ CLEANOTHERS=pyml-current/generate pyml-current/generat
	4	pyml-current/pyml.cma pyml-current/pyml.cmxa \
	5	pyml-current/dllpyml_stubs.so
	6
	7	-ARCH:=$(shell uname)
	8	+UNAME_ARCH:=$(shell uname)
	9
	10	-ifeq ($(ARCH),Linux)
	11	+ifeq ($(UNAME_ARCH),Linux)
	12	PYML_ARCH=pyml_arch_linux.ml
	13	-else ifeq ($(ARCH),Darwin)
	14	+else ifeq ($(UNAME_ARCH),Darwin)
	15	PYML_ARCH=pyml_arch_darwin.ml
	16	-else ifeq ($(findstring CYGWIN,$(ARCH)),CYGWIN)
	17	+else ifeq ($(UNAME_ARCH),FreeBSD)
	18	+ PYML_ARCH=pyml_arch_freebsd.ml
	19	+else ifeq ($(findstring CYGWIN,$(UNAME_ARCH)),CYGWIN)
	20	PYML_ARCH=pyml_arch_cygwin.ml
	21	else
	22	- $(error Unsupported OS $(ARCH)
	23	+ $(error Unsupported OS $(UNAME_ARCH))
	24	endif
	25
	26	include ../Makefile.bundles

Line 0 Link Here

(-)devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml (+15 lines)
	1	--- bundles/pyml/pyml-current/pyml_arch_freebsd.ml.orig 2020-01-03 01:59:43 UTC
	2	+++ bundles/pyml/pyml-current/pyml_arch_freebsd.ml
	3	@@ -0,0 +1,12 @@
	4	+let library_patterns: (int -> int -> string, unit, string) format list =
	5	+ ["libpython%d.%dm.so"; "libpython%d.%d.so"]
	6	+
	7	+let library_suffix = ".so"
	8	+
	9	+let ensure_executable_suffix executable = executable
	10	+
	11	+let which = "which"
	12	+
	13	+external fd_of_int: int -> Unix.file_descr = "%identity"
	14	+
	15	+let path_separator = ":"