Attachment #220313 for bug #251642




# $FreeBSD$

PORTNAME=	pcre2
DISTVERSION=	10.36
CATEGORIES=	devel
MASTER_SITES=	SF/pcre/${PORTNAME}/${DISTVERSION} \
		https://ftp.pcre.org/pub/pcre/ \
		ftp://ftp.pcre.org/pub/pcre/

MAINTAINER=	krion@FreeBSD.org
COMMENT=	Perl Compatible Regular Expressions library, version 2

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/LICENCE

USES=		cmake tar:bzip2

TEST_TARGET=	test

CMAKE_ARGS=	-DPCRE2_BUILD_PCRE2_16:BOOL=ON -DPCRE2_BUILD_PCRE2_32:BOOL=ON
CONFIGURE_ARGS=	--enable-pcre2-16 --enable-pcre2-32

OPTIONS_DEFINE=	DOCS STATIC TEST
OPTIONS_SUB=	yes
OPTIONS_RADIO=	CLI
OPTIONS_RADIO_CLI=	LIBEDIT READLINE

LIBEDIT_USES=		libedit
LIBEDIT_CMAKE_BOOL=	PCRE2_SUPPORT_LIBEDIT
READLINE_USES=		readline
READLINE_CMAKE_BOOL=	PCRE2_SUPPORT_LIBREADLINE
STATIC_CMAKE_BOOL_OFF=	BUILD_SHARED_LIBS
TEST_CMAKE_BOOL=	PCRE2_BUILD_TESTS

.include <bsd.port.options.mk>

.if ${ARCH} != "sparc64" && ${ARCH:Mmips64*} == "" && ${ARCH:Mriscv64*} == ""
CMAKE_ARGS+=	-DPCRE2_SUPPORT_JIT:BOOL=ON
.else
CMAKE_ARGS+=	-DPCRE2_SUPPORT_JIT:BOOL=OFF
.endif

.if ${PORT_OPTIONS:MDOCS}
PORTDOCS=	*
.endif

.if ! ${PORT_OPTIONS:MSTATIC}
USE_LDCONFIG=	yes
.endif

# Optional knobs that accept positive integer parameters (see pcrebuild(3)):

# Allow the use of very large patterns (> 64K) with the 8- and 16-bit
# libraries, at the expense of longer load times (possible values:
# 2 (default), 3, and 4):
.if defined(WITH_LINK_SIZE)
CMAKE_ARGS+=	-DPCRE2_LINK_SIZE:STRING=${WITH_LINK_SIZE}
.endif

# Control PCRE resource use by limiting the default number of times pcre_exec()
# can call match() during a single operation (default: 10 million):
.if defined(WITH_MATCH_LIMIT)
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT:STRING=${WITH_MATCH_LIMIT}
.endif

# This limit applies to all backtracks, whether or not they are nested. In
# some environments it is desirable to limit the nesting of backtracking (that
# is, the depth of tree that is searched) more strictly, in order to restrict
# the maximum amount of heap memory that is used (default: 10 million):
.if defined(WITH_MATCH_LIMIT_DEPTH)
CMAKE_ARGS+=	-DPCRE2_MATCH_LIMIT_DEPTH:STRING=${WITH_MATCH_LIMIT_DEPTH}
.endif

# Control PCRE resource use by limiting the nesting depth of parentheses in
# patterns compiled with pcre_compile() (default: 250):
.if defined(WITH_PARENS_NEST_LIMIT)
CMAKE_ARGS+=	-DPCRE2_PARENS_NEST_LIMIT:STRING=${WITH_PARENS_NEST_LIMIT}
.endif

#prevent regression test coredumps from causing failures on the

.ifndef(MAINTAINER_MODE)
CORELIMIT?=	/usr/bin/limits -Sc 0
.endif
TESTLOGS?=	RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \
		pcre_stringpiece_unittest pcrecpp_unittest

