Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 May 2021 13:09:26 GMT
From:      Gleb Popov <arrowd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cf5c455a3268 - main - devel/tortoisehg: Remove WRKSRC hack.
Message-ID:  <202105311309.14VD9QpA038676@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cf5c455a32680626cb2d2aab4b5288c2db9c549d

commit cf5c455a32680626cb2d2aab4b5288c2db9c549d
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-05-31 13:08:40 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-05-31 13:09:03 +0000

    devel/tortoisehg: Remove WRKSRC hack.
    
    The upstream Heptapod issue was fixed.
---
 devel/tortoisehg/Makefile | 6 ++----
 devel/tortoisehg/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 79bf7403287c..1665405f3907 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -21,8 +21,7 @@ USE_GITLAB=	yes
 GL_SITE=	https://foss.heptapod.net
 GL_ACCOUNT=	mercurial/tortoisehg
 GL_PROJECT=	thg
-GL_COMMIT=	65f0eafe3f398fabe0afbc475e18cd63af81df89
-GL_HEPTAPOD_COMMIT=	9f108b8c92463866721dedda1f3f872e0e2b4344
+GL_COMMIT=	9f108b8c92463866721dedda1f3f872e0e2b4344
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
@@ -30,12 +29,11 @@ OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
-WRKSRC=		${WRKDIR}/${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
-EXTRACT_AFTER_ARGS=	--exclude ${GL_PROJECT}-${GL_COMMIT}-${GL_HEPTAPOD_COMMIT}/hgext3rd/__init__.py
+EXTRACT_AFTER_ARGS=	--exclude thg-${GL_COMMIT}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index 206565246303..266ec84fc1d2 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621235474
-SHA256 (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 7248fb60c88e7f48b39d9090248ebae7b2c9fddbb6d2fae16bb3f6c259f7359f
-SIZE (mercurial/tortoisehg-thg-65f0eafe3f398fabe0afbc475e18cd63af81df89_GL0.tar.gz) = 8652904
+TIMESTAMP = 1622462740
+SHA256 (mercurial/tortoisehg-thg-9f108b8c92463866721dedda1f3f872e0e2b4344_GL0.tar.gz) = faeae44ec9ecaa6e5a4ff8c31060fd3335de9205521f30ab6035b5fc98dd5c35
+SIZE (mercurial/tortoisehg-thg-9f108b8c92463866721dedda1f3f872e0e2b4344_GL0.tar.gz) = 8640693



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105311309.14VD9QpA038676>