Hi,

this is the diff to update mercurial to 3.2.3.

Ok?

Cheers,

Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile    19 May 2014 19:15:44 -0000      1.60
+++ Makefile    20 Dec 2014 07:03:20 -0000
@@ -3,7 +3,7 @@
 COMMENT-main =         fast, lightweight source control management
 COMMENT-x11 =          graphical tooling for mercurial
 
-MODPY_EGG_VERSION =    3.0
+MODPY_EGG_VERSION =    3.2.3
 DISTNAME =             mercurial-${MODPY_EGG_VERSION}
 CATEGORIES =           devel
 
@@ -33,12 +33,12 @@ RUN_DEPENDS-x11 +=  ${BASE_PKGPATH},-main
 
 FILES =                        hgeditor hgweb.cgi
 
-CONTRIBFILES =         bash_completion mercurial.el sample.hgrc \
+CONTRIBFILES =         bash_completion mercurial.el \
                        tcsh_completion zsh_completion \
                        mergetools.hgrc mq.el
 
 CONTRIBDIRS =          hgsh vim
-SCRIPTS =              convert-repo hg-ssh hgk \
+SCRIPTS =              hg-ssh hgk \
                        tcsh_completion_build.sh dumprevlog \
                        undumprevlog simplemerge
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.42
diff -u -p -r1.42 distinfo
--- distinfo    19 May 2014 19:15:44 -0000      1.42
+++ distinfo    20 Dec 2014 07:03:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.0.tar.gz) = ZAyWVWpFJN8hacZwak9omXxb9YYrWXGzwu4T7Uw0nPs=
-SIZE (mercurial-3.0.tar.gz) = 3903047
+SHA256 (mercurial-3.2.3.tar.gz) = xDaTIOJ214qtobWTbpbHu7u4FUz7pyXvTodX3O3q8e8=
+SIZE (mercurial-3.2.3.tar.gz) = 4078011
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main      19 May 2014 19:15:45 -0000      1.3
+++ pkg/PLIST-main      20 Dec 2014 07:03:20 -0000
@@ -174,8 +174,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/dicthelpers.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc
@@ -183,6 +181,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/mercurial/discovery.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/dispatch.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dispatch.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dummycert.pem
 lib/python${MODPY_VERSION}/site-packages/mercurial/encoding.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/encoding.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/error.py
@@ -388,6 +387,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/tagmerge.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/tagmerge.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/tags.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/tags.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/templatefilters.py
@@ -586,7 +587,6 @@ lib/python${MODPY_VERSION}/site-packages
 @man man/man5/hgrc.5
 share/mercurial/
 share/mercurial/bash_completion
-share/mercurial/convert-repo
 share/mercurial/dumprevlog
 share/mercurial/hg-ssh
 share/mercurial/hgeditor
@@ -597,7 +597,6 @@ share/mercurial/hgweb.cgi
 share/mercurial/mercurial.el
 share/mercurial/mergetools.hgrc
 share/mercurial/mq.el
-share/mercurial/sample.hgrc
 share/mercurial/simplemerge
 share/mercurial/tcsh_completion
 share/mercurial/tcsh_completion_build.sh

Reply via email to