Date: Mon, 12 Oct 2020 17:19:52 +0000 From: Colin Percival <cperciva@tarsnap.com> To: Piotr Kubaj <pkubaj@anongoth.pl>, Renato Botelho <garga@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r552136 - in head: . devel devel/git devel/git-gui devel/git-lite Message-ID: <010001751dd35d38-e416c986-3689-4b2b-8f2d-8e9dca006bc7-000000@email.amazonses.com> In-Reply-To: <20201012171429.GA9510@KGPE-D16> References: <202010121603.09CG3imD069975@repo.freebsd.org> <20201012171429.GA9510@KGPE-D16>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <yasu@utahime.org> >> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?010001751dd35d38-e416c986-3689-4b2b-8f2d-8e9dca006bc7-000000>