From owner-svn-ports-all@freebsd.org Mon Nov 16 20:36:25 2020 Return-Path: Delivered-To: svn-ports-all@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 2276E471D7E; Mon, 16 Nov 2020 20:36:25 +0000 (UTC) (envelope-from amdmi3@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 4CZgpH183Qz4Zxk; Mon, 16 Nov 2020 20:36:23 +0000 (UTC) (envelope-from amdmi3@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 93A2F14293; Mon, 16 Nov 2020 20:36:22 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AGKaM79043394; Mon, 16 Nov 2020 20:36:22 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AGKaMA6043393; Mon, 16 Nov 2020 20:36:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202011162036.0AGKaMA6043393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 16 Nov 2020 20:36:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555515 - head/ftp/wget X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/ftp/wget X-SVN-Commit-Revision: 555515 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2020 20:36:25 -0000 Author: amdmi3 Date: Mon Nov 16 20:36:22 2020 New Revision: 555515 URL: https://svnweb.freebsd.org/changeset/ports/555515 Log: - Handle two missing dependencies, pcre2 and nettle - Improve PCRE handling in options, add NTLM option - Use pkg-config unconditionally, it's used for detecting all depends and is required for proper pcre2 detection - Use USES=localbase instead of duplicate CPPFLAGS/LDFLAGS for most options PR: 251189 Approved by: vd (maintainer) Modified: head/ftp/wget/Makefile Modified: head/ftp/wget/Makefile ============================================================================== --- head/ftp/wget/Makefile Mon Nov 16 20:36:17 2020 (r555514) +++ head/ftp/wget/Makefile Mon Nov 16 20:36:22 2020 (r555515) @@ -3,6 +3,7 @@ PORTNAME= wget DISTVERSION= 1.20.3 +PORTREVISION= 1 CATEGORIES= ftp www MASTER_SITES= GNU @@ -15,15 +16,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL -USES= charsetfix cpe iconv tar:lz +USES= charsetfix cpe iconv localbase pkgconfig tar:lz CPE_VENDOR= gnu GNU_CONFIGURE= yes OPTIONS_SUB= yes -OPTIONS_RADIO= SSL +OPTIONS_RADIO= SSL PCRE OPTIONS_RADIO_SSL=GNUTLS OPENSSL -OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS PCRE PSL -OPTIONS_DEFAULT=IDN MANPAGES OPENSSL +OPTIONS_RADIO_PCRE=PCRE1 PCRE2 +OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NLS PSL NTLM +OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS DOCS_DESC= Install info page DOCS_CONFIGURE_ENV= MAKEINFO="${MAKEINFO}" @@ -32,8 +34,6 @@ DOCS_USES= makeinfo IDN_LIB_DEPENDS= libidn2.so:dns/libidn2 \ libunistring.so:devel/libunistring -IDN_CPPFLAGS= -I${LOCALBASE}/include -IDN_LDFLAGS= -L${LOCALBASE}/lib IDN_CONFIGURE_ENABLE= iri IDN_CONFIGURE_ON= --with-libidn=${LOCALBASE} \ --with-libunistring-prefix=${LOCALBASE} @@ -50,18 +50,23 @@ METALINK_LIB_DEPENDS= libmetalink.so:misc/libmetalink NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -NLS_CPPFLAGS= -I${LOCALBASE}/include -NLS_LDFLAGS= -L${LOCALBASE}/lib PCRE_DESC= Support Perl regular expressions in addition to POSIX -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_CPPFLAGS= -I${LOCALBASE}/include -PCRE_LDFLAGS= -L${LOCALBASE}/lib -PCRE_CONFIGURE_ENABLE= pcre +PCRE1_DESC= Support PCRE style regular expressions +PCRE1_LIB_DEPENDS= libpcre.so:devel/pcre +PCRE1_CONFIGURE_ENABLE= pcre + +PCRE2_DESC= Support PCRE2 style regular expressions +PCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 +PCRE2_CONFIGURE_ENABLE= pcre2 + PSL_CONFIGURE_WITH= libpsl PSL_LIB_DEPENDS= libpsl.so:dns/libpsl +NTLM_DESC= Support NTLM authorization +NTLM_CONFIGURE_ENABLE= ntlm + .include .if ${PORT_OPTIONS:MOPENSSL} @@ -70,11 +75,11 @@ CONFIGURE_ARGS+=--with-ssl=openssl --with-libssl-prefi CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .elif ${PORT_OPTIONS:MGNUTLS} -USES+= pkgconfig LIB_DEPENDS+= libgnutls.so:security/gnutls CONFIGURE_ARGS+=--with-ssl=gnutls -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +. if ${PORT_OPTIONS:MNTLM} +LIB_DEPENDS+= libnettle.so:security/nettle +. endif .else CONFIGURE_ARGS+=--without-ssl .endif