diff options
| author | tcberner <tcberner@FreeBSD.org> | 2017-01-21 20:03:28 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2017-01-21 20:03:28 +0800 |
| commit | 85b36fb4edd38a0221b4959e0690cf53cb817de4 (patch) | |
| tree | da5ed74d532739d2cbcdfc004eb5dd54837cf3df | |
| parent | b0ea145eed7d3984757af07fe464bbd9d0e3e6b6 (diff) | |
| download | freebsd-ports-gnome-85b36fb4edd38a0221b4959e0690cf53cb817de4.tar.gz freebsd-ports-gnome-85b36fb4edd38a0221b4959e0690cf53cb817de4.tar.zst freebsd-ports-gnome-85b36fb4edd38a0221b4959e0690cf53cb817de4.zip | |
devel/tortoisehg: fix stage-qa
Solve conflict with devel/mercurial by only installing the not conflicting files.
As the plist changed, bump portrevision.
Reviewed by: rakuco
Approved by: Gleb Popov (maintainer), rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D9269
| -rw-r--r-- | devel/tortoisehg/Makefile | 4 | ||||
| -rw-r--r-- | devel/tortoisehg/pkg-plist | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile index e35a08ef8942..e5e02c8e0b90 100644 --- a/devel/tortoisehg/Makefile +++ b/devel/tortoisehg/Makefile @@ -2,6 +2,7 @@ PORTNAME= tortoisehg PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://bitbucket.org/tortoisehg/targz/downloads/ #MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/ @@ -39,6 +40,9 @@ NO_ARCH= yes SUB_FILES= pkg-message +# Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py +EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/hgext3rd/__init__.py + post-patch: @${REINPLACE_CMD} -e '/_path/ s|/usr|${PREFIX}|' ${WRKSRC}/${PYSETUP} @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/contrib/tortoisehg.desktop diff --git a/devel/tortoisehg/pkg-plist b/devel/tortoisehg/pkg-plist index 3ce2e86b6ef4..42e024b414e6 100644 --- a/devel/tortoisehg/pkg-plist +++ b/devel/tortoisehg/pkg-plist @@ -1,5 +1,8 @@ bin/thg %%NAUTILUS%%share/nautilus-python/extensions/nautilus-thg.py +%%PYTHON_SITELIBDIR%%/hgext3rd/thg.py +%%PYTHON_SITELIBDIR%%/hgext3rd/thg.pyc +%%PYTHON_SITELIBDIR%%/hgext3rd/thg.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.py %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyc %%PYTHON_SITELIBDIR%%/tortoisehg/__init__.pyo |