From owner-svn-ports-all@freebsd.org Sun Mar 7 09:53:08 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CB4B560CFE; Sun, 7 Mar 2021 09:53:08 +0000 (UTC) (envelope-from tobik@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 4DtcGr2BTJz4bpH; Sun, 7 Mar 2021 09:53:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E2991461A; Sun, 7 Mar 2021 09:53:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1279r8Ml084734; Sun, 7 Mar 2021 09:53:08 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1279r7Or084731; Sun, 7 Mar 2021 09:53:07 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202103070953.1279r7Or084731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 7 Mar 2021 09:53:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567554 - in head: devel/gitlab-runner devel/gitlab-shell net/gitlab-agent X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: devel/gitlab-runner devel/gitlab-shell net/gitlab-agent X-SVN-Commit-Revision: 567554 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2021 09:53:08 -0000 Author: tobik Date: Sun Mar 7 09:53:07 2021 New Revision: 567554 URL: https://svnweb.freebsd.org/changeset/ports/567554 Log: Drop gomod-deps in favor of gomod-vendor USES=go has gomod-vendor that does the same. Let's not reinvent the wheel. Approved by: mfechner, swills Differential Revision: https://reviews.freebsd.org/D29080 Modified: head/devel/gitlab-runner/Makefile head/devel/gitlab-shell/Makefile head/net/gitlab-agent/Makefile Modified: head/devel/gitlab-runner/Makefile ============================================================================== --- head/devel/gitlab-runner/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/devel/gitlab-runner/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -203,10 +203,6 @@ post-patch: @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/ -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) - pre-build: @cd ${WRKSRC} && go-bindata \ -pkg docker \ Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/devel/gitlab-shell/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -27,7 +27,7 @@ GROUPS= git # for go dependencies USE_GITHUB= nodefault -# generated with: make gomod-deps +# generated with: make gomod-vendor # 38dd GH_TUPLE= \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ @@ -76,11 +76,6 @@ post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml ${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile - -# Build the go deps, use `pkg install modules2tuple` -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) pre-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build) Modified: head/net/gitlab-agent/Makefile ============================================================================== --- head/net/gitlab-agent/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/net/gitlab-agent/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -208,10 +208,6 @@ GO_TARGET= ./cmd/kas PLIST_FILES= bin/kas -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) - do-install: ${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas