From nobody Fri Feb 3 15:01:47 2023 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 4P7f4q4WRcz2pDWy; Fri, 3 Feb 2023 15:01: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 4P7f4q3nfSz4P6D; Fri, 3 Feb 2023 15:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675436507; 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=hBmLrVbN/4F4DLk2mReIcSf99GhdcQXKTIW4vut1Ewo=; b=WB6fFRh2OG0vsultuNS9HmD/YXFljYboYer0DOxBWAICGB5w1x51Av0yW47ElkW8l2Pnez 56JFnYisLN+JWZzfQWf4MZtj+VRNaUqevdnLvB2P3FsayfPuYCeCVCK/fb4KZlY5eNlB3R SY/fOsyJvphwTKvS48SEfbIGBOi1U57SmeYaK9mPYxxKbTbo70WeJGeY/INlMVE4VmxINk bX4S1LtjnfBq8krc2wtarJ7pfDrLsK7fH79grlPrGauOLCa/gwcwA2ReQOqJ2EAjDNehdM TA4NxyqVhxIAX0hE300/eXB6jImaofjZtDLG9Fn+UujPSEvkGNc7QqK6res08Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675436507; 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=hBmLrVbN/4F4DLk2mReIcSf99GhdcQXKTIW4vut1Ewo=; b=tvcW3jObsn873RIp67+a27Px48AIivdkoBU0Qqu5+z9WYggzKjsaxRRGAyZtt+L6oK/cNw dyOMMg27im127jo+ARJ/ZPFJu15DroUQDXWsJE0yGuu7tr/Mzcq+9m7vzlYTcA0F4uRujW 4MlzMM2aSpC6HcTSyX/jwAI65K4l2QcHVtVLScFADr4Tlh44nB/ElTwIOpv/FStpRV2hwg 4V5YA9PUk5sNgzqQkELYDEtUwqrpCkjAF3Dca2RucCobfIiFvUBNeusY+b0tSyTE2x5lYc KVbj4SzUPbGopnHWiNlbggF0Qd5jstw0zPMhIsFHLbsawuArlJP0Zi0mxLh22g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675436507; a=rsa-sha256; cv=none; b=gBikTNyLwzwr9Hc1vMQdZ2YTbfX+UrhFv0lyTqb/oIcV6mYSYWBigpSCoBnwqFNm3bPco6 u0MJQ/R5RHdN+aM6GJL3xG0L4NLaCSHdvLsRMNRXEak6NVZMEroycbP5tqDSRWWpLw1e2B 7D+1nuN4ImO6Gd6D27I/NQdraWgnWhRK0HtFy5iRey/i42YJ3CVu+nMTFhf+kWIHyQPEJF ilsJEfhtI6y4PqJWx2KINbv9OuSs+UkvwNLG4y46hPsl8sMB5F3bOk8RQzzWNlF4C/05HI rsX0MBuCFhQahx8QTI3FxhIDzTZM9q6sTL21uqBFh+H6zF4NWSkucgY17sCjBw== 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 4P7f4q2jXZzfCK; Fri, 3 Feb 2023 15:01:47 +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 313F1lNO052682; Fri, 3 Feb 2023 15:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313F1lT7052681; Fri, 3 Feb 2023 15:01:47 GMT (envelope-from git) Date: Fri, 3 Feb 2023 15:01:47 GMT Message-Id: <202302031501.313F1lT7052681@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: f9ba0a00fccc - main - www/gitlab-pages: simplify Makefile 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9ba0a00fccc399026105c4eb125ced955d40b47 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f9ba0a00fccc399026105c4eb125ced955d40b47 commit f9ba0a00fccc399026105c4eb125ced955d40b47 Author: Dmitri Goutnik AuthorDate: 2023-02-03 14:58:16 +0000 Commit: Matthias Fechner CommitDate: 2023-02-03 14:58:16 +0000 www/gitlab-pages: simplify Makefile Remove custom targets, just pulling go.mk directly from gitlab.com is enough and targets provided by go.mk work fine here. PR: 269303 --- www/gitlab-pages/Makefile | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index da241eeec460..c767ea0dd08b 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,8 +1,10 @@ PORTNAME= gitlab-pages PORTVERSION= 15.8.1 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= www +MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ +DISTFILES+= go.mod MAINTAINER= swills@FreeBSD.org COMMENT= Official GitLab Pages daemon @@ -19,25 +21,6 @@ GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitlab-pages/-/tags/ GL_COMMIT= 345ed7982842b70a17aed0b08dcee21af78b30df -# 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+= 900:go-post-fetch-gitlab -go-post-fetch-gitlab: - @${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 @@ -47,7 +30,4 @@ USE_RC_SUBR= gitlab_pages USERS= gitlab-pages GROUPS= gitlab-pages -do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/gitlab-pages ${STAGEDIR}${PREFIX}/bin/gitlab-pages - .include