Attachment 210406 Details for Bug 243047 – svn(1) diff against the ports tree

[patch] svn(1) diff against the ports tree

cocci-update.diff (text/plain), 7.17 KB, created by Kyle Evans on 2020-01-03 03:46:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2020-01-03 03:46:54 UTC

Size: 7.17 KB

patch

obsolete

>Index: devel/coccinelle/Makefile
>===================================================================
>--- devel/coccinelle/Makefile	(revision 521892)
>+++ devel/coccinelle/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	coccinelle
>-PORTVERSION=	1.0.4
>-PORTREVISION=	1
>+PORTVERSION=	1.0.7
> CATEGORIES=	devel
> MASTER_SITES=	http://coccinelle.lip6.fr/distrib/
> 
>@@ -21,7 +20,8 @@
> 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
>@@ -29,8 +29,8 @@
> 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: devel/coccinelle/distinfo
>===================================================================
>--- devel/coccinelle/distinfo	(revision 521892)
>+++ devel/coccinelle/distinfo	(working copy)
>@@ -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: devel/coccinelle/files/patch-bundles_pyml_Makefile
>===================================================================
>--- devel/coccinelle/files/patch-bundles_pyml_Makefile	(nonexistent)
>+++ devel/coccinelle/files/patch-bundles_pyml_Makefile	(working copy)
>@@ -0,0 +1,26 @@
>+--- 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
>
>Property changes on: devel/coccinelle/files/patch-bundles_pyml_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml
>===================================================================
>--- devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml	(nonexistent)
>+++ devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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 = ":"
>
>Property changes on: devel/coccinelle/files/patch-bundles_pyml_pyml-current_pyml__arch__freebsd.ml
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/coccinelle/pkg-plist
>===================================================================
>--- devel/coccinelle/pkg-plist	(revision 521892)
>+++ devel/coccinelle/pkg-plist	(working copy)
>@@ -1,28 +1,58 @@
>-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
>@@ -34,14 +64,16 @@
> 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

Actions: View | Diff

Attachments on bug 243047: 210406