sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-25 15:36:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enable subversion support by default and remove git-subversion.

Browse source 
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
This commit is contained in:
Brooks Davis 2019-11-22 17:25:07 +00:00
parent 4c4131eaa9
commit 2f6e9a02d7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=518154
12 changed files with 10 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -13483,3 +13483,4 @@ mail/opensmtpd-extras-filter-spamassassin||2019-11-15| Deprecated upstream
mail/opensmtpd-extras-tool-stats||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 x11-wm/compton-yshui|x11-wm/picom|2019-11-18|Project renamed
lang/ponyc-static|lang/ponyc@llvm_static|2019-11-20|Flavored 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

1
devel/Makefile
View file

@ -809,7 +809,6 @@
SUBDIR += git-remote-hg SUBDIR += git-remote-hg
SUBDIR += git-review SUBDIR += git-review
SUBDIR += git-subrepo SUBDIR += git-subrepo
SUBDIR += git-subversion
SUBDIR += git-town SUBDIR += git-town
SUBDIR += gitaly SUBDIR += gitaly
SUBDIR += gitblit SUBDIR += gitblit

2
devel/git-gui/Makefile
View file

@ -10,7 +10,7 @@ DESCR= ${.CURDIR}/pkg-descr
OPTIONS_SLAVE= GUI 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 DISTINFO_FILE= ${MASTERDIR}/distinfo

6
devel/git-lfs/Makefile
View file

@ -15,14 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
USES= go:modules USES= go:modules
USE_GITHUB= yes USE_GITHUB= yes
OPTIONS_DEFINE= GIT_SUBVERSION MANPAGES OPTIONS_DEFINE= MANPAGES
OPTIONS_DEFAULT= MANPAGES OPTIONS_DEFAULT= MANPAGES
OPTIONS_SUB= yes 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 MANPAGES_BUILD_DEPENDS= ronn:textproc/rubygem-ronn
post-build-MANPAGES-on: post-build-MANPAGES-on:

2
devel/git-lite/Makefile
View file

@ -10,7 +10,7 @@ DESCR= ${.CURDIR}/pkg-descr
OPTIONS_EXCLUDE=GUI SVN GITWEB CONTRIB P4 CVS PERL 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 DISTINFO_FILE= ${MASTERDIR}/distinfo

5
devel/git-modes/Makefile
View file

@ -22,13 +22,10 @@ ALL_TARGET= lisp
PORTDOCS= README.md PORTDOCS= README.md
OPTIONS_DEFINE= DOCS GIT_SUBVERSION OPTIONS_DEFINE= DOCS
ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} ELISPDIR= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
PLIST_SUB= ELISPDIR=${ELISPDIR} 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: do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}

4
devel/git/Makefile
View file

@ -17,7 +17,7 @@ COMMENT?= Distributed source code management tool
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING 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 USERS= git_daemon
GROUPS= 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 \ OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
SEND_EMAIL NLS SUBTREE SEND_EMAIL NLS SUBTREE
OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \ OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
SUBTREE SUBTREE SVN
OPTIONS_SUB= yes OPTIONS_SUB= yes
GITWEB_DESC= Install gitweb GITWEB_DESC= Install gitweb

7
devel/hub/Makefile
View file

@ -26,13 +26,6 @@ PLIST_FILES= bin/hub \
share/fish/completions/hub.fish \ share/fish/completions/hub.fish \
share/zsh/site-functions/_hub 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: post-build:
(cd ${GO_WRKSRC} && \ (cd ${GO_WRKSRC} && \
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET}/md2roff-bin) ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS} ${GO_TARGET}/md2roff-bin)

6
devel/lab/Makefile
View file

@ -13,12 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:modules 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 USE_GITHUB= yes
GH_TUPLE= zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT \ GH_TUPLE= zaquestion:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT \

7
devel/magit/Makefile
View file

@ -38,11 +38,6 @@ MAKE_ENV+= INSTALL_INFO=install-info \
docdir=${DOCSDIR} docdir=${DOCSDIR}
PLIST_SUB+= ELISPDIR=${ELISPDIR} PLIST_SUB+= ELISPDIR=${ELISPDIR}
OPTIONS_DEFINE= DOCS GIT_SUBVERSION OPTIONS_DEFINE= DOCS
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
.include <bsd.port.mk> .include <bsd.port.mk>

6
devel/mergify/Makefile
View file

@ -20,11 +20,7 @@ NO_BUILD= yes
PLIST_FILES= bin/mergify PLIST_FILES= bin/mergify
PORTDOCS= README.md PORTDOCS= README.md
OPTIONS_DEFINE= DOCS GIT_SUBVERSION OPTIONS_DEFINE= DOCS
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
do-install: do-install:
${INSTALL_SCRIPT} ${WRKSRC}/mergify ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/mergify ${STAGEDIR}${PREFIX}/bin

2
devel/rubygem-svn2git/Makefile
View file

@ -10,7 +10,7 @@ COMMENT= Ruby utilities for exporting SVN repo to git
LICENSE= MIT LICENSE= MIT
RUN_DEPENDS= git-subversion>0:devel/git-subversion RUN_DEPENDS= git>0:devel/git
CONFLICTS_INSTALL= svn2git-[0-9]* CONFLICTS_INSTALL= svn2git-[0-9]*