do-test:
	@${CP} -Rp ${WRKSRC}/test-driver ${WRKDIR}/.build
	@${CP} -Rp ${WRKSRC}/testdata ${WRKDIR}/.build
	@${CP} -p ${WRKSRC}/RunGrepTest ${WRKDIR}/.build
	@${CP} -p ${WRKSRC}/RunTest ${WRKDIR}/.build
	@cd ${WRKDIR}/.build ; \
	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} \
	${TEST_TARGET} ; \
	${CAT} Testing/Temporary/LastTest.log

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/pcre2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1589284219	1	TIMESTAMP = 1607244930
2	SHA256 (pcre2-10.35.tar.gz) = 8fdcef8c8f4cd735169dd0225fd010487970c1bcadd49e9b90e26c7250a33dc9	2	SHA256 (pcre2-10.36.tar.bz2) = a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c
3	SIZE (pcre2-10.35.tar.gz) = 2299082	3	SIZE (pcre2-10.36.tar.bz2) = 1722310

Removed Link Here

(-)a/devel/pcre2/files/patch-Makefile.am (-11 lines)
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




bin/pcre2-config
%%TEST%%bin/pcre2_jit_test
bin/pcre2grep
%%TEST%%bin/pcre2test
include/pcre2.h
include/pcre2posix.h
%%STATIC%%lib/libpcre2-16.a
%%NO_STATIC%%lib/libpcre2-16.so
%%NO_STATIC%%lib/libpcre2-16.so.0
%%NO_STATIC%%lib/libpcre2-16.so.0.10.1
%%STATIC%%lib/libpcre2-32.a
%%NO_STATIC%%lib/libpcre2-32.so
%%NO_STATIC%%lib/libpcre2-32.so.0
%%NO_STATIC%%lib/libpcre2-32.so.0.10.1
%%STATIC%%lib/libpcre2-8.a
%%NO_STATIC%%lib/libpcre2-8.so
%%NO_STATIC%%lib/libpcre2-8.so.0
%%NO_STATIC%%lib/libpcre2-8.so.0.10.1
%%STATIC%%lib/libpcre2-posix.a
%%NO_STATIC%%lib/libpcre2-posix.so
%%NO_STATIC%%lib/libpcre2-posix.so.2
%%NO_STATIC%%lib/libpcre2-posix.so.2.0.3
libdata/pkgconfig/libpcre2-16.pc
libdata/pkgconfig/libpcre2-32.pc
libdata/pkgconfig/libpcre2-8.pc

Return to bug 251642

Lines 2-10 Link Here

