From nobody Fri Apr 12 07:56:16 2024 X-Original-To: freebsd-ports@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 4VG85c5RKFz5GvPl for ; Fri, 12 Apr 2024 07:56:20 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VG85c36kbz42Gk; Fri, 12 Apr 2024 07:56:20 +0000 (UTC) (envelope-from mfechner@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712908580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wk4nvKUNDYWAyFh7e2vuaAlAuFvZhqzwhpcmAKOfZCY=; b=TWV2u2Tq++neTChZOEJ2GH7lAu5wjK9EsZeTV+YhXe/Grf3C7BNqewHEu1NQ9cCewVhqQc Ys1NGN5o0IMXpRZB4F4MgSMpKVo9VpFZ3nsluW+N8ECeRKTr8tQBxlwk586WC5ukouh96I Az3o9kCZ7gMdQAaSeEJUBGZv8XMHgT2TY2UsTvscWOqzGtY3KAkpmX1lOe0xUY1VOf1QNz w3nvul9gZ7T1/wzNQBejrWS+CMDC/MqtgUiCiXEuhKSyjTQCwrtsmYfIw6+ttsrR15R4WR P0MiQxNVtOtBA/ZqWrtFsjx+wuQEmF831UkQYL/2KStXfiZuUjU60uzGu8BAjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712908580; a=rsa-sha256; cv=none; b=D/oGvi2/baglJ3p3c75AccbmKI9Deu7WopSANn1byEMhxg2x5yH6JESEHekcZN2wnUGeth YtF+djBUkWbNpQIjw5stiIaKkmTa99/tfDELpmP88d/axLANAKN9DNSQRX+XSRqIchhPyv acuy61jqIINHDUHTnCkl2vnAOmfNB+2hsuQOxQENLjouxs6y9brXcZpIBadi3rnQtEQyEz lq467zAPay8nucC8GO9PGvrfDJx2mXL8PKFguC6jDugSrW/hWr5fLUEqONvUdzkcsizG8A culSH4NIa+otnLANNZvhUQ+vjyOBokH6w37qYdySO48TBTTAoZUNsSyHkG3iBQ== 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=1712908580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wk4nvKUNDYWAyFh7e2vuaAlAuFvZhqzwhpcmAKOfZCY=; b=x1E2g1irjnSZFiuiTjXCrm5dvU4jWLE6jO999dmOZDfJo56l6qTBX2KNOoi+WS8dTBFkyN lxptV/KN+mWZq1vHwXzhQavg1BqiFNfWO86bOIRUpdj6Ew1wPFZog+PBxSZVXpfT1fq9W3 ahOoxu23URe+4yCIdlfqdJhgPpVGZN9RTRhxdLD7Oix4atrDCyRdlxIkmraHzBisM5MmYR pGDJdgR7Edju+RoiHobTP7Odk8+4ssaUL0Xn05aOgeUcwg+imEWJsADf9hP3btoCSQCqdr E0K5m+Rdc9Yj9OLMJ5B5doYkX3elLWxM+aqqQqQdDzEqXGY8XWVweeVvxONpzA== Received: from [192.168.0.151] (unknown [212.108.150.113]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mfechner) by smtp.freebsd.org (Postfix) with ESMTPSA id 4VG85b4gDCzH2M; Fri, 12 Apr 2024 07:56:19 +0000 (UTC) (envelope-from mfechner@freebsd.org) Content-Type: multipart/alternative; boundary="------------9eXLhCgsRjioDV0k58TRzWBs" Message-ID: <0da7afa3-465f-4364-aad0-5b0932283b21@freebsd.org> Date: Fri, 12 Apr 2024 10:56:16 +0300 List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Package a second port (gitlab-ee instead of gitlab-ce) To: Gleb Popov Cc: "freebsd-ports@FreeBSD.org" References: <58745d45-46f3-4152-bc30-eee0794fe55c@freebsd.org> Content-Language: en-US From: Matthias Fechner In-Reply-To: This is a multi-part message in MIME format. --------------9eXLhCgsRjioDV0k58TRzWBs Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Am 12.04.2024 um 09:17 schrieb Gleb Popov: > - GL_PROJECT= gitlab-foos > + GL_PROJECT= gitlab > > part makes it use a completely different distfile. > > The problem is best solved by using FLAVORS, I guess. See > https://docs.freebsd.org/en/books/porters-handbook/book/#flavors thanks a lot for this. I have here a first draft. The idea is to rename www/gitlab-ce to www/gitlab and apply this: https://gitlab.fechner.net/mfechner/Gitlab/-/commit/c6e569cdcd2862fdffa05a73c9ebd8a5a78fa7a7 (if I rebase, the branch is here: https://gitlab.fechner.net/mfechner/Gitlab/-/commits/gitlab-ee) But if I execute poudriere with e.g.: poudriere bulk -t -p gitlab -j 132amd64 www/gitlab It is only building a package for the CE version and not for the EE version. Does the FreeBSD cluster would generate both package or must I modify there something else? Thanks a lot. Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook --------------9eXLhCgsRjioDV0k58TRzWBs Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
Am 12.04.2024 um 09:17 schrieb Gleb Popov:
- GL_PROJECT= gitlab-foos
+ GL_PROJECT= gitlab

part makes it use a completely different distfile.

The problem is best solved by using FLAVORS, I guess. See
https://docs.freebsd.org/en/books/porters-handbook/book/#flavors

thanks a lot for this.
I have here a first draft.
The idea is to rename www/gitlab-ce to www/gitlab and apply this:
https://gitlab.fechner.net/mfechner/Gitlab/-/commit/c6e569cdcd2862fdffa05a73c9ebd8a5a78fa7a7

(if I rebase, the branch is here: https://gitlab.fechner.net/mfechner/Gitlab/-/commits/gitlab-ee)

But if I execute poudriere with e.g.:
poudriere bulk -t -p gitlab -j 132amd64 www/gitlab

It is only building a package for the CE version and not for the EE version.
Does the FreeBSD cluster would generate both package or must I modify there something else?


Thanks a lot.

Gruß
Matthias

-- 

"Programming today is a race between software engineers striving to
build bigger and better idiot-proof programs, and the universe trying to
produce bigger and better idiots. So far, the universe is winning." --
Rich Cook
--------------9eXLhCgsRjioDV0k58TRzWBs--