From nobody Thu Aug 28 14:29:00 2025 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 4cCP0X6NcVz666Gm; Thu, 28 Aug 2025 14:29: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCP0X5nklz40xG; Thu, 28 Aug 2025 14:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756391340; 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=Xc34yw6/3pV3r1Xk9v1jy87Dmr0A/mE4zPMZCArZxSk=; b=iU2+phDhE4LHRnGZIA9WnMi9YNQZ+axHL3oLwzJqFg5tJmkSo+LGEQ+rQ0XjClmz8v0WRi Q4bARtCbh45fYtPtZNWu9dxAW4Cw6cgas2fPuRPo8wc4vAGlWauQyjNpDZPFFS4xT6LxU1 U80RV0API3ke8mtmbFeS+kqgIxuMbbewkXUTcT64KiNQSIWH3ml709qKiTwSxxTW6ol/EE tXhfJELhJJ75iPqDTtlHM6swPCs2WDdLKxrQhazkXrK31tLZR6XPtDd/jrDPGuUdH87qtp QsazrlqZOm7s3WgWFrSHEOkwOxpVY+Enq20v3bOyGZIyP6d64fDFsoy/o3bsZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756391340; 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=Xc34yw6/3pV3r1Xk9v1jy87Dmr0A/mE4zPMZCArZxSk=; b=Pl71z1kGtuxlb/HnzIQUfA95qD/TpM4EaZC5ZNlOE6Op9K1dj2+ST/+Cf0kJd8mLTxTUKh N13+VySdm/0FnNBgep28puI8fpmT/l5M0b9yyyE96oDC50HmiKaXLNvdvrRWxP10ocQYB1 Gkfbdyn5z8JaxHSSkD59rEDkEyHK8Pw3nWnPNqy/Xa/R20HGmOZnShxNGnEubkTctOi8B3 OnBOYnghGn+UNBNhoAB7n1r1jpFpqmlucVDNzufpXC/Xs8iGRQb+hgrkgeJBDfvjUHKGvL 0NhuVlXnUeT01ygir1H+Rxl7OXR/+2ZLlv5krvsr3NsA1R2IDTvMHMtWZjkIfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756391340; a=rsa-sha256; cv=none; b=JcwD34KVxb80HLToZvBQr2zOdkX4a+Y/m/O2jtD0Vf+Nktt5SIMo7eOCqaemaBc235LpRx Kyq3SP9NnFAL5NB0ypYCSyfyWPoO5dEoHsyvHyow67jK9kbPfltZR055UrYQ+jSXq3E1vq 3S/7YsoBJrIt59HZ39M0gDSWmWtLdKDDzjfiLftTxc14ov64tfgEEDEHBMUDIo9bZ8g7gT n2b5ZI9QVq1WFxvBsQmHOQ5GT556/4qEIMIwh1YJj0LPaA16oEBXtyPnv+s6hJKtJ495xr xJmKdNdtLOMDEInOiy9Yhro2RrkOGWSQbGwPx8MbPaDeebXT/dzBIUvZOby1Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cCP0X54Dnz1Bp5; Thu, 28 Aug 2025 14:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57SET0vM098431; Thu, 28 Aug 2025 14:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57SET0UE098428; Thu, 28 Aug 2025 14:29:00 GMT (envelope-from git) Date: Thu, 28 Aug 2025 14:29:00 GMT Message-Id: <202508281429.57SET0UE098428@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 647f9b37f934 - main - sysutils/alloy: Improve port 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 647f9b37f934eb4ba1fffd964a8cbf456916d837 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=647f9b37f934eb4ba1fffd964a8cbf456916d837 commit 647f9b37f934eb4ba1fffd964a8cbf456916d837 Author: Vladimir Druzenko AuthorDate: 2025-08-28 14:19:49 +0000 Commit: Vladimir Druzenko CommitDate: 2025-08-28 14:28:36 +0000 sysutils/alloy: Improve port - Remove git from BUILD_DEPENDS - build fine without it. - Remove go version 1.24 - it's default version in ports. - Remove GH_PROJECT=alloy - it's default value. - Parametrize "alloy" with "${PORTNAME}" in multiple places. - Replace "v${PORTVERSION}" with "${GH_TAGNAME}" - suits better. - Remove unnecessary ";" and "/" at end of commands. - Fix warnings from portclippy and portlint. PR: 289140 Approved by: Zach Leslie (maintainer) --- sysutils/alloy/Makefile | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/sysutils/alloy/Makefile b/sysutils/alloy/Makefile index 66d21ba374ea..970e6662e812 100644 --- a/sysutils/alloy/Makefile +++ b/sysutils/alloy/Makefile @@ -1,7 +1,6 @@ PORTNAME= alloy +DISTVERSIONPREFIX= v DISTVERSION= 1.10.2 -DISTVERSIONPREFIX=v -PORTREVISION= 0 CATEGORIES= sysutils MAINTAINER= zach.leslie@grafana.com @@ -10,34 +9,31 @@ WWW= https://github.com/grafana/alloy LICENSE= MIT -BUILD_DEPENDS= git:devel/git - -USES= go:1.24,modules +USES= go:modules USE_GITHUB= yes GH_ACCOUNT= grafana -GH_PROJECT= alloy -USE_RC_SUBR= alloy +USE_RC_SUBR= ${PORTNAME} GO_MODULE= github.com/${GH_ACCOUNT}/${GH_PROJECT} GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} GO_TARGET= github.com/${GH_ACCOUNT}/${GH_PROJECT} -GO_BUILDFLAGS= -ldflags='-X github.com/grafana/alloy/internal/build.Version=v${PORTVERSION}' +GO_BUILDFLAGS= -ldflags='-X github.com/grafana/alloy/internal/build.Version=${GH_TAGNAME}' post-fetch: - @${ECHO_MSG} "===> Fetching ${GO_MODNAME}/syntax dependency"; + @${ECHO_MSG} "===> Fetching ${GO_MODNAME}/syntax dependency" (cd ${DISTDIR}/${DIST_SUBDIR}; [ -e syntax/go.mod ] || (\ - ${MKDIR} syntax/; \ - ${TAR} -xzf ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-${PORTVERSION}/syntax/go.mod; \ - ${CP} ${PORTNAME}-${PORTVERSION}/syntax/go.mod syntax/go.mod)) + ${MKDIR} syntax; \ + ${TAR} -xzf ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-${DISTVERSION}/syntax/go.mod; \ + ${CP} ${PORTNAME}-${DISTVERSION}/syntax/go.mod syntax/go.mod)) post-extract: - ${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/syntax ${GO_WRKSRC}/syntax; + ${CP} -r ${WRKDIR}/${PORTNAME}-${DISTVERSION}/syntax ${GO_WRKSRC} do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/alloy ${STAGEDIR}${PREFIX}/bin/alloy + ${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/example-config.alloy ${STAGEDIR}${PREFIX}/etc/alloy.flow.sample - ${MKDIR} ${STAGEDIR}/var/alloy + ${MKDIR} ${STAGEDIR}/var/${PORTNAME} .include