(-)b/devel/pcre2/Makefile (-24 / +41 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pcre2	4	PORTNAME= pcre2
5	PORTVERSION= 10.35	5	DISTVERSION= 10.36
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= SF/pcre/${PORTNAME}/${PORTVERSION}	7	MASTER_SITES= SF/pcre/${PORTNAME}/${DISTVERSION} \
		8	https://ftp.pcre.org/pub/pcre/ \
		9	ftp://ftp.pcre.org/pub/pcre/
8		10
9	MAINTAINER= krion@FreeBSD.org	11	MAINTAINER= krion@FreeBSD.org
10	COMMENT= Perl Compatible Regular Expressions library, version 2	12	COMMENT= Perl Compatible Regular Expressions library, version 2
Lines 12-65 COMMENT= Perl Compatible Regular Expressions library, version 2 Link Here
12	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENCE	15	LICENSE_FILE= ${WRKSRC}/LICENCE
14		16
15	USES= autoreconf libtool pkgconfig	17	USES= cmake tar:bzip2
16		18
17	GNU_CONFIGURE= yes	19	TEST_TARGET= test
18	USE_LDCONFIG= yes	20
19	INSTALL_TARGET= install-strip	21	CMAKE_ARGS= -DPCRE2_BUILD_PCRE2_16:BOOL=ON -DPCRE2_BUILD_PCRE2_32:BOOL=ON
20	CONFIGURE_ARGS= --enable-pcre2-16 --enable-pcre2-32
21		22
22	OPTIONS_DEFINE= DOCS	23	OPTIONS_DEFINE= DOCS STATIC TEST
		24	OPTIONS_SUB= yes
23	OPTIONS_RADIO= CLI	25	OPTIONS_RADIO= CLI
24	OPTIONS_RADIO_CLI= LIBEDIT READLINE	26	OPTIONS_RADIO_CLI= LIBEDIT READLINE
25		27
26	LIBEDIT_CONFIGURE_ENABLE= pcre2test-libedit	28	LIBEDIT_USES= libedit
27	LIBEDIT_USES= libedit	29	LIBEDIT_CMAKE_BOOL= PCRE2_SUPPORT_LIBEDIT
28		30	READLINE_USES= readline
29	READLINE_USES= readline	31	READLINE_CMAKE_BOOL= PCRE2_SUPPORT_LIBREADLINE
30	READLINE_CONFIGURE_ENABLE= pcre2test-libreadline	32	STATIC_CMAKE_BOOL_OFF= BUILD_SHARED_LIBS
		33	TEST_CMAKE_BOOL= PCRE2_BUILD_TESTS
31		34
32	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
33		36
34	.if ${ARCH} != "sparc64" && ${ARCH:Mmips64} == "" && ${ARCH:Mriscv64} == ""	37	.if ${ARCH} != "sparc64" && ${ARCH:Mmips64} == "" && ${ARCH:Mriscv64} == ""
35	CONFIGURE_ARGS+= --enable-jit	38	CMAKE_ARGS+= -DPCRE2_SUPPORT_JIT:BOOL=ON
36	.else	39	.else
37	CONFIGURE_ARGS+= --disable-jit	40	CMAKE_ARGS+= -DPCRE2_SUPPORT_JIT:BOOL=OFF
38	.endif	41	.endif
39		42
40	.if ${PORT_OPTIONS:MDOCS}	43	.if ${PORT_OPTIONS:MDOCS}
41	PORTDOCS= *	44	PORTDOCS= *
42	.endif	45	.endif
43		46
		47	.if ! ${PORT_OPTIONS:MSTATIC}
		48	USE_LDCONFIG= yes
		49	.endif
		50
44	# Optional knobs that accept positive integer parameters (see pcrebuild(3)):	51	# Optional knobs that accept positive integer parameters (see pcrebuild(3)):
45		52
46	# Allow the use of very large patterns (> 64K) with the 8- and 16-bit	53	# Allow the use of very large patterns (> 64K) with the 8- and 16-bit
47	# libraries, at the expense of longer load times (possible values:	54	# libraries, at the expense of longer load times (possible values:
48	# 2 (default), 3, and 4):	55	# 2 (default), 3, and 4):
49	.if defined(WITH_LINK_SIZE)	56	.if defined(WITH_LINK_SIZE)
50	CONFIGURE_ARGS+= --with-link-size=${WITH_LINK_SIZE}	57	CMAKE_ARGS+= -DPCRE2_LINK_SIZE:STRING=${WITH_LINK_SIZE}
51	.endif	58	.endif
52		59
53	# Control PCRE resource use by limiting the default number of times pcre_exec()	60	# Control PCRE resource use by limiting the default number of times pcre_exec()
54	# can call match() during a single operation (default: 10 million):	61	# can call match() during a single operation (default: 10 million):
55	.if defined(WITH_MATCH_LIMIT)	62	.if defined(WITH_MATCH_LIMIT)
56	CONFIGURE_ARGS+= --with-match-limit=${WITH_MATCH_LIMIT}	63	CMAKE_ARGS+= -DPCRE2_MATCH_LIMIT:STRING=${WITH_MATCH_LIMIT}
		64	.endif
		65
		66	# This limit applies to all backtracks, whether or not they are nested. In
		67	# some environments it is desirable to limit the nesting of backtracking (that
		68	# is, the depth of tree that is searched) more strictly, in order to restrict
		69	# the maximum amount of heap memory that is used (default: 10 million):
		70	.if defined(WITH_MATCH_LIMIT_DEPTH)
		71	CMAKE_ARGS+= -DPCRE2_MATCH_LIMIT_DEPTH:STRING=${WITH_MATCH_LIMIT_DEPTH}
57	.endif	72	.endif
58		73
59	# Control PCRE resource use by limiting the nesting depth of parentheses in	74	# Control PCRE resource use by limiting the nesting depth of parentheses in
60	# patterns compiled with pcre_compile() (default: 250):	75	# patterns compiled with pcre_compile() (default: 250):
61	.if defined(WITH_PARENS_NEST_LIMIT)	76	.if defined(WITH_PARENS_NEST_LIMIT)
62	CONFIGURE_ARGS+= --with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT}	77	CMAKE_ARGS+= -DPCRE2_PARENS_NEST_LIMIT:STRING=${WITH_PARENS_NEST_LIMIT}
63	.endif	78	.endif
64		79
65	#prevent regression test coredumps from causing failures on the	80	#prevent regression test coredumps from causing failures on the
Lines 67-79 CONFIGURE_ARGS+= --with-parens-nest-limit=${WITH_PARENS_NEST_LIMIT} Link Here
67	.ifndef(MAINTAINER_MODE)	82	.ifndef(MAINTAINER_MODE)
68	CORELIMIT?= /usr/bin/limits -Sc 0	83	CORELIMIT?= /usr/bin/limits -Sc 0
69	.endif	84	.endif
70	TESTLOGS?= RunGrepTest RunTest pcre_jit_test pcre_scanner_unittest \
71	pcre_stringpiece_unittest pcrecpp_unittest
72		85
73	do-test:	86	do-test:
74	@cd ${WRKSRC} ; \	87	@${CP} -Rp ${WRKSRC}/test-driver ${WRKDIR}/.build
75	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} check ; \	88	@${CP} -Rp ${WRKSRC}/testdata ${WRKDIR}/.build
76	for _l in ${TESTLOGS} ; do if ${TEST} -f $${_l}.log ; then \	89	@${CP} -p ${WRKSRC}/RunGrepTest ${WRKDIR}/.build
77	${PRINTF} "\n\n$${_l}.log\n\n\n" ; ${CAT} $${_l}.log ; fi ; done	90	@${CP} -p ${WRKSRC}/RunTest ${WRKDIR}/.build
		91	@cd ${WRKDIR}/.build ; \
		92	${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} ${MAKE_ARGS} \
		93	${TEST_TARGET} ; \
		94	${CAT} Testing/Temporary/LastTest.log
