From nobody Sun Oct 16 21:23:45 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 4MrCmK3vj3z4g6hC; Sun, 16 Oct 2022 21:23:45 +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 4MrCmK1hyKz3StX; Sun, 16 Oct 2022 21:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665955425; 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=/CnLWmV8i12wNS1bdKIsPngomSXKRjXzdcIWdTllbEI=; b=Rljfz+HpqMuey9Vni9oucQrlkrVFpu5kt432lhDq9qfi5tZsVlyKg9VtLIw+FnyMCAR/E+ DDfl+tzo5dOW1ShLoMoJ1B+www6lozztMLOSXkpW9XiOriM9GjUJ2MuJ3tbfIBpKQdqXLD 5bnquXKI82gDQxvBtxFwCs4pObjMOE61D5Oax9nIKDI2uTds04QsmXvFMRpOGj8KMH2TNs 4xNZJKr2So83nyJmR/Or5wQtvfyxFfrNSJzev1vWOIi22r2LkSV17qzvcvj9S3b07cIx1h kP7PFLDKU9q8hnfHyPG2Gp34LBtarok5AylHVmLmpl/gFGWvx6StQM5oby7QSg== 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 4MrCmK0SC4zbYM; Sun, 16 Oct 2022 21:23:45 +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 29GLNjag045641; Sun, 16 Oct 2022 21:23:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29GLNiQi045640; Sun, 16 Oct 2022 21:23:45 GMT (envelope-from git) Date: Sun, 16 Oct 2022 21:23:45 GMT Message-Id: <202210162123.29GLNiQi045640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: efcf58c68689 - main - www/varnish7: Use upstream release archive and some improvements to port 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efcf58c686899a38a58822afb4098b98c3d20e41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665955425; 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=/CnLWmV8i12wNS1bdKIsPngomSXKRjXzdcIWdTllbEI=; b=PlqdJlOeyF0nd5u7lE7LyJQ0HCnqODZzHLBEkG102NbztouW/OACSA9gDZvGOta4JbaJkv jy22ZI0cYXpMJ7W+m4oVuair2AbVE7fC/hwI3VZ2XyY8nOmvnTmuheCTQ5oLCwzsagVh9D E7+lbureD93/Vya1o/Ij/zPgf5SjaFJw3eOGMdFmM2TL464Jfs6cNH+TVk4WbK3a4VGPja uHXlAxda1+S7hFWmQCkGB+1C8NKb2mb8CRLm+WrmhdjjOAJmgBRbQAO1tST/UKCsKfQQtG aOlKgqMZBRLTSVJe8qLTGLiBSpnOQ7uQSBWVKmoqJYy80KlOktxTPjfCUue8pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665955425; a=rsa-sha256; cv=none; b=KZEGISifrxrhXhZEKSygcIbV9gHHm3WJlnhUm787ZhayYL1rUG0YtnuO0uubdcCQufjKTA 8Q5PtOgPBCtfCGa//O7X3vdpMa6g7UAuTB/lDnI4/bCsLjYJIwAJeiE6RJyl1F/8EHXegy trRCOHFbMEu9l9KzQncC19hl6BC1ixGC6jC7wl1JbvvzrnjSS0bhIdvRhxCh+7Y5ycw3zt hJa5RHo2tokVRdlnG6fPo4VyPm/c30L+n/cldgUI91tfnZ6GorWDNPkB8aT3NPgR8brLS3 4VmMg+QqpkwqL+GVw0Rz375QPcpFhRFady3WduhrA50rKChtzqfz1uWg6Ir4sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=efcf58c686899a38a58822afb4098b98c3d20e41 commit efcf58c686899a38a58822afb4098b98c3d20e41 Author: Daniel Engberg AuthorDate: 2022-10-16 20:23:57 +0000 Commit: Daniel Engberg CommitDate: 2022-10-16 21:22:48 +0000 www/varnish7: Use upstream release archive and some improvements to port - Use upstream release archive as recommended by USE_GITHUB section in Porters Handbook - Remove USES= compiler as there's no need to modify configure script - Remove unneeded gmake and readline dependency definitions - Use USES= localbase instead of CFLAGS variable - Remove REINPLACE_CMD for GCC - Rearrange Makefile to follow Porters Handbook more closely and improve readability PR: 266467 Reviewed by: dbaio (maintainer) --- www/varnish7/Makefile | 42 ++++++++++++++++-------------------------- www/varnish7/distinfo | 6 +++--- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/www/varnish7/Makefile b/www/varnish7/Makefile index 5dc94fa2d1b5..8c9ba1d313c8 100644 --- a/www/varnish7/Makefile +++ b/www/varnish7/Makefile @@ -1,7 +1,7 @@ PORTNAME= varnish DISTVERSION= 7.2.0 -DISTVERSIONPREFIX= varnish- CATEGORIES= www +MASTER_SITES= https://varnish-cache.org/downloads/ PKGNAMESUFFIX= 7 MAINTAINER= dbaio@FreeBSD.org @@ -15,47 +15,37 @@ BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libpcre2-8.so:devel/pcre2 -USES= autoreconf compiler cpe gmake libedit libtool ncurses pathfix \ - pkgconfig python:3.6+,build readline shebangfix - -SUB_FILES= pkg-message - -CONFLICTS= varnish4 varnish6 - -SHEBANG_FILES= lib/libvcc/*.py lib/libvsc/*.py +USES= cpe libedit libtool localbase ncurses pathfix \ + pkgconfig python:3.6+,build shebangfix tar:tgz CPE_VENDOR= varnish-cache CPE_PRODUCT= varnish_cache -CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX} --without-dot +SHEBANG_FILES= lib/libvcc/*.py lib/libvsc/*.py USE_LDCONFIG= yes -INSTALL_TARGET= install-strip -TEST_TARGET= check -TEST_ARGS= TESTS_PARALLELISM=1 +USE_RC_SUBR= varnishd varnishlog varnishncsa +CONFLICTS= varnish4 varnish6 -USE_GITHUB= yes -GH_ACCOUNT= varnishcache -GH_PROJECT= varnish-cache +SUB_FILES= pkg-message USERS= varnish varnishlog GROUPS= varnish -USE_RC_SUBR= varnishd varnishlog varnishncsa +INSTALL_TARGET= install-strip +TEST_TARGET= check +TEST_ARGS= TESTS_PARALLELISM=1 + +CONFIGURE_ARGS= --localstatedir=${PREFIX} --without-dot + .if defined(NO_INET6) || defined(WITHOUT_INET6) -BAD_TESTS+= r00832 -EXTRA_PATCHES+= ${FILESDIR}/no-inet6.patch +BAD_TESTS= r00832 +EXTRA_PATCHES= ${FILESDIR}/no-inet6.patch .endif OPTIONS_DEFINE= DOCS -.include - post-patch: .if defined(BAD_TESTS) ${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|} .endif -.if ${CHOSEN_COMPILER_TYPE} == gcc - ${REINPLACE_CMD} -e '/-Wno-unknown-warning-option -Wno-implicit-fallthrough/d' ${WRKSRC}/configure.ac -.endif -.include +.include diff --git a/www/varnish7/distinfo b/www/varnish7/distinfo index a2e0171a14e0..c3c44b3703ca 100644 --- a/www/varnish7/distinfo +++ b/www/varnish7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663421158 -SHA256 (varnishcache-varnish-cache-varnish-7.2.0_GH0.tar.gz) = 7074f0c975fcc4a3cf4849b770838d0c1bbea48044e3ea1ab32d879e80df7368 -SIZE (varnishcache-varnish-cache-varnish-7.2.0_GH0.tar.gz) = 1979836 +TIMESTAMP = 1663440346 +SHA256 (varnish-7.2.0.tgz) = 1da8a97ed5f7b7d4d5e04fc5c96fc9a85cb3a20d076eba2b18951f4b306c9686 +SIZE (varnish-7.2.0.tgz) = 4018697