From owner-svn-ports-head@freebsd.org Mon Oct 12 16:03:46 2020 Return-Path: Delivered-To: svn-ports-head@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 1C3A143ADFC; Mon, 12 Oct 2020 16:03:46 +0000 (UTC) (envelope-from garga@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C93Ps72tLz4NJx; Mon, 12 Oct 2020 16:03:45 +0000 (UTC) (envelope-from garga@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 BA3D4EDDB; Mon, 12 Oct 2020 16:03:45 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09CG3jtN069980; Mon, 12 Oct 2020 16:03:45 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09CG3imD069975; Mon, 12 Oct 2020 16:03:44 GMT (envelope-from garga@FreeBSD.org) Message-Id: <202010121603.09CG3imD069975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Mon, 12 Oct 2020 16:03:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552136 - in head: . devel devel/git devel/git-gui devel/git-lite X-SVN-Group: ports-head X-SVN-Commit-Author: garga X-SVN-Commit-Paths: in head: . devel devel/git devel/git-gui devel/git-lite X-SVN-Commit-Revision: 552136 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2020 16:03:46 -0000 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/