Date: Sat, 21 Jan 2017 12:03:28 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432024 - head/devel/tortoisehg Message-ID: <201701211203.v0LC3S8H006892@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Jan 21 12:03:28 2017 New Revision: 432024 URL: https://svnweb.freebsd.org/changeset/ports/432024 Log: 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 Modified: head/devel/tortoisehg/Makefile head/devel/tortoisehg/pkg-plist Modified: head/devel/tortoisehg/Makefile ============================================================================== --- head/devel/tortoisehg/Makefile Sat Jan 21 11:57:17 2017 (r432023) +++ head/devel/tortoisehg/Makefile Sat Jan 21 12:03:28 2017 (r432024) @@ -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 Modified: head/devel/tortoisehg/pkg-plist ============================================================================== --- head/devel/tortoisehg/pkg-plist Sat Jan 21 11:57:17 2017 (r432023) +++ head/devel/tortoisehg/pkg-plist Sat Jan 21 12:03:28 2017 (r432024) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701211203.v0LC3S8H006892>