From 2f6e9a02d7e395f863e62ae4c5e1410a4229271c Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 22 Nov 2019 17:25:07 +0000 Subject: [PATCH] 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 --- MOVED | 1 + devel/Makefile | 1 - devel/git-gui/Makefile | 2 +- devel/git-lfs/Makefile | 6 +----- devel/git-lite/Makefile | 2 +- devel/git-modes/Makefile | 5 +---- devel/git/Makefile | 4 ++-- devel/hub/Makefile | 7 ------- devel/lab/Makefile | 6 ------ devel/magit/Makefile | 7 +------ devel/mergify/Makefile | 6 +----- devel/rubygem-svn2git/Makefile | 2 +- 12 files changed, 10 insertions(+), 39 deletions(-) diff --git a/MOVED b/MOVED index 9058a1c418ae..c100cfe9a6ad 100644 --- a/MOVED +++ b/MOVED @@ -13483,3 +13483,4 @@ mail/opensmtpd-extras-filter-spamassassin||2019-11-15| Deprecated upstream 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@llvm_static|2019-11-20|Flavored +devel/git-subversion|devel/git|2019-11-22|Subversion enabled by default in devel/git diff --git a/devel/Makefile b/devel/Makefile index 4d2ae4feae5f..5f7cc8e04907 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -809,7 +809,6 @@ SUBDIR += git-remote-hg SUBDIR += git-review SUBDIR += git-subrepo - SUBDIR += git-subversion SUBDIR += git-town SUBDIR += gitaly SUBDIR += gitblit diff --git a/devel/git-gui/Makefile b/devel/git-gui/Makefile index 312dd4e8b8f3..8f54f1ce5fa9 100644 --- a/devel/git-gui/Makefile +++ b/devel/git-gui/Makefile @@ -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 diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index e7f83ae94252..519f7c4ce1d5 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -15,14 +15,10 @@ 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 post-build-MANPAGES-on: diff --git a/devel/git-lite/Makefile b/devel/git-lite/Makefile index adca254c2cde..d0036c76342a 100644 --- a/devel/git-lite/Makefile +++ b/devel/git-lite/Makefile @@ -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 diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile index ec8588fc9f45..3ec99bfd2be8 100644 --- a/devel/git-modes/Makefile +++ b/devel/git-modes/Makefile @@ -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} diff --git a/devel/git/Makefile b/devel/git/Makefile index 35640ee6de04..42e5d8ff2a52 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -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 diff --git a/devel/hub/Makefile b/devel/hub/Makefile index 381ee3c6000b..08bc1feeeee5 100644 --- a/devel/hub/Makefile +++ b/devel/hub/Makefile @@ -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) diff --git a/devel/lab/Makefile b/devel/lab/Makefile index c2f1e925241a..6eb8af954c37 100644 --- a/devel/lab/Makefile +++ b/devel/lab/Makefile @@ -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 \ diff --git a/devel/magit/Makefile b/devel/magit/Makefile index f6f68598d3ef..3d05ee7b995f 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -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 diff --git a/devel/mergify/Makefile b/devel/mergify/Makefile index f6f6f5d6d050..33b579cb8119 100644 --- a/devel/mergify/Makefile +++ b/devel/mergify/Makefile @@ -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 diff --git a/devel/rubygem-svn2git/Makefile b/devel/rubygem-svn2git/Makefile index 44e1be8aea77..605fd01fb642 100644 --- a/devel/rubygem-svn2git/Makefile +++ b/devel/rubygem-svn2git/Makefile @@ -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]*