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

Collapse All | Expand All

(-)b/devel/pcre2/Makefile (-35 / +38 lines)
Lines 1-8 Link Here
1
PORTNAME=	pcre2
1
PORTNAME=	pcre2
2
PORTVERSION=	10.42
2
DISTVERSION=	10.43
3
PORTREVISION=	1
4
CATEGORIES=	devel
3
CATEGORIES=	devel
5
MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
4
MASTER_SITES=	https://github.com/PCRE2Project/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
5
6
PATCH_SITES=	https://github.com/PCRE2Project/${PORTNAME}/commit/
7
PATCHFILES=	fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch:-p1 \
8
		e4788704ccd64ab067dc348cdefea6221bfe9b97.patch:-p1
6
9
7
MAINTAINER=	krion@FreeBSD.org
10
MAINTAINER=	krion@FreeBSD.org
8
COMMENT=	Perl Compatible Regular Expressions library, version 2
11
COMMENT=	Perl Compatible Regular Expressions library, version 2
Lines 11-47 WWW= https://www.pcre.org/ Link Here
11
LICENSE=	BSD3CLAUSE
14
LICENSE=	BSD3CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENCE
15
LICENSE_FILE=	${WRKSRC}/LICENCE
13
16
14
USES=		autoreconf cpe libtool pkgconfig tar:bz2
17
USES=		cmake:testing cpe pathfix pkgconfig tar:bz2
15
CPE_VENDOR=	pcre
18
CPE_VENDOR=	pcre
16
19
17
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
18
21
19
GNU_CONFIGURE=	yes
22
CMAKE_TESTING_ON=	PCRE2_BUILD_TESTS
20
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
23
CMAKE_OFF=		PCRE2_BUILD_TESTS
21
CONFIGURE_ARGS=	--enable-pcre2-16 \
24
CMAKE_ON=		BUILD_SHARED_LIBS \
22
		--enable-pcre2-32
25
			PCRE2_BUILD_PCRE2_16 \
23
INSTALL_TARGET=	install-strip
26
			PCRE2_BUILD_PCRE2_32
24
27
25
OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ
28
OPTIONS_DEFINE=		DOCS LIBBZ2 LIBZ STATIC
26
OPTIONS_RADIO=		CLI
29
OPTIONS_RADIO=		CLI
27
OPTIONS_RADIO_CLI=	LIBEDIT READLINE
30
OPTIONS_RADIO_CLI=	LIBEDIT READLINE
31
OPTIONS_SUB=		yes
28
32
29
LIBBZ2_DESC=	Using pcre2grep with .bz2 files
33
LIBBZ2_DESC=	Using pcre2grep with .bz2 files
30
LIBZ_DESC=	Using pcre2grep with .gz files
34
LIBZ_DESC=	Using pcre2grep with .gz files
31
35
32
LIBBZ2_CONFIGURE_ON=	--enable-pcre2grep-libbz2
36
LIBBZ2_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2:BOOL=True
33
LIBEDIT_USES=			libedit
37
34
LIBEDIT_CONFIGURE_ENABLE=	pcre2test-libedit
38
LIBEDIT_USES=		libedit
35
LIBZ_CONFIGURE_ON=	--enable-pcre2grep-libz
39
LIBEDIT_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Editline:BOOL=True
36
READLINE_USES=			readline
40
37
READLINE_CONFIGURE_ENABLE=	pcre2test-libreadline
41
LIBZ_CMAKE_OFF=		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB:BOOL=True
42
43
READLINE_USES=		readline
44
READLINE_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Readline:BOOL=True
45
46
STATIC_CMAKE_BOOL=	BUILD_STATIC_LIBS
38
47
39
.include <bsd.port.options.mk>
48
.include <bsd.port.options.mk>
40
49
41
.if ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
50
.if ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
42
CONFIGURE_ARGS+=	--enable-jit
51
CMAKE_ON+=	PCRE2_SUPPORT_JIT
43
.else
52
.else
44
CONFIGURE_ARGS+=	--disable-jit
53
CMAKE_OFF+=	PCRE2_SUPPORT_JIT
45
.endif
54
.endif
46
55
47
.if ${PORT_OPTIONS:MDOCS}
56
.if ${PORT_OPTIONS:MDOCS}
Lines 54-86 PORTDOCS= * Link Here
54
# libraries, at the expense of longer load times (possible values:
63
# libraries, at the expense of longer load times (possible values:
55
# 2 (default), 3, and 4):
64
# 2 (default), 3, and 4):
56
.if defined(WITH_LINK_SIZE)
65
.if defined(WITH_LINK_SIZE)
57
CONFIGURE_ARGS+=	--with-link-size=${WITH_LINK_SIZE}
66
CMAKE_ARGS=+=	-DPCRE2_LINK_SIZE:STRING=${WITH_LINK_SIZE}
58
.endif
67
.endif
59
68
60
# Control PCRE resource use by limiting the default number of times pcre_exec()
69
# Control PCRE resource use by limiting the default number of times pcre_exec()
61
# can call match() during a single operation (default: 10 million):
70
# can call match() during a single operation (default: 10 million):
62
.if defined(WITH_MATCH_LIMIT)
71
.if defined(WITH_MATCH_LIMIT)
63
CONFIGURE_ARGS+=	--with-match-limit=${WITH_MATCH_LIMIT}
72
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT:STRING=${WITH_MATCH_LIMIT}
73
.endif
74
75
# This limit applies to all backtracks, whether or not they are nested. In
76
# some environments it is desirable to limit the nesting of backtracking (that
77
# is, the depth of tree that is searched) more strictly, in order to restrict
78
# the maximum amount of heap memory that is used (default: 10 million):
79
.if defined(WITH_MATCH_LIMIT_DEPTH)
80
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT_DEPTH:STRING=${WITH_MATCH_LIMIT_DEPTH}
64
.endif
81
.endif
65
82
66
# Control PCRE resource use by limiting the nesting depth of parentheses in
83
# Control PCRE resource use by limiting the nesting depth of parentheses in
67
# patterns compiled with pcre_compile() (default: 250):
84
# patterns compiled with pcre_compile() (default: 250):
68
.if defined(WITH_PARENS_NEST_LIMIT)
85
.if defined(WITH_PARENS_NEST_LIMIT)
69
CONFIGURE_ARGS+=	--with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT}
86
CMAKE_ARGS+=	-DPCRE2_PARENS_NEST_LIMIT:STRING=${WITH_PARENS_NEST_LIMIT}
70
.endif
71
72
#prevent regression test coredumps from causing failures on the
73
#package-building cluster:
74
.ifndef(MAINTAINER_MODE)
75
CORELIMIT?=	/usr/bin/limits -Sc 0
76
.endif
87
.endif
77
TESTLOGS?=	RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \
78
		pcre_stringpiece_unittest pcrecpp_unittest
