- update to 0.3.2

- adjust required dependencies versions
- update pkg-descr and pkg-message text
- make it better integrate with bsd.python.mk

PR:		164584
Submitted by:	Marco Bröder <marco.broeder at gmx dot eu> (maintainer)

4 files changed, 15 insertions, 17 deletions

diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 1fe9d5317db0..3c8bf78bc935 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hg-git
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,16 +16,16 @@ COMMENT=	Mercurial extension to pull from or push to a Git repository
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.8.0:${PORTSDIR}/devel/dulwich \
-		mercurial>=1.9.0:${PORTSDIR}/devel/mercurial
+RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=0.8.3:${PORTSDIR}/devel/dulwich \
+		mercurial>=2.0.2:${PORTSDIR}/devel/mercurial
 
 MAKE_JOBS_SAFE=	yes
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
 
-PLIST_SUB=	VERSION=${PORTVERSION} PYVER=${PYTHON_VERSION:S/thon//}
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/hg_git-%%VERSION%%-%%PYVER%%.egg
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo
index 550b80388554..6af66f635fc6 100644
--- a/devel/hg-git/distinfo
+++ b/devel/hg-git/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hg-git-0.3.1.tar.gz) = c877a407a55d65f634410bb9b567b7565310d3005fb1256484bde156bf30ab0e
-SIZE (hg-git-0.3.1.tar.gz) = 16361
+SHA256 (hg-git-0.3.2.tar.gz) = fc5517e4af09478835d97e3c3b37cc95b9783ff5b585ef893f891057f8b52f43
+SIZE (hg-git-0.3.2.tar.gz) = 16546
diff --git a/devel/hg-git/pkg-descr b/devel/hg-git/pkg-descr
index 390de856e4e7..888a42b8d610 100644
--- a/devel/hg-git/pkg-descr
+++ b/devel/hg-git/pkg-descr
@@ -5,18 +5,17 @@ collaboration point for a team with developers using both Git and Mercurial.
 
 The Hg-Git plugin can convert commits / changesets losslessly from one system
 to another, so you can push via a Mercurial repository and another Mercurial
-client can pull it and their changeset node ids will be identical - Mercurial
-data does not get lost in translation.
+client can pull it. In theory, the changeset IDs should not change, although
+this may not hold true for complex histories.
 
 This plugin is implemented entirely in Python - there are no Git binary
 dependencies, you do not need to have Git installed on your system.
 
 *** WARNING: Do not use this software in data critical production environments,
-only in safe test environments! This software is still BETA!
+only in safe test environments! This software is still BETA! ***
 
-It is basically feature complete and pretty stable now, but there could be
-still some edge cases. The user interface could also still be changed. However,
-there are now a lot of people using it effectively, so please test it yourself
-and report encountered bugs upstream (see website). Thanks! ***
+The plugin is basically functional and usable now, but there are still some
+edge cases. However, there are several people using it effectively, so please
+test it yourself and report encountered bugs upstream (see website). Thanks!
 
 WWW:	http://hg-git.github.com/
diff --git a/devel/hg-git/pkg-message b/devel/hg-git/pkg-message
index 72cba35faf5e..4939963d8c96 100644
--- a/devel/hg-git/pkg-message
+++ b/devel/hg-git/pkg-message
@@ -7,10 +7,9 @@ To enable the Hg-Git extension make sure you have the following lines in your
 Mercurial global configuration file '~/.hgrc':
 
 [extensions]
-bookmarks =
 hggit =
 
-The bookmarks section is only required prior to hg 1.7. Bookmarks will be
-translated to git heads when pushing.
+Note: As of Mercurial 1.8 the required bookmarks extension became a core
+functionality and can be removed from the extensions list.
 
 ====