From owner-svn-ports-all@freebsd.org Mon Oct 12 17:19:54 2020 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 957BF43C776 for ; Mon, 12 Oct 2020 17:19:54 +0000 (UTC) (envelope-from 010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C955j5HYWz4S9H for ; Mon, 12 Oct 2020 17:19:53 +0000 (UTC) (envelope-from 010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn; d=tarsnap.com; t=1602523192; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=JaiQm4wy6HvttfDEib+nmy5veqeO9kKtLTf89fIAhnM=; b=kptyErQCv49iWZM62Z6D1eYDCB67FRgAzPS6xomx/AOPVWb+hAvn550GmgaJSzkp ZFfSQbtOVDCTJDKCPQmLc+H0CrIDaQEG4WLZ6Z/I1pkR+C9qLnHPAmLWtrfhJagU7A7 3viWejScO3mCkD5b8OK1fRISZn4fJZ7m6c4b8X3I= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=224i4yxa5dv7c2xz3womw6peuasteono; d=amazonses.com; t=1602523192; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=JaiQm4wy6HvttfDEib+nmy5veqeO9kKtLTf89fIAhnM=; b=gxZ3zES3NdwYEeAeZR8IZ93a5Wz5xGKQhMF3bj8GGJzg4LF+igZ6ARdbLWUOj4p6 Ex1s4iA4nUJ4arZrsJD2Hm/1TN69CAGKMr2swGX8ixjSMHyrtU/2YklQcjVM1i9j7XN vlKjs5T2EEUXUZOKwW/3utqi6AOvqWRTZQookWcY= Subject: Re: svn commit: r552136 - in head: . devel devel/git devel/git-gui devel/git-lite To: Piotr Kubaj , Renato Botelho Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202010121603.09CG3imD069975@repo.freebsd.org> <20201012171429.GA9510@KGPE-D16> From: Colin Percival Message-ID: <010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@email.amazonses.com> Date: Mon, 12 Oct 2020 17:19:52 +0000 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20201012171429.GA9510@KGPE-D16> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-SES-Outgoing: 2020.10.12-54.240.8.237 Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-Rspamd-Queue-Id: 4C955j5HYWz4S9H X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn header.b=kptyErQC; dkim=pass header.d=amazonses.com header.s=224i4yxa5dv7c2xz3womw6peuasteono header.b=gxZ3zES3; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com designates 54.240.8.237 as permitted sender) smtp.mailfrom=010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com X-Spamd-Result: default: False [-1.17 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.014]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=ae7m2yrxjw65l2cqdpjxuucyrvy564tn,amazonses.com:s=224i4yxa5dv7c2xz3womw6peuasteono]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; NEURAL_HAM_LONG(-0.99)[-0.992]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.237:from]; NEURAL_HAM_SHORT(-0.97)[-0.967]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com]; RCVD_COUNT_ZERO(0.00)[0]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.240.8.237:from]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,010001751dd35d4c-1cb159f4-a199-4cc6-911a-638c998c98fd-000000@amazonses.com]; MAILMAN_DEST(0.00)[svn-ports-all] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 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: Mon, 12 Oct 2020 17:19:54 -0000 It also broke portsnap's index build. I don't know enough about port flavours to know if this is a bug in portsnap's index building or a problem somewhere else. Colin Percival On 10/12/20 10:14 AM, Piotr Kubaj wrote: > This broke bulk build: > [00:04:27] Warning: (java/eclipse): Error: java/eclipse depends on > nonexistent origin 'devel/git-lite' (moved to devel/git@lite); Please > contact maintainer of the port to fix this. > > On 20-10-12 16:03:44, Renato Botelho wrote: >> Author: garga >> Date: Mon Oct 12 16:03:44 2020 >> New Revision: 552136 >> URL: https://svnweb.freebsd.org/changeset/ports/552136 >> >> Log: >>  Convert git slave ports to flavors >> >>  Create git@lite and git@gui flavors to replace slave ports >> >>  PR:        250281 >>  Submitted by:    Yasuhiro KIMURA >>  Sponsored by:    Rubicon Communications, LLC (Netgate) >> >> Added: >>  head/devel/git/pkg-descr-gui >>     - copied unchanged from r552135, head/devel/git-gui/pkg-descr >>  head/devel/git/pkg-descr-lite >>     - copied unchanged from r552135, head/devel/git-lite/pkg-descr >> Deleted: >>  head/devel/git-gui/ >>  head/devel/git-lite/ >> Modified: >>  head/MOVED >>  head/devel/Makefile >>  head/devel/git/Makefile >> >> Modified: head/MOVED >> ============================================================================== >> --- head/MOVED    Mon Oct 12 15:33:45 2020    (r552135) >> +++ head/MOVED    Mon Oct 12 16:03:44 2020    (r552136) >> @@ -15640,6 +15640,8 @@ lang/spidermonkey68|lang/spidermonkey78|2020-10-01|Rep >> audio/zinf||2020-10-02|Has expired: Does not build, no upstream >> emulators/qemu-sbruno|emulators/qemu|2020-10-02|Has expired: Port will be >> removed in favor of emulators/qemu >> dns/knot2-lib|dns/knot3-lib|2020-10-04|Replaced by a more recent version >> +devel/git-gui|devel/git@gui|2020-10-12|Replaced by a flavor >> +devel/git-lite|devel/git@lite|2020-10-12|Replaced by a flavor >> graphics/libxatracker|graphics/mesa-gallium-xa|2020-10-12|Rename to have all >> gallium driver properly named >> sysutils/gnome-mount||2020-10-12|Replaced by gio/gvfs >> sysutils/syslog-ng322|sysutils/syslog-ng|2020-10-12|Has expired: Agreed upon >> upstream one year deprecation policy >> >> Modified: head/devel/Makefile >> ============================================================================== >> --- head/devel/Makefile    Mon Oct 12 15:33:45 2020    (r552135) >> +++ head/devel/Makefile    Mon Oct 12 16:03:44 2020    (r552136) >> @@ -784,9 +784,7 @@ >>     SUBDIR += git-cola >>     SUBDIR += git-delta >>     SUBDIR += git-extras >> -    SUBDIR += git-gui >>     SUBDIR += git-lfs >> -    SUBDIR += git-lite >>     SUBDIR += git-merge-changelog >>     SUBDIR += git-modes >>     SUBDIR += git-review >> >> Modified: head/devel/git/Makefile >> ============================================================================== >> --- head/devel/git/Makefile    Mon Oct 12 15:33:45 2020    (r552135) >> +++ head/devel/git/Makefile    Mon Oct 12 16:03:44 2020    (r552136) >> @@ -12,15 +12,28 @@ EXTRACT_ONLY=    ${DISTNAME}${EXTRACT_SUFX} \ >>         ${PORTNAME}-manpages-${DISTVERSION}${EXTRACT_SUFX} >> >> MAINTAINER=    garga@FreeBSD.org >> -COMMENT?=    Distributed source code management tool >> +.if ${FLAVOR:U} == default >> +COMMENT=    Distributed source code management tool >> +.elif ${FLAVOR:U} == gui >> +COMMENT=    Distributed source code management tool (GUI enabled flavor) >> +.elif ${FLAVOR:U} == lite >> +COMMENT=    Distributed source code management tool (lite flavor) >> +.endif >> >> LICENSE=    GPLv2 >> LICENSE_FILE=    ${WRKSRC}/COPYING >> >> +FLAVORS=    default gui lite >> +default_CONFLICTS_INSTALL=    git-gui git-lite >> +gui_CONFLICTS_INSTALL=        git git-lite >> +gui_DESCR=            ${.CURDIR}/pkg-descr-gui >> +gui_PKGNAMESUFFIX=        -gui >> +lite_CONFLISTS_INSTALL=        git git-gui >> +lite_DESCR=            ${.CURDIR}/pkg-descr-lite >> +lite_PKGNAMESUFFIX=        -lite >> + >> USES=        autoreconf gmake iconv shebangfix ssl tar:xz >> >> -CONFLICTS_INSTALL?=    git-gui-[0-9]* git-lite-[0-9]* >> - >> USERS=        git_daemon >> GROUPS=        git_daemon >> >> @@ -57,6 +70,12 @@ OPTIONS_DEFINE=    GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS >>         SEND_EMAIL NLS SUBTREE >> OPTIONS_DEFAULT=    CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \ >>             SUBTREE SVN >> +.if ${FLAVOR:U} == gui >> +OPTIONS_DEFAULT+=    GUI >> +.elif ${FLAVOR:U} == lite >> +OPTIONS_EXCLUDE=    GUI SVN GITWEB CONTRIB P4 CVS PERL >> +.endif >> + >> OPTIONS_SUB=    yes >> >> CONTRIB_DESC=    Install contributed scripts >> >> Copied: head/devel/git/pkg-descr-gui (from r552135, >> head/devel/git-gui/pkg-descr) >> ============================================================================== >> --- /dev/null    00:00:00 1970    (empty, because file is newly added) >> +++ head/devel/git/pkg-descr-gui    Mon Oct 12 16:03:44 2020    (r552136, >> copy of r552135, head/devel/git-gui/pkg-descr) >> @@ -0,0 +1,6 @@ >> +Git is a free and open source distributed version control system designed to >> +handle everything from small to very large projects with speed and efficiency. >> + >> +This version provides a package with GUI option enabled. >> + >> +WWW: https://git-scm.com/ >> >> Copied: head/devel/git/pkg-descr-lite (from r552135, >> head/devel/git-lite/pkg-descr) >> ============================================================================== >> --- /dev/null    00:00:00 1970    (empty, because file is newly added) >> +++ head/devel/git/pkg-descr-lite    Mon Oct 12 16:03:44 2020    (r552136, >> copy of r552135, head/devel/git-lite/pkg-descr) >> @@ -0,0 +1,6 @@ >> +Git is a free and open source distributed version control system designed to >> +handle everything from small to very large projects with speed and efficiency. >> + >> +This version provides the bare minimum git experience without any bindings. >> + >> +WWW: https://git-scm.com/ -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid