From nobody Mon Jan 30 21:31:46 2023 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 4P5Lwf3ydyz3cd2y; Mon, 30 Jan 2023 21:31:46 +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 4P5Lwf3NY6z433r; Mon, 30 Jan 2023 21:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675114306; 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=M6MUs3yBHCfE8w3YpqbI/9EeAlx830gVDFT3IgnGLEU=; b=bTZM9wgBtwnZ32bvdxEJaBUFq+Gp3ybgvkp+MPr7vZn1KXnZAU5K8sdUUParMGqISR01FU K1UCy9c3amm39efazHnCF+scaN4epyOxxsw7R4MW9sVqIi4TTCpOiEsSHnZTgLeoYmTkBF ugpZzfq82Zm/ZjkFlVIlDk2iYPD5ORWEqZigYRchRLFgF7+HH2qMOsgRmrCShJwTjAyFzM 57uTtGQ5sXxJ9LNIviEYSbyMSyJBfCWu9IEgGk29NuIQVhNDF8p6cb+azDYaHMxCfO2R4Y XcgcYrzOgnzIHeXdv5BAPnOCCbly1LTY17YRdbJc69+ofwT9Dv9gbnXiWa70mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675114306; 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=M6MUs3yBHCfE8w3YpqbI/9EeAlx830gVDFT3IgnGLEU=; b=K6uKAK/9/h8cxeJ7QYjUFkVWJblx7zcL84+B+WvuZCkgyDEtMFhIymoLLP6949D67IfN/n JQ6d4sXZMOkiL4EKl8tM71BTc/th56/ICy39HG8Laie+5jI8utlgB1VNKxJuw8qRmVslB/ SB/zKkheKmiJaFfV2UsMH3CsuEc+poA5vFYDrXVsIpotdTTx+vRGFtgJ+1IbEeL9Gr0p2i iVkqISj3PGjrih6u7NM5bejFcrkAUf5LXUvDb8rDeJ0DDMZ1CA1MbZ4BwYnUntac1BiKcU J1jeGyXUwWxYTGCyp8KAhzkM/bXMH17YZDwJ3zX8HiLbNccdTjrBY5LvRKS/rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675114306; a=rsa-sha256; cv=none; b=a3jVLYXTjjRoP5Y9/tsF1YR6d4coTtSqFMRrcijkaXcWBnCazRlw4PD70h6ASgT/Jgx45B U4R2osf3PbOaBNtlHLBv8VnlDq30h7ZdqfPOMbbJ9LlBsMyJY8o5ZZq1kftMVy00k7zC/c FtnISaELvHb+JwOFqc26/Fu3EMwoWkkDNYMn7bIc9hROHIpKDe62XZYL5NUgtUNQTTssgp RKvgHGYya75bGlwyX0ZVUVdYBSYneYPQGzct6MUFj/EP5w0KDx+0GQv4+/247BqN4jl53g PeCdjdUZxSJjm21TLAt0vjW8m7WfWNXDs/wVyUn3RU4yCGPuOMPZ6v2lsEVQAg== 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 4P5Lwf29snzNkB; Mon, 30 Jan 2023 21:31: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 30ULVkuA001222; Mon, 30 Jan 2023 21:31:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ULVkW6001221; Mon, 30 Jan 2023 21:31:46 GMT (envelope-from git) Date: Mon, 30 Jan 2023 21:31:46 GMT Message-Id: <202301302131.30ULVkW6001221@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: bd7b119c2f9e - main - www/gitlab-pages: update to 15.7.5 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd7b119c2f9e4b278215bca23fcdc785a4167817 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd7b119c2f9e4b278215bca23fcdc785a4167817 commit bd7b119c2f9e4b278215bca23fcdc785a4167817 Author: Matthias Fechner AuthorDate: 2023-01-30 21:13:00 +0000 Commit: Matthias Fechner CommitDate: 2023-01-30 21:25:39 +0000 www/gitlab-pages: update to 15.7.5 Required for gitlab-ce 15.7 update Changelog: https://gitlab.com/gitlab-org/gitlab-pages/-/blob/master/CHANGELOG.md --- www/gitlab-pages/Makefile | 34 +++++++++++++++++++++++++++------- www/gitlab-pages/distinfo | 10 +++++----- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 98db0a1217af..831feca1e9ef 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,6 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 1.63.0 -PORTREVISION= 1 +PORTVERSION= 15.7.5 DISTVERSIONPREFIX= v CATEGORIES= www @@ -11,11 +10,34 @@ WWW= https://gitlab.com/gitlab-org/gitlab-pages LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake go:modules +USES= go:modules GO_MODULE= gitlab.com/gitlab-org/gitlab-pages -GO_BUILDFLAGS= -ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}" -GO_PKGNAME= gitlab.com/gitlab-org/gitlab-pages +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org +# Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/ +GL_COMMIT= 5830a8685703e74b9a2d7736c139c255b6a9a9be + +# for go dependencies +# Gitlab hosts there dependencies on their own platform and not on go-proxy +# so we download the required go.mod file from gitlab +# lines are taken from go.mk +# --------------------------- +FETCH_DEPENDS= ${GO_CMD}:${GO_PORT} \ + ca_root_nss>0:security/ca_root_nss +MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ +DISTFILES+= go.mod +DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} +EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} +_USES_fetch+= 800:go-post-fetch +go-post-fetch: + @${ECHO_MSG} "===> Fetching ${PORTNAME} dependencies"; + @(cd ${DISTDIR}/${DIST_SUBDIR}; \ + [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ + ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) +# --------------------------- + +GO_BUILDFLAGS= -ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_COMMIT}'" PLIST_FILES= bin/gitlab-pages @@ -24,8 +46,6 @@ USE_RC_SUBR= gitlab_pages USERS= gitlab-pages GROUPS= gitlab-pages -GO_BUILDFLAGS+= --ldflags="-X main.VERSION=${PORTVERSION} -X main.REVISION=${GITHASH}" - do-install: ${INSTALL_PROGRAM} ${WRKDIR}/bin/gitlab-pages ${STAGEDIR}${PREFIX}/bin/gitlab-pages diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index b78af2262ef0..b112df0190e5 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1669459268 -SHA256 (go/www_gitlab-pages/gitlab-pages-v1.63.0/v1.63.0.mod) = 407883ba322b73d1526b585fb5a2570826c39759adf176965e8a37b1cf664f2d -SIZE (go/www_gitlab-pages/gitlab-pages-v1.63.0/v1.63.0.mod) = 2938 -SHA256 (go/www_gitlab-pages/gitlab-pages-v1.63.0/v1.63.0.zip) = 3727d65bb2fbd4e32899ae6c9564218aebbf2f66102daedc490023a4430ba1f4 -SIZE (go/www_gitlab-pages/gitlab-pages-v1.63.0/v1.63.0.zip) = 368380 +TIMESTAMP = 1675107900 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0/go.mod) = 407883ba322b73d1526b585fb5a2570826c39759adf176965e8a37b1cf664f2d +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0/go.mod) = 2938 +SHA256 (go/www_gitlab-pages/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0.tar.gz) = acc4e14c002479360875e5a5e8d92c401386b840085bad18bacde6a56cf2cb67 +SIZE (go/www_gitlab-pages/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0/gitlab-org-gitlab-pages-5830a8685703e74b9a2d7736c139c255b6a9a9be_GL0.tar.gz) = 227264