From nobody Sun Jul 24 17:59:00 2022 X-Original-To: dev-commits-ports-all@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 4LrWBr48dwz4X9Ds; Sun, 24 Jul 2022 17:59:00 +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 4LrWBr3Mjdz3QZl; Sun, 24 Jul 2022 17:59:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658685540; 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=SpnGeJN2szDMw0uEse2h896yrWW6ImebkY9wDYvwg5c=; b=WmqiqU8RMI7FWjb775ynBeb6gcCTHoxgJclxEG/hvT+CN4f9cIOUSZpUYtM2ODBtBYjfo5 PPMGAVcfkMMTzp86Y5TIwEnCEzTQekpqlbdshOUr8mnL02d4Z6/XW+6uTQz0BBo4m1KPfF 7pS/3RqjhG+tpaCfTqUQPY7YWX9p0Bs95IkAOgPyqF+QoKzePJUwWQR2KIIbLRAwEIGipV 9xhasbjCSYTXflrZzOfRxLdfWBwAQ1R7rKDRBlNukpbTW03Va0cjFpzOCdG5A6rRGBlAKZ oQM9CsoykNn7P2L321OCpnl8qDp4XTFgqG6VIt5npWsQb6V7VISJIJVF2ke9ng== 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 4LrWBr2FRTzRf4; Sun, 24 Jul 2022 17:59:00 +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 26OHx0Mm096591; Sun, 24 Jul 2022 17:59:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OHx0o9096590; Sun, 24 Jul 2022 17:59:00 GMT (envelope-from git) Date: Sun, 24 Jul 2022 17:59:00 GMT Message-Id: <202207241759.26OHx0o9096590@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: fb665ff9ffbb - main - www/adguardhome: Set version using GO_BUILDFLAGS List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb665ff9ffbbf77084e4bcaa48b2c6eb2fb66c55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658685540; 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=SpnGeJN2szDMw0uEse2h896yrWW6ImebkY9wDYvwg5c=; b=wEliJ6Rx90GOE2cTVB/oD5khbspQcnw+qn1IAONYZpqEZaa1xo7rnV+4F6iKDxgc4fxdFw rJBpUHKHX4EoHqovDM+HRd7FzTn4vgE66RZRgueK5TfNUmRdCms3DnmbbPJs8iZKXlNqZf MatpusuL+8RYa+pWuJHFjkIXwOgHAdtrOEyICYE590WykBR/qoZKQBM5/d6Vhr5zal5/7W QloeOvgYkW+p18iymPopDc3l4FboaXPzEsdkkyiJUs789PMYpNa79jhRwSnfmRu1gA+uHk xtS/tufvzvXCjzJIuMnNKBpaQlHWtDkPFcW5x9SbK2iqt45GAew8b/ZhaQbAYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658685540; a=rsa-sha256; cv=none; b=c9Pht+MLpSy0kXlRXrbF7JWS/lPpqzeTQYWbtb3aa9o7MjtmqqqPc/sGHOZhS2TEbBP0mb kztID+/EquzS5SDmkrBkYMXUs7Ki0MV+Br+J3sD4T0X1Z+0HByHu/1FJFS6AZTPcfTYtXB F7VJOMWFq5BelrArVumeGwRmvVubhvG3b/sajQL49kj7PbhaA2ld/iLnW9vEHYlQa3fBPy yFXqvmabM8DsqCYdwp0w1YauL1Z0DNVE8XoGdhcT/1tY+KFvg5vz75RPd99JsaK3x/ZLFk x2w9/rIo4+NDU0f6ZpnR0ZCW2ZDgyTbuhPNEUKMgMv1KlU4DONAt0Q3YCefndA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb665ff9ffbbf77084e4bcaa48b2c6eb2fb66c55 commit fb665ff9ffbbf77084e4bcaa48b2c6eb2fb66c55 Author: Yuri Victorovich AuthorDate: 2022-07-24 17:58:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-24 17:58:03 +0000 www/adguardhome: Set version using GO_BUILDFLAGS Suggested by: dmgk@ --- www/adguardhome/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/www/adguardhome/Makefile b/www/adguardhome/Makefile index 52cadb15f9b9..ca7dbd134b77 100644 --- a/www/adguardhome/Makefile +++ b/www/adguardhome/Makefile @@ -15,6 +15,7 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USES= cpe go:modules GO_MODULE= github.com/AdguardTeam/AdGuardHome +GO_BUILDFLAGS= -ldflags="-s -w -X github.com/AdguardTeam/AdGuardHome/internal/version.version=${DISTVERSION}" # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774 # to rebuild the deps archives: # 1. set DEV_UPDATE_MODE=yes @@ -31,10 +32,6 @@ USE_RC_SUBR= ${PORTNAME} CPE_VENDOR= adguard -post-patch: - # workaround for https://github.com/AdguardTeam/AdGuardHome/issues/4774 - @${REINPLACE_CMD} -e 's|version string|version string = "${PORTVERSION}"|' ${WRKSRC}/internal/version/version.go - .if (${DEV_UPDATE_MODE} == "yes") BUILD_DEPENDS= npm:www/npm \ yarn:www/yarn