View | Details | Raw Unified | Return to bug 251642 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/pcre2/Makefile (-37 / +48 lines)
Lines 1-8 Link Here
1
PORTNAME=	pcre2
1
PORTNAME=	pcre2
2
DISTVERSION=	10.43
2
DISTVERSION=	10.44
3
CATEGORIES=	devel
3
CATEGORIES=	devel
4
MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
4
MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
5
5
6
PATCH_SITES=	https://github.com/PCRE2Project/pcre2/commit/
7
PATCHFILES=	fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch:-p1 \
8
		57906628d7babd27c01eb1c085d3e0cdd512189a.patch:-p1 \
9
		bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch:-p1 \
10
		a80920509e49865405477244c294fb3d8864375e.patch:-p1 \
11
		3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch:-p1 \
12
		c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch:-p1 \
13
		7e141969b538917c9f4a85839031d066eec67ad2.patch:-p1 \
14
		9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch:-p1
15
6
MAINTAINER=	krion@FreeBSD.org
16
MAINTAINER=	krion@FreeBSD.org
7
COMMENT=	Perl Compatible Regular Expressions library, version 2
17
COMMENT=	Perl Compatible Regular Expressions library, version 2
8
WWW=		https://www.pcre.org/
18
WWW=		https://www.pcre.org/
Lines 10-50 WWW= https://www.pcre.org/ Link Here
10
LICENSE=	BSD3CLAUSE
20
LICENSE=	BSD3CLAUSE
11
LICENSE_FILE=	${WRKSRC}/LICENCE
21
LICENSE_FILE=	${WRKSRC}/LICENCE
12
22
13
USES=		autoreconf cpe libtool pkgconfig tar:bz2
23
USES=		cmake:testing cpe pathfix pkgconfig tar:bz2
14
CPE_VENDOR=	pcre
24
CPE_VENDOR=	pcre
15
16
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
17
26
18
GNU_CONFIGURE=			yes
27
PORTDOCS=	*
19
GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
28
20
CONFIGURE_ARGS=			--enable-pcre2-16 \
29
CMAKE_TESTING_ON=	PCRE2_BUILD_TESTS
21
				--enable-pcre2-32
30
CMAKE_OFF=		PCRE2_BUILD_TESTS
22
INSTALL_TARGET=			install-strip
31
CMAKE_ON=		BUILD_SHARED_LIBS \
32
			PCRE2_BUILD_PCRE2_16 \
33
			PCRE2_BUILD_PCRE2_32
23
34
24
OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ
35
OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ STATIC
25
OPTIONS_RADIO=		CLI
36
OPTIONS_RADIO=		CLI
26
OPTIONS_RADIO_CLI=	LIBEDIT READLINE
37
OPTIONS_RADIO_CLI=	LIBEDIT READLINE
38
OPTIONS_SUB=		yes
27
39
28
LIBBZ2_DESC=	Using pcre2grep with .bz2 files
40
LIBBZ2_DESC=	Using pcre2grep with .bz2 files
29
LIBZ_DESC=	Using pcre2grep with .gz files
41
LIBZ_DESC=	Using pcre2grep with .gz files
30
42
31
LIBBZ2_CONFIGURE_ON=		--enable-pcre2grep-libbz2
43
LIBBZ2_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2:BOOL=True
32
LIBEDIT_USES=			libedit
44
33
LIBEDIT_CONFIGURE_ENABLE=	pcre2test-libedit
45
LIBEDIT_USES=		libedit
34
LIBZ_CONFIGURE_ON=		--enable-pcre2grep-libz
46
LIBEDIT_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Editline:BOOL=True
35
READLINE_USES=			readline
47
36
READLINE_CONFIGURE_ENABLE=	pcre2test-libreadline
48
LIBZ_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB:BOOL=True
49
50
READLINE_USES=		readline
51
READLINE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Readline:BOOL=True
52
53
STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
37
54
38
.include <bsd.port.options.mk>
55
.include <bsd.port.options.mk>
39
56
40
.if ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
57
.if ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
41
CONFIGURE_ARGS+=	--enable-jit
58
CMAKE_ON+=	PCRE2_SUPPORT_JIT
42
.else
59
.else
43
CONFIGURE_ARGS+=	--disable-jit
60
CMAKE_OFF+=	PCRE2_SUPPORT_JIT
44
.endif
45
46
.if ${PORT_OPTIONS:MDOCS}
47
PORTDOCS=	*
48
.endif
61
.endif
49
62
50
# Optional knobs that accept positive integer parameters (see pcrebuild(3)):
63
# Optional knobs that accept positive integer parameters (see pcrebuild(3)):
Lines 53-85 PORTDOCS= * Link Here
53
# libraries, at the expense of longer load times (possible values:
66
# libraries, at the expense of longer load times (possible values:
54
# 2 (default), 3, and 4):
67
# 2 (default), 3, and 4):
55
.if defined(WITH_LINK_SIZE)
68
.if defined(WITH_LINK_SIZE)
56
CONFIGURE_ARGS+=	--with-link-size=${WITH_LINK_SIZE}
69
CMAKE_ARGS+=	-DPCRE2_LINK_SIZE:STRING=${WITH_LINK_SIZE}
57
.endif
70
.endif
58
71
59
# Control PCRE resource use by limiting the default number of times pcre_exec()
72
# Control PCRE resource use by limiting the default number of times pcre_exec()
60
# can call match() during a single operation (default: 10 million):
73
# can call match() during a single operation (default: 10 million):
61
.if defined(WITH_MATCH_LIMIT)
74
.if defined(WITH_MATCH_LIMIT)
62
CONFIGURE_ARGS+=	--with-match-limit=${WITH_MATCH_LIMIT}
75
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT:STRING=${WITH_MATCH_LIMIT}
76
.endif
77
78
# This limit applies to all backtracks, whether or not they are nested. In
79
# some environments it is desirable to limit the nesting of backtracking (that
80
# is, the depth of tree that is searched) more strictly, in order to restrict
81
# the maximum amount of heap memory that is used (default: 10 million):
82
.if defined(WITH_MATCH_LIMIT_DEPTH)
83
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT_DEPTH:STRING=${WITH_MATCH_LIMIT_DEPTH}
63
.endif
84
.endif
64
85
65
# Control PCRE resource use by limiting the nesting depth of parentheses in
86
# Control PCRE resource use by limiting the nesting depth of parentheses in
66
# patterns compiled with pcre_compile() (default: 250):
87
# patterns compiled with pcre_compile() (default: 250):
67
.if defined(WITH_PARENS_NEST_LIMIT)
88
.if defined(WITH_PARENS_NEST_LIMIT)
68
CONFIGURE_ARGS+=	--with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT}
89
CMAKE_ARGS+=	-DPCRE2_PARENS_NEST_LIMIT:STRING=${WITH_PARENS_NEST_LIMIT}
69
.endif
90
.endif
70
91
71
#prevent regression test coredumps from causing failures on the
92
post-patch:
72
#package-building cluster:
93
# Clean testdata dir from .orig patches after backports
73
.ifndef (MAINTAINER_MODE)
94
	${RM} ${PATCH_WRKSRC}/testdata/*.orig
74
CORELIMIT?=	/usr/bin/limits -Sc 0
75
.endif
76
TESTLOGS?=	RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \
77
		pcre_stringpiece_unittest pcrecpp_unittest
78
79
do-test:
80
	@cd ${WRKSRC} ; \
81
	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} check ; \
82
	for _l in ${TESTLOGS} ; do if ${TEST} -f $${_l}.log ; then \
83
	${PRINTF} "\n\n$${_l}.log\n\n\n" ; ${CAT} $${_l}.log ; fi ; done
84
95
85
.include <bsd.port.mk>
96
.include <bsd.port.mk>
(-)b/devel/pcre2/distinfo (-3 / +19 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1708425567
1
TIMESTAMP = 1719270069
2
SHA256 (pcre2-10.43.tar.bz2) = e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb
2
SHA256 (pcre2-10.44.tar.bz2) = d34f02e113cf7193a1ebf2770d3ac527088d485d4e047ed10e5d217c6ef5de96
3
SIZE (pcre2-10.43.tar.bz2) = 1905255
3
SIZE (pcre2-10.44.tar.bz2) = 1928086
4
SHA256 (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = e31e16744f7e0e9294ba0d91dc1722085e61f995c34d79ac1580de69edf861bd
5
SIZE (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = 1141
6
SHA256 (57906628d7babd27c01eb1c085d3e0cdd512189a.patch) = 0c1b3167204a540b0ca3ef5c1728c56a518a819eb2ef9f2a948582cea0b07e97
7
SIZE (57906628d7babd27c01eb1c085d3e0cdd512189a.patch) = 206118
8
SHA256 (bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch) = 1f6b9d4a3ab7cbe9fe711a3cd065d3a166abcafa3e23a03c25de33bbf19544be
9
SIZE (bb8e7e0c728ca10fa21fbc306a7f2ae4205e8618.patch) = 1895
10
SHA256 (a80920509e49865405477244c294fb3d8864375e.patch) = 1fc49564879d3ca3ddf5eb2d925317e137d1c023b15d6e80a20c3202f3db71ad
11
SIZE (a80920509e49865405477244c294fb3d8864375e.patch) = 845
12
SHA256 (3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch) = b39c3439907bbe636d60908706bc09c47a9f2a560166454b6f8edd327c377a9d
13
SIZE (3b90149f3c9aca9fe8c2aa623a18e18c089dc449.patch) = 3014
14
SHA256 (c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch) = 3b89eea90a60631d43834ee2d157e4b0ec134df379727940533819440033314b
15
SIZE (c63d7c992ef1bbf64ef93e0e8e551ed29fd988e7.patch) = 15264
16
SHA256 (7e141969b538917c9f4a85839031d066eec67ad2.patch) = 2901927e7981cfba08a0470ca7acf3d4d4fa7e0311459b8ec8879b710f15920e
17
SIZE (7e141969b538917c9f4a85839031d066eec67ad2.patch) = 2030
18
SHA256 (9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch) = ce64bcf66021f75ed784aef2d7f5289c73ed4c6de54525049884ee498327ecb3
19
SIZE (9a51f31da1c2d45e1f31d6a0d6b2f62975fed373.patch) = 987
(-)a/devel/pcre2/files/patch-Makefile.am (-11 lines)
Removed Link Here
1
--- Makefile.am.orig	2015-08-25 16:56:39 UTC
2
+++ Makefile.am
3
@@ -646,7 +646,7 @@ EXTRA_DIST += src/pcre2demo.c
4
 
5
 # We have .pc files for pkg-config users.
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(libdir)data/pkgconfig
9
 pkgconfig_DATA =
10
 
11
 if WITH_PCRE2_8
(-)b/devel/pcre2/pkg-plist (-8 / +10 lines)
Lines 1-21 Link Here
1
bin/pcre2-config
1
bin/pcre2-config
2
bin/pcre2grep
2
bin/pcre2grep
3
bin/pcre2test
4
include/pcre2.h
3
include/pcre2.h
5
include/pcre2posix.h
4
include/pcre2posix.h
6
lib/libpcre2-16.a
5
lib/cmake/pcre2/pcre2-config-version.cmake
6
lib/cmake/pcre2/pcre2-config.cmake
7
%%STATIC%%lib/libpcre2-16.a
7
lib/libpcre2-16.so
8
lib/libpcre2-16.so
8
lib/libpcre2-16.so.0
9
lib/libpcre2-16.so.0
9
lib/libpcre2-16.so.0.12.0
10
lib/libpcre2-16.so.0.13.0
10
lib/libpcre2-32.a
11
%%STATIC%%lib/libpcre2-32.a
11
lib/libpcre2-32.so
12
lib/libpcre2-32.so
12
lib/libpcre2-32.so.0
13
lib/libpcre2-32.so.0
13
lib/libpcre2-32.so.0.12.0
14
lib/libpcre2-32.so.0.13.0
14
lib/libpcre2-8.a
15
%%STATIC%%lib/libpcre2-8.a
15
lib/libpcre2-8.so
16
lib/libpcre2-8.so
16
lib/libpcre2-8.so.0
17
lib/libpcre2-8.so.0
17
lib/libpcre2-8.so.0.12.0
18
lib/libpcre2-8.so.0.13.0
18
lib/libpcre2-posix.a
19
%%STATIC%%lib/libpcre2-posix.a
19
lib/libpcre2-posix.so
20
lib/libpcre2-posix.so
20
lib/libpcre2-posix.so.3
21
lib/libpcre2-posix.so.3
21
lib/libpcre2-posix.so.3.0.5
22
lib/libpcre2-posix.so.3.0.5
Lines 82-87 share/man/man3/pcre2_set_glob_escape.3.gz Link Here
82
share/man/man3/pcre2_set_glob_separator.3.gz
83
share/man/man3/pcre2_set_glob_separator.3.gz
83
share/man/man3/pcre2_set_heap_limit.3.gz
84
share/man/man3/pcre2_set_heap_limit.3.gz
84
share/man/man3/pcre2_set_match_limit.3.gz
85
share/man/man3/pcre2_set_match_limit.3.gz
86
share/man/man3/pcre2_set_max_pattern_compiled_length.3.gz
85
share/man/man3/pcre2_set_max_pattern_length.3.gz
87
share/man/man3/pcre2_set_max_pattern_length.3.gz
86
share/man/man3/pcre2_set_max_varlookbehind.3.gz
88
share/man/man3/pcre2_set_max_varlookbehind.3.gz
87
share/man/man3/pcre2_set_newline.3.gz
89
share/man/man3/pcre2_set_newline.3.gz

Return to bug 251642