78		95
79	.include <bsd.port.mk>	96	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)b/devel/pcre2/pkg-plist (-17 / +18 lines)
1	bin/pcre2-config	1	bin/pcre2-config
		2	%%TEST%%bin/pcre2_jit_test
2	bin/pcre2grep	3	bin/pcre2grep
3	bin/pcre2test	4	%%TEST%%bin/pcre2test
4	include/pcre2.h	5	include/pcre2.h
5	include/pcre2posix.h	6	include/pcre2posix.h
6	lib/libpcre2-16.a	7	%%STATIC%%lib/libpcre2-16.a
7	lib/libpcre2-16.so	8	%%NO_STATIC%%lib/libpcre2-16.so
8	lib/libpcre2-16.so.0	9	%%NO_STATIC%%lib/libpcre2-16.so.0
9	lib/libpcre2-16.so.0.10.0	10	%%NO_STATIC%%lib/libpcre2-16.so.0.10.1
10	lib/libpcre2-32.a	11	%%STATIC%%lib/libpcre2-32.a
11	lib/libpcre2-32.so	12	%%NO_STATIC%%lib/libpcre2-32.so
12	lib/libpcre2-32.so.0	13	%%NO_STATIC%%lib/libpcre2-32.so.0
13	lib/libpcre2-32.so.0.10.0	14	%%NO_STATIC%%lib/libpcre2-32.so.0.10.1
14	lib/libpcre2-8.a	15	%%STATIC%%lib/libpcre2-8.a
15	lib/libpcre2-8.so	16	%%NO_STATIC%%lib/libpcre2-8.so
16	lib/libpcre2-8.so.0	17	%%NO_STATIC%%lib/libpcre2-8.so.0
17	lib/libpcre2-8.so.0.10.0	18	%%NO_STATIC%%lib/libpcre2-8.so.0.10.1
18	lib/libpcre2-posix.a	19	%%STATIC%%lib/libpcre2-posix.a
19	lib/libpcre2-posix.so	20	%%NO_STATIC%%lib/libpcre2-posix.so
20	lib/libpcre2-posix.so.2	21	%%NO_STATIC%%lib/libpcre2-posix.so.2
21	lib/libpcre2-posix.so.2.0.3	22	%%NO_STATIC%%lib/libpcre2-posix.so.2.0.3
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