From nobody Thu Mar 10 11:57:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A8DD21A01BA4; Thu, 10 Mar 2022 11:57:47 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDncq2VVsz5068; Thu, 10 Mar 2022 11:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646913467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qjnkw1mayz/B6YRdug/e76A9SYQF+RZ4sWoT7+MSy0=; b=uKnQqq40YGSCMnoMYeghSZQXMbnNSXyFhL5znu7YFtcZxXAHD5MnK8A80vYYGdCF3iwTy4 8PQYRDc7uWN3slLBPrdl/f05+U0N+RuALB9SKiO7ytE1c53OpcDo34IqvMW8VGJuAuwrob BMVRtWzVh/jFq1GOHpQAN56w3MiqCAhYZjnmtvSBBWozgF7sOn0wzMVo5J+GEJcTlFwqnl MseXDFbhghCVrYA/gvBcXpGO6SrDt0IyI7exVD6ctZfVJ0WF4asN25M3iCa7pHKtu3bJnx 1X7SHamQXF2uSY26LsndkkKC4AAXj2wo3Mf+I375SfN6k2t0XYa10gqI5e4MkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6F642471A; Thu, 10 Mar 2022 11:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22ABvk7p072088; Thu, 10 Mar 2022 11:57:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ABvkeK072087; Thu, 10 Mar 2022 11:57:46 GMT (envelope-from git) Date: Thu, 10 Mar 2022 11:57:46 GMT Message-Id: <202203101157.22ABvkeK072087@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 71b077b01e59 - main - www/wget2: fix dependencies and modernize options handling List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71b077b01e59bae35d750e908590ddde46be5f43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646913467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qjnkw1mayz/B6YRdug/e76A9SYQF+RZ4sWoT7+MSy0=; b=KgO+3evVIOWUO/TQuU2c7OTqyS//UOeEvrq7vdhfLM+hPcOuJWp8FPe/GU38i3y9XNtbib fJmqITb2yDyKyuR2q6ndBOw6n9l3gr6kN45nK8NeciNqjbCUhqaDwHHPaauhEnZym4J9oG heGTjHBnaV91f2CAnCKu2a+u0gjCKmw71Oyr+6Ck1Ei2o2GMaWLvnJMPhWRu5wWVHDOE1V 3RId3wHaozymkLVhZm8eACfsSV6B7i2a1nRBrERArITjtYk6ytnF6HaRAgQePdrQWZJWO7 JuBdB9uUn7SzWIiMJKYrJjuLCmO/tI1xV2SUEzydaIF4qBbcNsP5TPyC5/+33w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646913467; a=rsa-sha256; cv=none; b=JYBQ7mTsFFQ8pdtagJIJlbjDq2+FLwmfFmErlIQlkx2oPxvyROpQtxoUObafHvzvrl6R2F vOfOEcAXyLxEQ1S57RokwgB4yv3hgZTD+qw6PsMzxg20X/ZxfWLeIw2EmTcXbEa65nNHIC 4O4oELwYve2RYBkiZ8XQHm6flGZOWZfRZWWG5Do3Eyb3gqh+s2Qlu1OQ1w3FE5q3u44gdV Rz3EEL1IF/8b+uzU1qKnmcijS6YXAHBl/mPJTuPAcAuGwQmKjkFNGkHJ9ykT82IOhPkD07 8sQoWICV2OTBpugzUpfIN+n2VhaGwoYCuUAMwy9yGUW1GnsODwgMgK+0oCfP7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=71b077b01e59bae35d750e908590ddde46be5f43 commit 71b077b01e59bae35d750e908590ddde46be5f43 Author: Dmitry Marakasov AuthorDate: 2022-03-09 19:58:37 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-10 11:22:56 +0000 www/wget2: fix dependencies and modernize options handling - Fix unaccounted depends: - gnutls is needed for libmicrohttp (TEST option) support. - when SSL support is disabled, libnettle is needed for hashing and checksumming. - Fix configure argument name for lzip, help is incorrect about it. - Completely convert to options helpers by introducing NOSSL pseudooption. --- www/wget2/Makefile | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/www/wget2/Makefile b/www/wget2/Makefile index fad00175dd48..e98d56a450fa 100644 --- a/www/wget2/Makefile +++ b/www/wget2/Makefile @@ -1,6 +1,6 @@ PORTNAME= wget2 DISTVERSION= 2.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= GNU/wget @@ -16,13 +16,13 @@ USES= autoreconf charsetfix cpe iconv libtool:build localbase pkgconfig tar:lz CPE_VENDOR= gnu CPE_PRODUCT= wget GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-lzip # not in ports yet +CONFIGURE_ARGS= --without-lz # not in ports yet INSTALL_TARGET= install-strip USE_LDCONFIG= yes OPTIONS_DEFINE= IDN MANPAGES DOXYGEN NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS OPTIONS_RADIO= SSL PCRE -OPTIONS_RADIO_SSL=GNUTLS OPENSSL # WOLFSSL +OPTIONS_RADIO_SSL=GNUTLS OPENSSL NOSSL # WOLFSSL OPTIONS_RADIO_PCRE=PCRE1 PCRE2 OPTIONS_DEFAULT=IDN MANPAGES OPENSSL NLS PSL NGHTTP2 BROTLI ZSTD GPGME TEST HSTS OPTIONS_SUB= yes @@ -72,27 +72,26 @@ GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme TEST_TEST_TARGET= check TEST_CONFIGURE_WITH= libmicrohttpd -TEST_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd +TEST_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd \ + libgnutls.so:security/gnutls TEST_TEST_DEPENDS= p5-HTTP-Daemon>=0:www/p5-HTTP-Daemon \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL -.include - -.if ${PORT_OPTIONS:MOPENSSL} -USES+= ssl -CONFIGURE_ARGS+=--with-ssl=openssl --with-openssl -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -.elif ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:security/gnutls -CONFIGURE_ARGS+=--with-ssl=gnutls -.elif ${PORT_OPTIONS:MWOLFSSL} -BROKEN= does not build: use of undeclared identifier WOLFSSL_ALPN_CONTINUE_ON_MISMATCH -LIB_DEPENDS+= libwolfssl.so:security/wolfssl -CONFIGURE_ARGS+=--with-ssl=wolfssl -.else -CONFIGURE_ARGS+=--with-ssl=none -.endif +OPENSSL_CONFIGURE_ON= --with-ssl=openssl --with-openssl +OPENSSL_USES= ssl +OPENSSL_CPPFLAGS= -I${OPENSSLINC} +OPENSSL_LDFLAGS= -L${OPENSSLLIB} + +GNUTLS_CONFIGURE_ON= --with-ssl=gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls + +WOLFSSL_CONFIGURE_ON= --with-ssl=wolfssl +WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl +WOLFSSL_BROKEN= does not build: use of undeclared identifier WOLFSSL_ALPN_CONTINUE_ON_MISMATCH + +NOSSL_DESC= Disable SSL support +NOSSL_LIB_DEPENDS= libnettle.so:security/nettle # still required libnettle for hashing and checksumming +NOSSL_CONFIGURE_ON= --with-ssl=none post-patch-MANPAGES-off: @${REINPLACE_CMD} -e '/AC_CHECK_PROGS/ s|pandoc|&-not-found|' ${WRKSRC}/configure.ac