From nobody Wed Apr 3 14:29:19 2024 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 4V8nFD0v9Tz5GtyL; Wed, 3 Apr 2024 14:29:20 +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 4V8nFD0FGMz4dkR; Wed, 3 Apr 2024 14:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154560; 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=XlnbT8Di9P8ykjdRZoSecMJkSotIdlqLqTDnUywmMjw=; b=FVvgPFoohGAgakXK9p3ufyh9pONnb7k9Appl5LzhpoJarIx1iteiHJL1Zyen4XYXXIWyKN axZvajJ8A5Yedh9K9Jb3EZHFws9crZrVzPCG/yDZC/OAUOaiTtQ51zGzy1ZRa4wCJqUtUO LI+83x3kJ0rondlu8VJJNv2MUw0bYWTDr8Tu89WK2XH004z7fABJWFGWmODzho4zTD9vVk m/2o7mX90w0AwGWeziKe/0REbCuGkb5VfFTvqblX6hC0AwWc4pXJbQDKLRAda9L4IHL0Do kxLSmrv3T1pHz9jkR6we6mGAQdjs2D0n/PYjCH870/kI1p6y18eIPoZ0kcc2xQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712154560; a=rsa-sha256; cv=none; b=VCpD8d5hyesJkQVdBUbbUnkCdKa355UBeHqoMU+Ul/mpbVG1r+J8PxaYCOsiQ7h5vWl1Vg rhUu6HCZYEkAKyqrBn2p3uvzW8mruIMd76FJaUM7Ar141ZrSmhl3O1YzKSWnDOylNmiAoA hUcsn1yQb1AidGhjb2ssR7TfFClzwl474J+GzXVV3pfCiJM+sMzz6H0J3M3f8iCNW912ph ZU0fgzPtkDc3HfZIfh15KoOW51233NUek4LWSBjuWRpbwHQVcLmy3jlC8vHPzL4yJFDuXw gIMaIMjlJy+oVeqtTV9YTMdsgK4dQXFWjGnpzJpHFiIKzp2mktUcRd1k2MXSOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154560; 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=XlnbT8Di9P8ykjdRZoSecMJkSotIdlqLqTDnUywmMjw=; b=G8ZnsUr3yx/EksvykbqRRkMjBv+zAlt/z5D55ILzA9lEh7Io7/rtfxJs7PKFL9pxXGAOGN 5IN74akxJyslL1sVJh9Bu3v18biYwXEbYm/6aTPCcSe2Q/pnTGtdk04uF4NWUM9tdWsG86 mC/Tfv1noO2MnmZXKyNdiKqsSCju03Ylg0M8YHigrSVhzkl07miq3yYRyoVtISRSew6f83 XH7/v+avslo0JMIRRMOxjrc7H4+ZMYWekU0UkFbfARdzhZ56dtasCs2UJjwCtTlEiweyYE QHzP+WzrICa2MD5BuSfZatJDsu0bB0qdgG1LWvdYR6xb+IuuhIU8ur9/rwMJbA== 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 4V8nFC6v8Nzbs6; Wed, 3 Apr 2024 14:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433ETJ6x009824; Wed, 3 Apr 2024 14:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433ETJfC009821; Wed, 3 Apr 2024 14:29:19 GMT (envelope-from git) Date: Wed, 3 Apr 2024 14:29:19 GMT Message-Id: <202404031429.433ETJfC009821@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: 0ab48d13cccc - main - www/gitlab-ce: reorder lines to much as possible to make portclippy happy 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: 0ab48d13ccccefe5cafcf3cbd979fd4968dbb7be Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ab48d13ccccefe5cafcf3cbd979fd4968dbb7be commit 0ab48d13ccccefe5cafcf3cbd979fd4968dbb7be Author: Matthias Fechner AuthorDate: 2024-04-03 14:25:54 +0000 Commit: Matthias Fechner CommitDate: 2024-04-03 14:26:36 +0000 www/gitlab-ce: reorder lines to much as possible to make portclippy happy --- devel/gitaly/Makefile | 8 ++++---- devel/gitlab-runner/Makefile | 16 ++++++++-------- devel/gitlab-shell/Makefile | 10 ++++------ www/gitlab-ce/Makefile | 41 ++++++++++++++++++++--------------------- www/gitlab-pages/Makefile | 5 ++--- www/gitlab-workhorse/Makefile | 8 ++++---- 6 files changed, 42 insertions(+), 46 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index d165f5cf46ae..e122e40307a1 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 16.10.1 DISTVERSIONPREFIX= v +DISTVERSION= 16.10.1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -23,13 +23,13 @@ USES= cpe gmake go:modules,no_targets,1.22 iconv pkgconfig ssl CPE_VENDOR= gitlab +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org + MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} -USE_GITLAB= yes -GL_ACCOUNT= gitlab-org - # 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 diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index eeff52843e89..bb8f7654a7d3 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-runner -DISTVERSION= 16.10.0 DISTVERSIONPREFIX= v +DISTVERSION= 16.10.0 CATEGORIES= devel MASTER_SITES= https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm @@ -23,6 +23,11 @@ RUN_DEPENDS= bash:shells/bash \ git:devel/git USES= go:modules,1.22 +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org +USE_RC_SUBR= gitlab_runner + +GITBRANCH= 16-10-stable GO_MODULE= gitlab.com/gitlab-org/gitlab-runner _BUILD_DATE= $$(date -u +%Y-%m-%dT%H:%M:%S%z) @@ -33,9 +38,6 @@ GO_BUILDFLAGS= -ldflags=" \ -X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${_BUILD_DATE} \ -X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \ -s -w" -USE_GITLAB= yes -GL_ACCOUNT= gitlab-org -GITBRANCH= 16-10-stable # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy @@ -47,13 +49,11 @@ DISTFILES+= go.mod EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Nprebuilt*:} # --------------------------- -PLIST_FILES= bin/gitlab-runner - -USE_RC_SUBR= gitlab_runner - USERS= gitlab-runner GROUPS= gitlab-runner +PLIST_FILES= bin/gitlab-runner + post-patch: @${MKDIR} ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 7c84718c37e0..dc2a463a2a6b 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -18,15 +18,13 @@ USES= gmake go:modules,no_targets,1.22 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org -USERS= git -GROUPS= git - -#INSTALL_TARGET= install-strip -ALL_TARGET= build - MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} +ALL_TARGET= build + +USERS= git +GROUPS= git # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 24f5db72c97a..cfaa5bdc0412 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -286,32 +286,12 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ RUN_DEPENDS= ${MY_DEPENDS} -CONFLICTS_INSTALL= gitolite \ - gitolite2 \ - gogs \ - gitea \ - gitosis - USES= go:modules nodejs:env ruby shebangfix -USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss - -USERS= git -GROUPS= git - -NO_BUILD= yes - -NO_ARCH= yes - -OPTIONS_DEFINE= KERBEROS -OPTIONS_DEFAULT= KERBEROS - -KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 -KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 -KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off +USE_RC_SUBR= gitlab SHEBANG_FILES= scripts/build_qa_image \ scripts/build_gdk_image \ @@ -326,6 +306,25 @@ SHEBANG_FILES= scripts/build_qa_image \ qa/gdk/entrypoint \ qa/bin/test +CONFLICTS_INSTALL= gitolite \ + gitolite2 \ + gogs \ + gitea \ + gitosis + +NO_ARCH= yes +NO_BUILD= yes + +USERS= git +GROUPS= git + +OPTIONS_DEFINE= KERBEROS +OPTIONS_DEFAULT= KERBEROS + +KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 +KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 +KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off + post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index 0c5c5dd5ddf9..f52643bb0332 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -13,15 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules,1.22 -GO_MODULE= gitlab.com/gitlab-org/gitlab-pages USE_GITLAB= yes GL_ACCOUNT= gitlab-org +USE_RC_SUBR= gitlab_pages +GO_MODULE= gitlab.com/gitlab-org/gitlab-pages GO_BUILDFLAGS= -ldflags="-X 'main.VERSION=${PORTVERSION}' -X 'main.REVISION=${GL_TAGNAME}'" -USE_RC_SUBR= gitlab_pages - USERS= gitlab-pages GROUPS= gitlab-pages diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 6ddad411c980..915380230d97 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -14,15 +14,15 @@ BUILD_DEPENDS= git>=2.42.0:devel/git RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets,1.22 +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org +GL_PROJECT= gitlab-foss MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" MAKE_ENV+= ${GO_ENV} WRKSRC_SUBDIR= workhorse # found in work/gitlab-foss*/workhorse/go.mod #GO_MODULE= gitlab.com/gitlab-org/gitlab/workhorse -USE_GITLAB= yes -GL_ACCOUNT= gitlab-org -GL_PROJECT= gitlab-foss # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy @@ -42,11 +42,11 @@ go-post-fetch: ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) # --------------------------- +PLIST_DIRS= ${WWWDIR} PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-workhorse \ bin/gitlab-zip-cat \ bin/gitlab-zip-metadata -PLIST_DIRS= ${WWWDIR} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}