Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -13483,3 +13483,4 @@ 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-21|Subversion enabled by default in devel/git Index: devel/Makefile =================================================================== --- devel/Makefile +++ 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 Index: devel/git-gui/Makefile =================================================================== --- devel/git-gui/Makefile +++ devel/git-gui/Makefile @@ -10,7 +10,7 @@ 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 Index: devel/git-lfs/Makefile =================================================================== --- devel/git-lfs/Makefile +++ devel/git-lfs/Makefile @@ -15,14 +15,10 @@ 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: Index: devel/git-lite/Makefile =================================================================== --- devel/git-lite/Makefile +++ devel/git-lite/Makefile @@ -10,7 +10,7 @@ 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 Index: devel/git-modes/Makefile =================================================================== --- devel/git-modes/Makefile +++ devel/git-modes/Makefile @@ -22,13 +22,10 @@ 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} Index: devel/git-subversion/Makefile =================================================================== --- devel/git-subversion/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -subversion - -COMMENT= Distributed source code management tool with FreeBSD subversion bindings - -MASTERDIR= ${.CURDIR}/../git - -DESCR= ${.CURDIR}/pkg-descr - -OPTIONS_SLAVE= SVN - -CONFLICTS_INSTALL= git-[0-9]* git-gui-[0-9]* git-lite-[0-9]* - -DISTINFO_FILE= ${MASTERDIR}/distinfo - -.include "${MASTERDIR}/Makefile" Index: devel/git-subversion/pkg-descr =================================================================== --- devel/git-subversion/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -GIT is a "directory content manager" designed to handle absolutely massive -projects with speed and efficiency, and the release of the 2.6.12 (and later) -versions of the Linux kernel as well as more and more other projects switching -to it would indicate that it does this task well. - -GIT falls in the category of distributed source code management tools, similar -to e.g. GNU Arch or Monotone (or, in the commercial world, BitKeeper). Every -GIT working directory is a full-fledged repository with full revision tracking -capabilities, not dependent on network access to a central server. - -This version provides the necessary bindings to interact with a subversion -repository. - -WWW: http://git-scm.org/ Index: devel/git/Makefile =================================================================== --- devel/git/Makefile +++ devel/git/Makefile @@ -17,7 +17,7 @@ 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_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 Index: devel/hub/Makefile =================================================================== --- devel/hub/Makefile +++ devel/hub/Makefile @@ -26,13 +26,6 @@ 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) Index: devel/lab/Makefile =================================================================== --- devel/lab/Makefile +++ devel/lab/Makefile @@ -13,12 +13,6 @@ 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 \ Index: devel/magit/Makefile =================================================================== --- devel/magit/Makefile +++ devel/magit/Makefile @@ -38,11 +38,6 @@ 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 Index: devel/mergify/Makefile =================================================================== --- devel/mergify/Makefile +++ devel/mergify/Makefile @@ -20,11 +20,7 @@ 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 Index: devel/rubygem-svn2git/Makefile =================================================================== --- devel/rubygem-svn2git/Makefile +++ devel/rubygem-svn2git/Makefile @@ -10,7 +10,7 @@ LICENSE= MIT -RUN_DEPENDS= git-subversion>0:devel/git-subversion +RUN_DEPENDS= git>0:devel/git CONFLICTS_INSTALL= svn2git-[0-9]*