From owner-dev-commits-ports-main@freebsd.org Tue Apr 6 15:30:20 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 66E075D5721; Tue, 6 Apr 2021 15:30: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 4FFBL41bh8z3PTt; Tue, 6 Apr 2021 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2629C615A; Tue, 6 Apr 2021 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 136FUKaf084818; Tue, 6 Apr 2021 15:30:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 136FUKUH084815; Tue, 6 Apr 2021 15:30:20 GMT (envelope-from git) Date: Tue, 6 Apr 2021 15:30:20 GMT Message-Id: <202104061530.136FUKUH084815@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 64d5a3b23aca - main - devel/git: Disable SVN and create flavor MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64d5a3b23aca5e0da4ffb9430131f6fad3341106 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 15:30:20 -0000 The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=64d5a3b23aca5e0da4ffb9430131f6fad3341106 commit 64d5a3b23aca5e0da4ffb9430131f6fad3341106 Author: Renato Botelho AuthorDate: 2021-04-06 15:27:07 +0000 Commit: Renato Botelho CommitDate: 2021-04-06 15:29:59 +0000 devel/git: Disable SVN and create flavor Ports tree moved to git. Disable SVN option by default on main port to reduce dependencies and create a new flavor "svn" that looks exactly how main port was before this change PR: 254719 Reported by: grembo Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/git/Makefile | 19 +++++++++++++------ devel/git/pkg-descr-svn | 6 ++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 5e53008a463f..3082a5968361 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -2,6 +2,7 @@ PORTNAME= git DISTVERSION= 2.31.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -16,15 +17,18 @@ COMMENT= Distributed source code management tool ${COMMENT_${FLAVOR}} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= default gui lite tiny -default_CONFLICTS_INSTALL= git-gui git-lite git-tiny -gui_CONFLICTS_INSTALL= git git-lite git-tiny +FLAVORS= default gui lite svn tiny +default_CONFLICTS_INSTALL= git-gui git-lite git-svn git-tiny +gui_CONFLICTS_INSTALL= git git-lite git-svn git-tiny gui_DESCR= ${.CURDIR}/pkg-descr-gui gui_PKGNAMESUFFIX= -gui -lite_CONFLICTS_INSTALL= git git-gui git-tiny +lite_CONFLICTS_INSTALL= git git-gui git-svn git-tiny lite_DESCR= ${.CURDIR}/pkg-descr-lite lite_PKGNAMESUFFIX= -lite -tiny_CONFLICTS_INSTALL= git git-gui git-lite +svn_CONFLICTS_INSTALL= git git-gui git-lite git-tiny +svn_DESCR= ${.CURDIR}/pkg-descr-svn +svn_PKGNAMESUFFIX= -svn +tiny_CONFLICTS_INSTALL= git git-gui git-svn git-lite tiny_DESCR= ${.CURDIR}/pkg-descr-tiny tiny_PKGNAMESUFFIX= -tiny @@ -32,6 +36,7 @@ USES= autoreconf gmake iconv shebangfix ssl tar:xz COMMENT_gui= (GUI enabled flavor) COMMENT_lite= (lite flavor) +COMMENT_svn= (SVN enabled flavor) COMMENT_tiny= (tiny flavor) USERS= git_daemon @@ -66,11 +71,13 @@ CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no OPTIONS_DEFINE= CONTRIB CURL CVS GITWEB GUI HTMLDOCS ICONV NLS P4 PCRE2 PERL \ SEND_EMAIL SUBTREE SVN OPTIONS_DEFAULT=CONTRIB CURL CVS GITWEB ICONV P4 PCRE2 PERL SEND_EMAIL \ - SUBTREE SVN + SUBTREE .if ${FLAVOR:U} == gui OPTIONS_SLAVE+= GUI .elif ${FLAVOR:U} == lite OPTIONS_EXCLUDE= GUI SVN GITWEB CONTRIB P4 CVS PERL +.elif ${FLAVOR:U} == svn +OPTIONS_SLAVE+= SVN .elif ${FLAVOR:U} == tiny OPTIONS_EXCLUDE:= ${OPTIONS_DEFINE:NCURL} OPTIONS_SLAVE= CURL diff --git a/devel/git/pkg-descr-svn b/devel/git/pkg-descr-svn new file mode 100644 index 000000000000..394265d7a83c --- /dev/null +++ b/devel/git/pkg-descr-svn @@ -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 SVN option enabled. + +WWW: https://git-scm.com/