From owner-svn-ports-head@freebsd.org Mon Nov 23 16:17:58 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B3AF2EF800; Mon, 23 Nov 2020 16:17:58 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cfskt3jmvz4WVQ; Mon, 23 Nov 2020 16:17:58 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E2DA76E8; Mon, 23 Nov 2020 16:17:58 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ANGHwB7062275; Mon, 23 Nov 2020 16:17:58 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ANGHwrQ062273; Mon, 23 Nov 2020 16:17:58 GMT (envelope-from osa@FreeBSD.org) Message-Id: <202011231617.0ANGHwrQ062273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Mon, 23 Nov 2020 16:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556114 - head/www/unit X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: head/www/unit X-SVN-Commit-Revision: 556114 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2020 16:17:58 -0000 Author: osa Date: Mon Nov 23 16:17:57 2020 New Revision: 556114 URL: https://svnweb.freebsd.org/changeset/ports/556114 Log: Add more logic for regular expressions support, continue using devel/pcre2 by default. Bump PORTREVISION. Modified: head/www/unit/Makefile Modified: head/www/unit/Makefile ============================================================================== --- head/www/unit/Makefile Mon Nov 23 16:13:15 2020 (r556113) +++ head/www/unit/Makefile Mon Nov 23 16:17:57 2020 (r556114) @@ -3,7 +3,7 @@ PORTNAME= unit PORTVERSION= 1.21.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES?= https://unit.nginx.org/download/ @@ -21,14 +21,19 @@ CPE_PRODUCT= unit OPTIONS_DEFINE?= \ DEBUG \ IPV6 \ - PCRE2 \ SSL \ UNIXSOCK OPTIONS_DEFAULT?= IPV6 PCRE2 SSL UNIXSOCK +OPTIONS_RADIO+= REGEX +OPTIONS_RADIO_REGEX= NOPCRE PCRE PCRE2 + DEBUG_DESC= Enable debug logging DEVKIT_DESC= Install headers and library -PCRE2_DESC= Enable PCRE2 support +REGEX_DESC= Support regular expressions +NOPCRE_DESC= No support for Regular Expressions +PCRE_DESC= Regular Expressions via devel/pcre +PCRE2_DESC= Regular Expressions via devel/pcre2 SSL_DESC= Enable SSL/TLS UNIXSOCK_DESC= Enable unix sockets @@ -78,9 +83,16 @@ CONFIGURE_ARGS+=--debug CONFIGURE_ARGS+=--no-ipv6 .endif -.if empty(PORT_OPTIONS:MPCRE2) +.if ${PORT_OPTIONS:MNOPCRE} +CONFIGURE_ARGS+=--no-regex +.endif + +.if ${PORT_OPTIONS:MPCRE} CONFIGURE_ARGS+=--no-pcre2 -.else +LIB_DEPENDS+= libpcre.so:devel/pcre +.endif + +.if ${PORT_OPTIONS:MPCRE2} LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 .endif