svn commit: r518154 - in head: . devel devel/git devel/git-gui devel/git-lfs devel/git-lite devel/git-modes devel/hub devel/lab devel/magit devel/mergify devel/rubygem-svn2git

Brooks Davis brooks at FreeBSD.org
Fri Nov 22 17:25:10 UTC 2019 

Author: brooks
Date: Fri Nov 22 17:25:07 2019
New Revision: 518154
URL: https://svnweb.freebsd.org/changeset/ports/518154

Log:
  Enable subversion support by default and remove git-subversion.
  
  Without PROVIDES/REQUIRES support, ports must depend on exactly one git
  port/pkg.  Subversion is currently FreeBSD's primiary version control
  system and it is widely used with git so it makes sense to enable it by
  default and provide a consistent user experience.
  
  Approved by:	garga
  Differential Revision:	https://reviews.freebsd.org/D22496

Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/git-gui/Makefile
  head/devel/git-lfs/Makefile
  head/devel/git-lite/Makefile
  head/devel/git-modes/Makefile
  head/devel/git/Makefile
  head/devel/hub/Makefile
  head/devel/lab/Makefile
  head/devel/magit/Makefile
  head/devel/mergify/Makefile
  head/devel/rubygem-svn2git/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/MOVED	Fri Nov 22 17:25:07 2019	(r518154)
@@ -13483,3 +13483,4 @@ mail/opensmtpd-extras-filter-spamassassin||2019-11-15|
 mail/opensmtpd-extras-tool-stats||2019-11-15| Deprecated upstream
 x11-wm/compton-yshui|x11-wm/picom|2019-11-18|Project renamed
 lang/ponyc-static|lang/ponyc at llvm_static|2019-11-20|Flavored
+devel/git-subversion|devel/git|2019-11-22|Subversion enabled by default in devel/git

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -809,7 +809,6 @@
     SUBDIR += git-remote-hg
     SUBDIR += git-review
     SUBDIR += git-subrepo
-    SUBDIR += git-subversion
     SUBDIR += git-town
     SUBDIR += gitaly
     SUBDIR += gitblit

Modified: head/devel/git-gui/Makefile
==============================================================================
--- head/devel/git-gui/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/git-gui/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -10,7 +10,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 OPTIONS_SLAVE=	GUI
 
-CONFLICTS_INSTALL=	git-[0-9]* git-lite-[0-9]* git-subversion-[0-9]*
+CONFLICTS_INSTALL=	git-[0-9]* git-lite-[0-9]*
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 

Modified: head/devel/git-lfs/Makefile
==============================================================================
--- head/devel/git-lfs/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/git-lfs/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -15,13 +15,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 USES=		go:modules
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=		GIT_SUBVERSION MANPAGES
+OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
-
-GIT_SUBVERSION_DESC=		Use 'git-subversion' instead of 'git' as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
 
 MANPAGES_BUILD_DEPENDS=	ronn:textproc/rubygem-ronn
 

Modified: head/devel/git-lite/Makefile
==============================================================================
--- head/devel/git-lite/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/git-lite/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -10,7 +10,7 @@ DESCR=		${.CURDIR}/pkg-descr
 
 OPTIONS_EXCLUDE=GUI SVN GITWEB CONTRIB P4 CVS PERL
 
-CONFLICTS_INSTALL=	git-[0-9]* git-gui-[0-9]* git-subversion-[0-9]*
+CONFLICTS_INSTALL=	git-[0-9]* git-gui-[0-9]*
 
 DISTINFO_FILE=	${MASTERDIR}/distinfo
 

Modified: head/devel/git-modes/Makefile
==============================================================================
--- head/devel/git-modes/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/git-modes/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -22,13 +22,10 @@ ALL_TARGET=	lisp
 
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS GIT_SUBVERSION
+OPTIONS_DEFINE=	DOCS
 
 ELISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
-GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/git/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -17,7 +17,7 @@ COMMENT?=	Distributed source code management tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL?=	git-gui-[0-9]* git-subversion-[0-9]* git-lite-[0-9]*
+CONFLICTS_INSTALL?=	git-gui-[0-9]* git-lite-[0-9]*
 
 USERS=		git_daemon
 GROUPS=		git_daemon
@@ -55,7 +55,7 @@ OPTIONS_RADIO_PCRE_VERSION=	PCRE PCRE2
 OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
 		SEND_EMAIL NLS SUBTREE
 OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
-			SUBTREE
+			SUBTREE SVN
 OPTIONS_SUB=	yes
 
 GITWEB_DESC=	Install gitweb

Modified: head/devel/hub/Makefile
==============================================================================
--- head/devel/hub/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/hub/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -26,13 +26,6 @@ PLIST_FILES=	bin/hub \
 		share/fish/completions/hub.fish \
 		share/zsh/site-functions/_hub
 
-OPTIONS_DEFINE=		GIT_SUBVERSION
-
-GIT_SUBVERSION_DESC=	Use 'git-subversion' instead of 'git' as backend
-
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
-
 post-build:
 	(cd ${GO_WRKSRC} && \
 	  ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET}/md2roff-bin)

Modified: head/devel/lab/Makefile
==============================================================================
--- head/devel/lab/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/lab/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -13,12 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 
-OPTIONS_DEFINE=	GIT_SUBVERSION
-
-GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
-
 USE_GITHUB=	yes
 
 GH_TUPLE=	zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT \

Modified: head/devel/magit/Makefile
==============================================================================
--- head/devel/magit/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/magit/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -38,11 +38,6 @@ MAKE_ENV+=	INSTALL_INFO=install-info \
 		docdir=${DOCSDIR}
 PLIST_SUB+=	ELISPDIR=${ELISPDIR}
 
-OPTIONS_DEFINE=			DOCS GIT_SUBVERSION
-GIT_SUBVERSION_DESC=		Use devel/git-subversion as backend
-GIT_SUBVERSION_BUILD_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_BUILD_DEPENDS_OFF=	git>0:devel/git
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git>0:devel/git
+OPTIONS_DEFINE=			DOCS
 
 .include <bsd.port.mk>

Modified: head/devel/mergify/Makefile
==============================================================================
--- head/devel/mergify/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/mergify/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -20,11 +20,7 @@ NO_BUILD=	yes
 PLIST_FILES=	bin/mergify
 PORTDOCS=	README.md
 
-OPTIONS_DEFINE=	DOCS GIT_SUBVERSION
-
-GIT_SUBVERSION_DESC=	Use devel/git-subversion as backend
-GIT_SUBVERSION_RUN_DEPENDS=	git-subversion>0:devel/git-subversion
-GIT_SUBVERSION_RUN_DEPENDS_OFF=	git:devel/git
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mergify ${STAGEDIR}${PREFIX}/bin

Modified: head/devel/rubygem-svn2git/Makefile
==============================================================================
--- head/devel/rubygem-svn2git/Makefile	Fri Nov 22 16:59:39 2019	(r518153)
+++ head/devel/rubygem-svn2git/Makefile	Fri Nov 22 17:25:07 2019	(r518154)
@@ -10,7 +10,7 @@ COMMENT=	Ruby utilities for exporting SVN repo to git
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	git-subversion>0:devel/git-subversion
+RUN_DEPENDS=	git>0:devel/git
 
 CONFLICTS_INSTALL=	svn2git-[0-9]*

More information about the svn-ports-all mailing list