79
80
do-test:
81
	@cd ${WRKSRC} ; \
82
	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} check ; \
83
	for _l in ${TESTLOGS} ; do if ${TEST} -f $${_l}.log ; then \
84
	${PRINTF} "\n\n$${_l}.log\n\n\n" ; ${CAT} $${_l}.log ; fi ; done
85
88
86
.include <bsd.port.mk>
89
.include <bsd.port.mk>
(-)b/devel/pcre2/distinfo (-3 / +7 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1672697328
1
TIMESTAMP = 1708410513
2
SHA256 (pcre2-10.42.tar.bz2) = 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
2
SHA256 (pcre2-10.43.tar.bz2) = e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb
3
SIZE (pcre2-10.42.tar.bz2) = 1799866
3
SIZE (pcre2-10.43.tar.bz2) = 1905255
4
SHA256 (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = e31e16744f7e0e9294ba0d91dc1722085e61f995c34d79ac1580de69edf861bd
5
SIZE (fba4a6a5e8a7895db7e0efcbcdb7087a04a00322.patch) = 1141
6
SHA256 (e4788704ccd64ab067dc348cdefea6221bfe9b97.patch) = 05c82bbb8b993014280ed0c72edb610b77f4341d722125401ccfd4bb4bae54b5
7
SIZE (e4788704ccd64ab067dc348cdefea6221bfe9b97.patch) = 981
(-)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 (-9 / +12 lines)
Lines 1-24 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.11.2
10
lib/libpcre2-16.so.0.12.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.11.2
14
lib/libpcre2-32.so.0.12.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.11.2
18
lib/libpcre2-8.so.0.12.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.4
22
lib/libpcre2-posix.so.3.0.5
22
libdata/pkgconfig/libpcre2-16.pc
23
libdata/pkgconfig/libpcre2-16.pc
23
libdata/pkgconfig/libpcre2-32.pc
24
libdata/pkgconfig/libpcre2-32.pc
24
libdata/pkgconfig/libpcre2-8.pc
25
libdata/pkgconfig/libpcre2-8.pc
Lines 65-70 share/man/man3/pcre2_match_context_free.3.gz Link Here
65
share/man/man3/pcre2_match_data_create.3.gz
66
share/man/man3/pcre2_match_data_create.3.gz
66
share/man/man3/pcre2_match_data_create_from_pattern.3.gz
67
share/man/man3/pcre2_match_data_create_from_pattern.3.gz
67
share/man/man3/pcre2_match_data_free.3.gz
68
share/man/man3/pcre2_match_data_free.3.gz
69
share/man/man3/pcre2_get_match_data_heapframes_size.3.gz
68
share/man/man3/pcre2_pattern_convert.3.gz
70
share/man/man3/pcre2_pattern_convert.3.gz
69
share/man/man3/pcre2_pattern_info.3.gz
71
share/man/man3/pcre2_pattern_info.3.gz
70
share/man/man3/pcre2_serialize_decode.3.gz
72
share/man/man3/pcre2_serialize_decode.3.gz
Lines 82-87 share/man/man3/pcre2_set_glob_separator.3.gz Link Here
82
share/man/man3/pcre2_set_heap_limit.3.gz
84
share/man/man3/pcre2_set_heap_limit.3.gz
83
share/man/man3/pcre2_set_match_limit.3.gz
85
share/man/man3/pcre2_set_match_limit.3.gz
84
share/man/man3/pcre2_set_max_pattern_length.3.gz
86
share/man/man3/pcre2_set_max_pattern_length.3.gz
87
share/man/man3/pcre2_set_max_varlookbehind.3.gz
85
share/man/man3/pcre2_set_newline.3.gz
88
share/man/man3/pcre2_set_newline.3.gz
86
share/man/man3/pcre2_set_offset_limit.3.gz
89
share/man/man3/pcre2_set_offset_limit.3.gz
87
share/man/man3/pcre2_set_parens_nest_limit.3.gz
90
share/man/man3/pcre2_set_parens_nest_limit.3.gz

Return to bug 251642