Skip to content
GitLab
Commit be718aca authored by arrowd's avatar arrowd
Browse files

devel/mercurial: Update to 5.5 and flavorize. Adjust dependency lines and bump... 

devel/mercurial: Update to 5.5 and flavorize. Adjust dependency lines and bump PORTREVISION's for ports that depend on mercurial.

PR:		242463
Submitted by:	Peter Wullinger <freebsd@dhke.de> (original patch)
parent 95367198
Expand all Hide whitespace changes
Inline Side-by-side
Mk/Uses/python.mk
View file @ be718aca
......@@ -651,7 +651,7 @@ PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1<2.0:devel/py-enum34@${PY_FLAVOR}
PY_PATHLIB= ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR}
.else
PY_ENUM34=
PY_PATHLIB=
PY_PATHLIB=
.endif
.if ${PYTHON_REL} < 3300
......@@ -666,6 +666,12 @@ PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>=3.2:devel/py-futures@${PY_FLAVOR}
PY_FUTURES=
.endif
.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
PY_MERCURIAL= ${PYTHON_PKGNAMEPREFIX}mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
.else
PY_MERCURIAL= mercurial>=5.5:devel/mercurial@${PY_FLAVOR}
.endif
CMAKE_ARGS+= -DBOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX}
PY_BOOST_LIB= boost_python${PYTHON_SUFFIX}
PY_BOOST= lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR}
......
deskutils/zim/Makefile
View file @ be718aca
......@@ -3,6 +3,7 @@
PORTNAME= zim
DISTVERSION= 0.73.2
PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= https://www.zim-wiki.org/downloads/
......@@ -40,7 +41,7 @@ GNUR_RUN_DEPENDS= R:math/R
GRAPHVIZ_RUN_DEPENDS= fdp:graphics/graphviz
LATEX_USE= tex=latex:run
MERCURIAL_DESC= Version control for notebooks using hg
MERCURIAL_RUN_DEPENDS= hg:devel/mercurial
MERCURIAL_RUN_DEPENDS= ${PY_MERCURIAL}
SCROT_DESC= Screenshot taking and inserting support
SCROT_RUN_DEPENDS= scrot:graphics/scrot
......
devel/git-cinnabar/Makefile
View file @ be718aca
......@@ -2,7 +2,7 @@
PORTNAME= git-cinnabar
DISTVERSION= 0.5.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= devel
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX:N-py27}
......@@ -13,7 +13,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${NONEXISTENT}:devel/git:configure
RUN_DEPENDS= git:devel/git
py27_RUN_DEPENDS= hg:devel/mercurial # XXX bug 242463
py27_RUN_DEPENDS= ${PY_MERCURIAL} # XXX bug 242463
USE_GITHUB= yes
GH_ACCOUNT= glandium
......
devel/git-remote-hg/Makefile
View file @ be718aca
......@@ -2,6 +2,7 @@
PORTNAME= git-remote-hg
PORTVERSION= 1.0.0
PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel python
......@@ -15,7 +16,7 @@ DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15
BUILD_DEPENDS= a2x:textproc/asciidoc
RUN_DEPENDS= hg:devel/mercurial
RUN_DEPENDS= ${PY_MERCURIAL}
USES= gmake python:2.7 shebangfix
......
devel/hg-git/Makefile
View file @ be718aca
......@@ -3,6 +3,7 @@
PORTNAME= hg-git
DISTVERSION= 0.8.12
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://bitbucket.org/durin42/${PORTNAME}/get/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -18,7 +19,7 @@ DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=*:devel/dulwich@${PY_FLAVOR} \
mercurial>=*:devel/mercurial
${PY_MERCURIAL}
PORTDOCS= README.md
......
devel/hgreviewboard/Makefile
View file @ be718aca
......@@ -2,7 +2,7 @@
PORTNAME= hgreviewboard
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= https://bitbucket.org/ccaughie/hgreviewboard/get/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -15,7 +15,7 @@ COMMENT= Mercurial reviewboard extension
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= hg:devel/mercurial \
RUN_DEPENDS= ${PY_MERCURIAL} \
rbt:devel/rbtools
WRKSRC= ${WRKDIR}/ccaughie-hgreviewboard-e461a0baf62d
......
devel/hgsvn/Makefile
View file @ be718aca
......@@ -3,7 +3,7 @@
PORTNAME= hgsvn
PORTVERSION= 0.5.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -14,7 +14,7 @@ COMMENT= Scripts to work locally on Subversion checkouts using Mercurial
LICENSE= GPLv3
RUN_DEPENDS= svn:devel/subversion \
hg:devel/mercurial \
${PY_MERCURIAL} \
${PYTHON_PKGNAMEPREFIX}hglib>0:devel/py-hglib@${PY_FLAVOR}
USES= python
......
devel/mercurial/Makefile
View file @ be718aca
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mercurial
PORTVERSION= 5.1.2
PORTVERSION= 5.5
CATEGORIES= devel python
MASTER_SITES= https://www.mercurial-scm.org/release/
......@@ -12,12 +12,13 @@ COMMENT= Fast, lightweight source control management system
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe python:2.7
USE_PYTHON= distutils
USES= cpe python shebangfix
SHEBANG_FILES= contrib/hgweb.fcgi hgweb.cgi
USE_PYTHON= autoplist distutils
OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD
OPTIONS_DEFAULT=CA_BUNDLE DATA
OPTIONS_SUB= yes
OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD
OPTIONS_DEFAULT= CA_BUNDLE DATA
OPTIONS_SUB= yes
CA_BUNDLE_DESC= Install CA Certificates
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
......@@ -54,6 +55,12 @@ CONTRIB_FILES= bash_completion \
vim/patchreview.vim
PORTDOCS= CONTRIBUTORS README.rst
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
.endif
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
......@@ -74,4 +81,4 @@ post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
.include <bsd.port.post.mk>
devel/mercurial/distinfo
View file @ be718aca
TIMESTAMP = 1570127396
SHA256 (mercurial-5.1.2.tar.gz) = 15af0b090b23649e0e53621a88dde97b55a734d7cb08b77d3df284db70d44e2e
SIZE (mercurial-5.1.2.tar.gz) = 7286238
TIMESTAMP = 1598899848
SHA256 (mercurial-5.5.tar.gz) = c1ed28e1534304a7a4981ed59905286d1c56acd5b75755eedd184171a4a782b4
SIZE (mercurial-5.5.tar.gz) = 7757631
devel/mercurial/files/extra-patch-authormapsuffix
View file @ be718aca
--- hgext/convert/__init__.py.orig 2015-07-18 22:33:53 UTC
+++ hgext/convert/__init__.py
@@ -31,6 +31,7 @@ testedwith = 'internal'
('d', 'dest-type', '', _('destination repository type'), _('TYPE')),
('r', 'rev', [], _('import up to source revision REV'), _('REV')),
('A', 'authormap', '', _('remap usernames using this file'), _('FILE')),
+ ('', 'authormapsuffix', '', _('append this suffix to remapped author names'), _('SUFFIX')),
('', 'filemap', '', _('remap file names using contents of file'),
_('FILE')),
('', 'full', None,
--- hgext/convert/convcmd.py.orig 2015-07-18 22:33:53 UTC
+++ hgext/convert/convcmd.py
@@ -136,12 +136,16 @@ class converter(object):
--- hgext/convert/convcmd.py.orig 2020-06-05 21:21:27.000000000 +0200
+++ hgext/convert/convcmd.py 2020-06-06 17:13:20.086884000 +0200
@@ -74,7 +74,7 @@
continue
srcauthor = srcauthor.strip()
- dstauthor = dstauthor.strip()
+ dstauthor = dstauthor.strip() + self.authormapsuffix
if authors.get(srcauthor) in (None, dstauthor):
msg = _(b'mapping author %s to %s\n')
ui.debug(msg % (srcauthor, dstauthor))
@@ -209,12 +209,16 @@
self.commitcache = {}
self.authors = {}
self.authorfile = None
+ self.authormapsuffix = ''
+ self.authormapsuffix = b''
# Record converted revisions persistently: maps source revision
# ID to target revision ID (both strings). (This is how
......@@ -27,16 +26,7 @@
# Read first the dst author map if any
authorfile = self.dest.authorfile()
if authorfile and os.path.exists(authorfile):
@@ -395,7 +399,7 @@ class converter(object):
continue
srcauthor = srcauthor.strip()
- dstauthor = dstauthor.strip()
+ dstauthor = dstauthor.strip() + self.authormapsuffix
if self.authors.get(srcauthor) in (None, dstauthor):
msg = _('mapping author %s to %s\n')
self.ui.debug(msg % (srcauthor, dstauthor))
@@ -409,7 +413,7 @@ class converter(object):
@@ -482,7 +486,7 @@
def cachecommit(self, rev):
commit = self.source.getcommit(rev)
......
devel/mercurial/files/extra-patch-setup.py
View file @ be718aca
--- setup.py.orig 2016-09-01 19:01:36 UTC
--- setup.py.orig 2020-08-03 17:43:51 UTC
+++ setup.py
@@ -235,30 +235,7 @@ class hgbuildmo(build):
@@ -477,32 +477,7 @@ class hgbuildmo(build):
description = "build translations (.mo files)"
def run(self):
- if not find_executable('msgfmt'):
- self.warn("could not find msgfmt executable, no translations "
- "will be built")
- self.warn(
- "could not find msgfmt executable, no translations "
- "will be built"
- )
- return
-
- podir = 'i18n'
......
devel/mercurial/files/pkg-message.in
View file @ be718aca
[
{ type: install
message: <<EOM
devel/mercurial is now flavored for Python versions.
If you have custom extensions installed, you may need
to install the Python 2 version unless all your extensions
are Python 3 compatible.
Note that we now install a few more files in %%PREFIX%%/share/mercurial:
- shell completion scripts (bash, tcsh and zsh)
- FastCGI / WSGI scripts for web access to repositories
......
devel/mercurial/pkg-plist
View file @ be718aca
This diff is collapsed.
devel/ocaml-opam/Makefile
View file @ be718aca
......@@ -3,6 +3,7 @@
PORTNAME= opam
PORTVERSION= 2.0.6
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ocaml-
......@@ -34,7 +35,7 @@ DARCS_DESC= Remote repository synchronized with darcs
RSYNC_RUN_DEPENDS= rsync:net/rsync
GIT_RUN_DEPENDS= git:devel/git
HG_RUN_DEPENDS= hg:devel/mercurial
HG_RUN_DEPENDS= ${PY_MERCURIAL}
DARCS_RUN_DEPENDS= darcs:devel/hs-darcs
MAKE_JOBS_UNSAFE= yes
......
devel/py-hglib/Makefile
View file @ be718aca
......@@ -2,6 +2,7 @@
PORTNAME= hglib
PORTVERSION= 2.6.1
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -12,7 +13,7 @@ COMMENT= Library with a fast, convenient interface to Mercurial
LICENSE= MIT
RUN_DEPENDS+= hg:devel/mercurial
RUN_DEPENDS+= ${PY_MERCURIAL}
USES= python
USE_PYTHON= distutils autoplist
......
devel/py-setuptools_scm/Makefile
View file @ be718aca
......@@ -2,6 +2,7 @@
PORTNAME= setuptools_scm
PORTVERSION= 3.4.3
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
git:devel/git \
hg:devel/mercurial
${PY_MERCURIAL}
USES= python
USE_PYTHON= autoplist distutils
......
devel/tortoisehg/Makefile
View file @ be718aca
# $FreeBSD$
PORTNAME= tortoisehg
DISTVERSION= 5.3.2
PORTREVISION= 1
DISTVERSION= 5.5
CATEGORIES= devel
MASTER_SITES= https://bitbucket.org/tortoisehg/thg/get/
DISTNAME= ${DISTVERSION}
MAINTAINER= arrowd@FreeBSD.org
COMMENT= GUI for Mercurial VCS
......@@ -16,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15
BUILD_DEPENDS= hg:devel/mercurial
RUN_DEPENDS= hg:devel/mercurial \
BUILD_DEPENDS= ${PY_MERCURIAL}
RUN_DEPENDS= ${PY_MERCURIAL} \
${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
......@@ -25,6 +22,12 @@ USES= pyqt:5 python:2.7
USE_PYQT= core gui network qscintilla2 xml
USE_PYTHON= distutils
USE_GITLAB= yes
GL_SITE= https://foss.heptapod.net
GL_ACCOUNT= mercurial/tortoisehg
GL_PROJECT= thg
GL_COMMIT= 1605d6fba195f02c0c689fe4aff5d7160aa2b15d
OPTIONS_DEFINE= NAUTILUS NLS
NAUTILUS_DESC= Install TortoiseHG Nautilus extension
OPTIONS_SUB= yes
......@@ -33,17 +36,12 @@ NLS_USES= gettext
NO_ARCH= yes
SUB_FILES= pkg-message
DIST_SUBDIR= ${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}-thg-${TAGNAME}
TAGNAME= 0d5a8de069c5
# Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
EXTRACT_AFTER_ARGS= --exclude ${PORTNAME}-thg-${TAGNAME}/hgext3rd/__init__.py
EXTRACT_AFTER_ARGS= --exclude thg-${GL_COMMIT}-${GL_COMMIT}/hgext3rd/__init__.py
post-patch:
@${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP}
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/thg
post-patch-NLS-on:
@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
......
devel/tortoisehg/distinfo
View file @ be718aca
TIMESTAMP = 1586604799
SHA256 (tortoisehg/5.3.2.tar.gz) = 4e4c974945cdec0b9db05c206f283f8f1eccb180758889adfb4c0225cfea66d1
SIZE (tortoisehg/5.3.2.tar.gz) = 8576605
TIMESTAMP = 1597922152
SHA256 (mercurial/tortoisehg-thg-1605d6fba195f02c0c689fe4aff5d7160aa2b15d_GL0.tar.gz) = 67cf4c30f9df7f84877da553e9f5332b27f25e7ee102e21cf48d82a61313d481
SIZE (mercurial/tortoisehg-thg-1605d6fba195f02c0c689fe4aff5d7160aa2b15d_GL0.tar.gz) = 8623598
devel/tortoisehg/pkg-plist
View file @ be718aca
bin/thg
%%PYTHON_SITELIBDIR%%/tortoisehg-unknown-py%%PYTHON_VER%%.egg-info/PKG-INFO
%%PYTHON_SITELIBDIR%%/tortoisehg-unknown-py%%PYTHON_VER%%.egg-info/SOURCES.txt
%%PYTHON_SITELIBDIR%%/tortoisehg-unknown-py%%PYTHON_VER%%.egg-info/dependency_links.txt
%%PYTHON_SITELIBDIR%%/tortoisehg-unknown-py%%PYTHON_VER%%.egg-info/top_level.txt
%%PYTHON_SITELIBDIR%%/hgext3rd/thg.py
%%PYTHON_SITELIBDIR%%/hgext3rd/thg.pyc
%%PYTHON_SITELIBDIR%%/hgext3rd/thg.pyo
......@@ -38,6 +42,9 @@ bin/thg
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/clone.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/close_branch.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/close_branch.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/close_branch.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/cmdcore.pyo
......@@ -155,6 +162,9 @@ bin/thg
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview_ui.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview_ui.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/phabreview_ui.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pick.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pick.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/pick.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/postreview.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/postreview.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/postreview.pyo
......@@ -284,9 +294,9 @@ bin/thg
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/thgstrip.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/thgstrip.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/thgstrip.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topics.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topics.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topics.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topic.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topic.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/topic.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/update.py
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/update.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/hgqt/update.pyo
......@@ -308,9 +318,6 @@ bin/thg
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__init__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/util/__version__.pyo
%%PYTHON_SITELIBDIR%%/tortoisehg/util/bugtraq.py
%%PYTHON_SITELIBDIR%%/tortoisehg/util/bugtraq.pyc
%%PYTHON_SITELIBDIR%%/tortoisehg/util/bugtraq.pyo
......
ports-mgmt/portshaker/Makefile
View file @ be718aca
......@@ -4,7 +4,7 @@
PORTNAME?= portshaker
PORTVERSION= 1.0.18
DISTVERSIONPREFIX= v
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= ports-mgmt
MAINTAINER?= romain@FreeBSD.org
......@@ -27,7 +27,7 @@ HG_DESC= mercurial support
RSYNC_RUN_DEPENDS= rsync:net/rsync
SVN_RUN_DEPENDS= svn:devel/subversion${WITH_SUBVERSION_VER}
GIT_RUN_DEPENDS= git:devel/git
HG_RUN_DEPENDS= hg:devel/mercurial
HG_RUN_DEPENDS= ${PY_MERCURIAL}
.else
OPTIONS_DEFINE= BSDSHARP ENLIGHTENMENT GECKO HASKELL MARCUSCOM TEXLIVE XORG
OPTIONS_DEFAULT= BSDSHARP
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment