[update] devel/mercurial to 6
Hi ports@
Here is a trivial update of devel/mercurial to 6.6.
Built and tested on arm64.
diff /usr/ports
commit - 6c3190bbbde3468e01e104d266fa997be5d523f5
path + /usr/ports
blob - 46882faecdab5f25363b449a5069dc963555b78a
file + devel/mercurial/Makefile
--- devel/mercurial/Makefile
+++ devel/mercurial/Makefile
@@ -1,7 +1,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =6.4.4
+MODPY_EGG_VERSION =6.6
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
blob - ec3fef7c8bdb10f023565aa861bc1238579d6de8
file + devel/mercurial/distinfo
--- devel/mercurial/distinfo
+++ devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-6.4.4.tar.gz) = u5hTl8t0cO4BWL7iNwl+L93/rTJ+ZFpJSXozRx54qRA=
-SIZE (mercurial-6.4.4.tar.gz) = 8182450
+SHA256 (mercurial-6.6.tar.gz) = a/1xy6DfOxjeQkIWsw4qVBzKbgEEhT0zNL6AoqsJpK0=
+SIZE (mercurial-6.6.tar.gz) = 8250065
blob - 26d8d95118ccf660cc0145e7213fd9a1b49ffed2
file + devel/mercurial/pkg/PLIST-main
--- devel/mercurial/pkg/PLIST-main
+++ devel/mercurial/pkg/PLIST-main
@@ -193,22 +193,6 @@ lib/python${MODPY_VERSION}/site-packages/hgext/hooklib
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/enforce_draft_commits.py
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/reject_merge_commits.py
lib/python${MODPY_VERSION}/site-packages/hgext/hooklib/reject_new_heads.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}bundleparts.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}fileindexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}indexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}sqlindexapi.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/${MODPY_PYCACHE}store.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/bundleparts.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/common.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/fileindexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/indexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/sqlindexapi.py
-lib/python${MODPY_VERSION}/site-packages/hgext/infinitepush/store.py
lib/python${MODPY_VERSION}/site-packages/hgext/journal.py
lib/python${MODPY_VERSION}/site-packages/hgext/keyword.py
lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/
@@ -341,11 +325,14 @@ lib/python${MODPY_VERSION}/site-packages/hgext3rd/${MO
lib/python${MODPY_VERSION}/site-packages/mercurial/
lib/python${MODPY_VERSION}/site-packages/mercurial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/mercurial/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/__main__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/__modulepolicy__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__modulepolicy__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}admin_commands.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}ancestor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}archival.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}bookmarks.${MODPY_PYC_MAGIC_TAG}pyc
@@ -491,6 +478,13 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/${M
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/admin/
+lib/python${MODPY_VERSION}/site-packages/mercurial/admin/__init__.py
Update devel/mercurial to version 6.5
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.118
diff -u -p -r1.118 Makefile
--- Makefile11 Jun 2023 07:37:17 - 1.118
+++ Makefile8 Jul 2023 18:50:35 -
@@ -1,7 +1,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =6.4.4
+MODPY_EGG_VERSION =6.5
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.75
diff -u -p -r1.75 distinfo
--- distinfo11 Jun 2023 07:37:17 - 1.75
+++ distinfo8 Jul 2023 18:50:35 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-6.4.4.tar.gz) = u5hTl8t0cO4BWL7iNwl+L93/rTJ+ZFpJSXozRx54qRA=
-SIZE (mercurial-6.4.4.tar.gz) = 8182450
+SHA256 (mercurial-6.5.tar.gz) = pWA9DTlev2f+XSeruzvTf8wBhx7POUx5NnLSweaL5+c=
+SIZE (mercurial-6.5.tar.gz) = 8231320
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST-main
--- pkg/PLIST-main 6 May 2023 08:13:42 - 1.26
+++ pkg/PLIST-main 8 Jul 2023 18:50:35 -
@@ -341,9 +341,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/
lib/python${MODPY_VERSION}/site-packages/mercurial-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/mercurial/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/__main__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/__modulepolicy__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__modulepolicy__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}__version__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}ancestor.${MODPY_PYC_MAGIC_TAG}pyc
@@ -804,6 +806,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/sparse.py
lib/python${MODPY_VERSION}/site-packages/mercurial/sshpeer.py
lib/python${MODPY_VERSION}/site-packages/mercurial/sslutil.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/
+lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/${MODPY_PYCACHE}stabletailsort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/stabletailgraph/stabletailsort.py
lib/python${MODPY_VERSION}/site-packages/mercurial/stack.py
lib/python${MODPY_VERSION}/site-packages/mercurial/state.py
lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.py
Update devel/mercurial to version 6.4.4
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.117
diff -u -p -r1.117 Makefile
--- Makefile6 May 2023 08:13:42 - 1.117
+++ Makefile10 Jun 2023 16:50:26 -
@@ -1,7 +1,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =6.4.3
+MODPY_EGG_VERSION =6.4.4
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.74
diff -u -p -r1.74 distinfo
--- distinfo6 May 2023 08:13:42 - 1.74
+++ distinfo10 Jun 2023 16:50:26 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-6.4.3.tar.gz) = p3+2LTJZNKg6ALL8bbEJ9ExnuGdo/EBJA2b1E2QMf2Q=
-SIZE (mercurial-6.4.3.tar.gz) = 8177396
+SHA256 (mercurial-6.4.4.tar.gz) = u5hTl8t0cO4BWL7iNwl+L93/rTJ+ZFpJSXozRx54qRA=
+SIZE (mercurial-6.4.4.tar.gz) = 8182450
Update devel/mercurial to version 6.4.3
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.116
diff -u -p -r1.116 Makefile
--- Makefile13 Nov 2022 15:27:48 - 1.116
+++ Makefile4 May 2023 15:16:04 -
@@ -1,8 +1,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =6.2
-REVISION = 0
+MODPY_EGG_VERSION =6.4.3
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.73
diff -u -p -r1.73 distinfo
--- distinfo13 Jul 2022 19:00:01 - 1.73
+++ distinfo4 May 2023 15:16:04 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-6.2.tar.gz) = 04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=
-SIZE (mercurial-6.2.tar.gz) = 8053713
+SHA256 (mercurial-6.4.3.tar.gz) = p3+2LTJZNKg6ALL8bbEJ9ExnuGdo/EBJA2b1E2QMf2Q=
+SIZE (mercurial-6.4.3.tar.gz) = 8177396
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST-main
--- pkg/PLIST-main 13 Jul 2022 19:00:01 - 1.25
+++ pkg/PLIST-main 4 May 2023 15:16:04 -
@@ -374,7 +374,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffhelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstate.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstateguard.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstatemap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
@@ -474,6 +473,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}transaction.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}treediscovery.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}txnutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}typelib.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}unionrepo.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}upgrade.${MODPY_PYC_MAGIC_TAG}pyc
@@ -549,7 +549,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelper.py
lib/python${MODPY_VERSION}/site-packages/mercurial/diffutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateguard.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstatemap.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/__init__.py
@@ -1041,24 +1040,41 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/__init__.pyi
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_cmp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}_next_gen.${MODPY_PYC_MAGIC_TAG}pyc
Re: Update devel/mercurial to 6.2
On Mon Jul 11, 2022 at 10:38:46PM -0500, Matthew Martin wrote:
> Not a mercurial user, but passes a few quick checks. Tests fail in the
> same way as they did for 5.8. Shell completers are installed correctly
> now.
Committed, thanks.
>
>
> diff --git Makefile Makefile
> index 28ad010a64c..022cc404225 100644
> --- Makefile
> +++ Makefile
> @@ -1,12 +1,10 @@
> COMMENT-main = fast, lightweight source control management
> COMMENT-x11 =graphical tooling for mercurial
>
> -MODPY_EGG_VERSION = 5.8
> +MODPY_EGG_VERSION = 6.2
> DISTNAME = mercurial-${MODPY_EGG_VERSION}
> CATEGORIES = devel
>
> -REVISION = 1
> -
> HOMEPAGE = https://www.mercurial-scm.org
>
> # GPLv2
> @@ -36,8 +34,7 @@ RUN_DEPENDS-x11 += ${BASE_PKGPATH},-main \
>
> FILES = hgeditor hgweb.cgi
>
> -CONTRIBFILES = bash_completion mercurial.el \
> - tcsh_completion zsh_completion \
> +CONTRIBFILES = mercurial.el tcsh_completion \
> mq.el
>
> CONTRIBDIRS =hgsh vim
> diff --git distinfo distinfo
> index a6fabe184d2..9a10d621347 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (mercurial-5.8.tar.gz) = /F1qj2R42I74PN0Ktthq1o7nIrvfSWTmoLR8PGulMJ8=
> -SIZE (mercurial-5.8.tar.gz) = 7985326
> +SHA256 (mercurial-6.2.tar.gz) = 04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=
> +SIZE (mercurial-6.2.tar.gz) = 8053713
> diff --git pkg/PLIST-main pkg/PLIST-main
> index 72a6120b1c1..a0a03f97dd9 100644
> --- pkg/PLIST-main
> +++ pkg/PLIST-main
> @@ -5,10 +5,8 @@ lib/python${MODPY_VERSION}/site-packages/hgdemandimport/
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/__init__.py
>
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy2.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy3.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy2.py
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy3.py
> lib/python${MODPY_VERSION}/site-packages/hgdemandimport/tracing.py
> lib/python${MODPY_VERSION}/site-packages/hgext/
> @@ -377,12 +375,12 @@
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffhelper.${
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffutil.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstate.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstateguard.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstatemap.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchange.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchangev2.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exthelper.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}fancyopts.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -491,8 +489,6 @@
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotoserv
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprototypes.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1peer.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2peer.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2server.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
>
Update devel/mercurial to 6.2
Not a mercurial user, but passes a few quick checks. Tests fail in the
same way as they did for 5.8. Shell completers are installed correctly
now.
diff --git Makefile Makefile
index 28ad010a64c..022cc404225 100644
--- Makefile
+++ Makefile
@@ -1,12 +1,10 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =5.8
+MODPY_EGG_VERSION =6.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
-REVISION = 1
-
HOMEPAGE = https://www.mercurial-scm.org
# GPLv2
@@ -36,8 +34,7 @@ RUN_DEPENDS-x11 +=${BASE_PKGPATH},-main \
FILES =hgeditor hgweb.cgi
-CONTRIBFILES = bash_completion mercurial.el \
- tcsh_completion zsh_completion \
+CONTRIBFILES = mercurial.el tcsh_completion \
mq.el
CONTRIBDIRS = hgsh vim
diff --git distinfo distinfo
index a6fabe184d2..9a10d621347 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-5.8.tar.gz) = /F1qj2R42I74PN0Ktthq1o7nIrvfSWTmoLR8PGulMJ8=
-SIZE (mercurial-5.8.tar.gz) = 7985326
+SHA256 (mercurial-6.2.tar.gz) = 04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=
+SIZE (mercurial-6.2.tar.gz) = 8053713
diff --git pkg/PLIST-main pkg/PLIST-main
index 72a6120b1c1..a0a03f97dd9 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -5,10 +5,8 @@ lib/python${MODPY_VERSION}/site-packages/hgdemandimport/
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy2.py
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy3.py
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/tracing.py
lib/python${MODPY_VERSION}/site-packages/hgext/
@@ -377,12 +375,12 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffhelper.${
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstate.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstateguard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstatemap.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchange.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchangev2.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exthelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}fancyopts.${MODPY_PYC_MAGIC_TAG}pyc
@@ -491,8 +489,6 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotoserv
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprototypes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1peer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2peer.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2server.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.py
@@ -554,13 +550,23 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelper.py
lib/python${MODPY_VERSION}/site-packages/mercurial/diffutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
Re: UPDATE: devel/mercurial 4.1.1
On 03/27/17 04:25, Juan Francisco Cantero Hurtado wrote: OK? Objections?. 4.1 is faster than 3.8 and includes chg and zstd. I would like to have this version in 6.1. czarkoff, the update breaks hg-git with https urls, even with the latest upstream code. git:// works for me. Let me know if you see more problems with your ports. Hi, mercurial and tortoisehg diff sounds good for me. ok @czarkoff? Remi.
UPDATE: devel/mercurial 4.1.1
OK? Objections?. 4.1 is faster than 3.8 and includes chg and zstd. I
would like to have this version in 6.1.
czarkoff, the update breaks hg-git with https urls, even with the latest
upstream code. git:// works for me. Let me know if you see more problems
with your ports.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile14 Jun 2016 19:58:05 - 1.68
+++ Makefile27 Mar 2017 01:57:23 -
@@ -3,16 +3,13 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =3.8.3
+MODPY_EGG_VERSION =4.1.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
PKGNAME-main = ${DISTNAME}
PKGNAME-x11 = mercurial-x11-${MODPY_EGG_VERSION}
-REVISION-main =0
-REVISION-x11 = 0
-
HOMEPAGE = http://www.mercurial-scm.org
MAINTAINER = Remi Pointel
@@ -24,6 +21,7 @@ MASTER_SITES =${HOMEPAGE}/release/
MODULES = lang/python x11/tk
USE_GROFF =Yes
+USE_GMAKE =Yes
MULTI_PACKAGES = -main -x11
@@ -45,12 +43,11 @@ SCRIPTS = hg-ssh hgk \
tcsh_completion_build.sh dumprevlog \
undumprevlog simplemerge
-WANTLIB-main +=${MODPY_WANTLIB} pthread
+WANTLIB-main +=${MODPY_WANTLIB} c pthread
WANTLIB-x11 =
PKG_ARCH-x11 = *
MODPY_ADJ_FILES = hgweb.cgi \
- contrib/convert-repo \
contrib/dumprevlog \
contrib/hg-ssh \
contrib/simplemerge \
@@ -58,11 +55,16 @@ MODPY_ADJ_FILES = hgweb.cgi \
pre-configure:
${MODTCL_WISH_ADJ} ${WRKSRC}/contrib/hgk
+post-build:
+ cd ${WRKSRC}/contrib/chg && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+
post-install:
+ ${INSTALL_MAN} ${WRKSRC}/contrib/chg/chg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/share/mercurial/
+ ${INSTALL_PROGRAM} ${WRKSRC}/contrib/chg/chg ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/hgeditor ${PREFIX}/share/mercurial
. for file in ${FILES}
${INSTALL_DATA} ${WRKSRC}/${file} \
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo14 Jun 2016 09:47:43 - 1.47
+++ distinfo27 Mar 2017 01:57:23 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.8.3.tar.gz) = +EVWzfmjMZhCYVSdnQgUOrnaM9fAPwqjI7DuUtB4Kkw=
-SIZE (mercurial-3.8.3.tar.gz) = 4772901
+SHA256 (mercurial-4.1.1.tar.gz) = Y1cb4SAvg8cgQeuMoqLrrtooTSAx/XCJGfxhBYnTNZ4=
+SIZE (mercurial-4.1.1.tar.gz) = 5132169
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 14 Jun 2016 09:47:43 - 1.7
+++ pkg/PLIST-main 27 Mar 2017 01:57:23 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.7 2016/06/14 09:47:43 czarkoff Exp $
@pkgpath devel/mercurial
+@bin bin/chg
bin/hg
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
@@ -14,8 +15,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/censor.py
lib/python${MODPY_VERSION}/site-packages/hgext/censor.pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/chgserver.py
-lib/python${MODPY_VERSION}/site-packages/hgext/chgserver.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
@@ -72,6 +71,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/bser.so
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/capabilities.py
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/capabilities.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/compat.py
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/compat.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/encoding.py
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/encoding.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/load.py
[UPDATE] devel/mercurial && devel/tortoisehg
Hi
these are the diff to update mercurial and tortoisehg to latest releases.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile 11 Oct 2015 15:57:02 - 1.65
+++ Makefile 30 Nov 2015 17:37:29 -
@@ -3,7 +3,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION = 3.5.2
+MODPY_EGG_VERSION = 3.6.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 distinfo
--- distinfo 11 Oct 2015 15:57:02 - 1.45
+++ distinfo 30 Nov 2015 17:37:29 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.5.2.tar.gz) = I/3AOFA5EbIdyeVWEYgD97HUFQ6xSTPS6j0P8Nxgq10=
-SIZE (mercurial-3.5.2.tar.gz) = 4415307
+SHA256 (mercurial-3.6.1.tar.gz) = 1GR5QxZa/9EbrwcFVWkgSB1TRrl2BLq6tq128XREdMY=
+SIZE (mercurial-3.6.1.tar.gz) = 4517652
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 9 Sep 2015 19:26:36 - 1.5
+++ pkg/PLIST-main 30 Nov 2015 17:37:29 -
@@ -16,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
lib/python${MODPY_VERSION}/site-packages/hgext/churn.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/clonebundles.py
+lib/python${MODPY_VERSION}/site-packages/hgext/clonebundles.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/color.py
lib/python${MODPY_VERSION}/site-packages/hgext/color.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/
@@ -180,6 +182,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/mergetools.rc
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/destutil.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/destutil.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
@@ -392,6 +396,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/store.py
lib/python${MODPY_VERSION}/site-packages/mercurial/store.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/streamclone.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/streamclone.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.py
@@ -568,7 +574,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/hgicon.png
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/hglogo.png
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/mercurial.js
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-coal.css
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-extra-coal.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-gitweb.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-monoblue.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-paper.css
Index: Makefile
===
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 11 Oct 2015 15:57:33 - 1.20
+++ Makefile 30 Nov 2015 17:38:09 -
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION = 3.5.2
+MODPY_EGG_VERSION = 3.6.1
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -25,7 +25,7 @@ RUN_DEPENDS = x11/py-qt4 \
editors/qscintilla \
devel/py-sip \
editors/py-qscintilla \
- devel/mercurial>=3.4,<3.6 \
+ devel/mercurial>=3.5,<3.7 \
devel/py-iniparse
NO_TEST = Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 distinfo
--- distinfo 11 Oct 2015 15:57:33 - 1.17
+++ distinfo 30 Nov 2015 17:38:09 -
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-3.5.2.tar.gz) = 9dNtjxm1CN0Ap6xyCvOIne/UDpn8tg2Qeg/vuchn3WM=
-SIZE
Re: [UPDATE] devel/mercurial && devel/tortoisehg
On 09/09/15 06:53, Remi Pointel wrote:
> Hi,
>
> these are the diff to update mercurial and tortoisehg to latest releases.
>
> Ok?
>
> Cheers,
>
> Remi.
tortoisehg is one I have a fix for locally.
RUN_DEPENDS = ${BUILD_DEPENDS}
can't be used, if USE_CCACHE is set, then devel/ccache is added to the
BUILD_DEPENDS which causes the RUN_DEPENDS dependency list to change and
include devel/ccache requiring a bump.
I used
$ cvs -R -q diff -uNp
Index: Makefile
===
RCS file: /home/cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile1 Mar 2015 14:07:34 - 1.17
+++ Makefile4 Sep 2015 01:14:10 -
@@ -21,7 +21,9 @@ BUILD_DEPENDS = x11/py-qt4 \
editors/qscintilla \
devel/py-sip
-RUN_DEPENDS = ${BUILD_DEPENDS} \
+RUN_DEPENDS = x11/py-qt4 \
+ editors/qscintilla \
+ devel/py-sip \
editors/py-qscintilla \
devel/mercurial>=3.2,<3.4 \
devel/py-iniparse
Re: [UPDATE] devel/mercurial && devel/tortoisehg
On 2015/09/09 08:47, Nigel wrote:
> On 09/09/15 06:53, Remi Pointel wrote:
> > Hi,
> >
> > these are the diff to update mercurial and tortoisehg to latest releases.
> >
> > Ok?
> >
> > Cheers,
> >
> > Remi.
> tortoisehg is one I have a fix for locally.
>
> RUN_DEPENDS = ${BUILD_DEPENDS}
>
> can't be used, if USE_CCACHE is set, then devel/ccache is added to the
> BUILD_DEPENDS which causes the RUN_DEPENDS dependency list to change and
> include devel/ccache requiring a bump.
correct - please don't use this construct.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/devel/tortoisehg/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile1 Mar 2015 14:07:34 - 1.17
> +++ Makefile4 Sep 2015 01:14:10 -
> @@ -21,7 +21,9 @@ BUILD_DEPENDS = x11/py-qt4 \
> editors/qscintilla \
> devel/py-sip
>
> -RUN_DEPENDS = ${BUILD_DEPENDS} \
> +RUN_DEPENDS = x11/py-qt4 \
> + editors/qscintilla \
> + devel/py-sip \
> editors/py-qscintilla \
> devel/mercurial>=3.2,<3.4 \
> devel/py-iniparse
>
OK.
[UPDATE] devel/mercurial && devel/tortoisehg
Hi,
these are the diff to update mercurial and tortoisehg to latest releases.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 Makefile
--- Makefile12 Aug 2015 06:13:56 - 1.63
+++ Makefile9 Sep 2015 05:52:54 -
@@ -3,8 +3,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =3.2.3
-REVISION-main =0
+MODPY_EGG_VERSION =3.5.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -36,7 +35,7 @@ FILES = hgeditor hgweb.cgi
CONTRIBFILES = bash_completion mercurial.el \
tcsh_completion zsh_completion \
- mergetools.hgrc mq.el
+ mq.el
CONTRIBDIRS = hgsh vim
SCRIPTS = hg-ssh hgk \
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.43
diff -u -p -u -p -r1.43 distinfo
--- distinfo21 Dec 2014 20:44:08 - 1.43
+++ distinfo9 Sep 2015 05:52:54 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.2.3.tar.gz) = xDaTIOJ214qtobWTbpbHu7u4FUz7pyXvTodX3O3q8e8=
-SIZE (mercurial-3.2.3.tar.gz) = 4078011
+SHA256 (mercurial-3.5.1.tar.gz) = mX2kXaMD45lnjFvM1745sPq/KcfgL9PIdRwv+IyKJZ0=
+SIZE (mercurial-3.5.1.tar.gz) = 4414284
Index: patches/patch-mercurial_sshpeer_py
===
RCS file: patches/patch-mercurial_sshpeer_py
diff -N patches/patch-mercurial_sshpeer_py
--- patches/patch-mercurial_sshpeer_py 1 Jun 2015 13:40:56 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,29 +0,0 @@
-$OpenBSD: patch-mercurial_sshpeer_py,v 1.1 2015/06/01 13:40:56 jasper Exp $
-
-Security fix for CVE-2014-9462
-https://selenic.com/hg/rev/e3f30068d2eb
-http://chargen.matasano.com/chargen/2015/3/17/this-new-vulnerability-mercurial-command-injection-cve-2014-9462.html
-
mercurial/sshpeer.py.orig Thu Dec 18 21:59:22 2014
-+++ mercurial/sshpeer.py Mon Jun 1 14:11:37 2015
-@@ -20,6 +20,8 @@ class remotelock(object):
- self.release()
-
- def _serverquote(s):
-+if not s:
-+return s
- '''quote a string for the remote shell ... which we assume is sh'''
- if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s):
- return s
-@@ -45,7 +47,10 @@ class sshpeer(wireproto.wirepeer):
- sshcmd = self.ui.config("ui", "ssh", "ssh")
- remotecmd = self.ui.config("ui", "remotecmd", "hg")
-
--args = util.sshargs(sshcmd, self.host, self.user, self.port)
-+args = util.sshargs(sshcmd,
-+_serverquote(self.host),
-+_serverquote(self.user),
-+_serverquote(self.port))
-
- if create:
- cmd = '%s %s %s' % (sshcmd, args,
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 21 Dec 2014 20:44:08 - 1.4
+++ pkg/PLIST-main 9 Sep 2015 05:52:54 -
@@ -10,6 +10,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/blackbox.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/censor.py
+lib/python${MODPY_VERSION}/site-packages/hgext/censor.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
@@ -168,10 +170,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/context.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/copies.py
lib/python${MODPY_VERSION}/site-packages/mercurial/copies.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/crecord.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/crecord.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/dagparser.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dagparser.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/
+lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/mergetools.rc
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/diffhelpers.so
@@ -226,6 +232,7 @@ lib/python${MODPY_VERSION}/site-packages
Re: [UPDATE] devel/mercurial
On Sat, Dec 20, 2014 at 08:07:33AM +0100, Remi Pointel wrote:
Hi,
this is the diff to update mercurial to 3.2.3.
Ok?
Cheers,
Remi.
ok shadchin@
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 - 1.60
+++ Makefile 20 Dec 2014 07:03:20 -
@@ -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 - 1.42
+++ distinfo 20 Dec 2014 07:03:20 -
@@ -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-main19 May 2014 19:15:45 - 1.3
+++ pkg/PLIST-main20 Dec 2014 07:03:20 -
@@ -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
--
Alexandr Shadchin
[UPDATE] devel/mercurial
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
--- Makefile19 May 2014 19:15:44 - 1.60
+++ Makefile20 Dec 2014 07:03:20 -
@@ -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
--- distinfo19 May 2014 19:15:44 - 1.42
+++ distinfo20 Dec 2014 07:03:20 -
@@ -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 - 1.3
+++ pkg/PLIST-main 20 Dec 2014 07:03:20 -
@@ -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
[UPDATE] devel/mercurial devel/tortoisehg
Hi,
these are the diff to update mercurial and tortoisehg to latest release.
Any ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile5 Sep 2013 11:20:18 - 1.56
+++ Makefile8 Nov 2013 08:27:26 -
@@ -3,10 +3,9 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =2.6.3
+MODPY_EGG_VERSION =2.8
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
-REVISION-main =0
PKGNAME-main = ${DISTNAME}
PKGNAME-x11 = mercurial-x11-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.38
diff -u -p -r1.38 distinfo
--- distinfo9 Jul 2013 10:00:00 - 1.38
+++ distinfo8 Nov 2013 08:27:26 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.6.3.tar.gz) = EjCKQhDx7hGF0D8YdXdC+oonWQdsLnE/NUMvib9WkRw=
-SIZE (mercurial-2.6.3.tar.gz) = 3736480
+SHA256 (mercurial-2.8.tar.gz) = /3QXVPYWDiQni6dK+94q/U1ctatTK2lzRinM5ou+Fu8=
+SIZE (mercurial-2.8.tar.gz) = 3833669
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- pkg/PLIST-main 5 Sep 2013 11:20:19 - 1.1
+++ pkg/PLIST-main 8 Nov 2013 08:27:26 -
@@ -117,6 +117,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/schemes.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/share.py
lib/python${MODPY_VERSION}/site-packages/hgext/share.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/shelve.py
+lib/python${MODPY_VERSION}/site-packages/hgext/shelve.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/strip.py
+lib/python${MODPY_VERSION}/site-packages/hgext/strip.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/transplant.py
lib/python${MODPY_VERSION}/site-packages/hgext/transplant.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/win32mbcs.py
@@ -202,6 +206,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/help/
lib/python${MODPY_VERSION}/site-packages/mercurial/help.py
lib/python${MODPY_VERSION}/site-packages/mercurial/help.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/common.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/config.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/dates.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/diffs.txt
@@ -209,7 +214,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/help/extensions.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/filesets.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/glossary.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/hg.1.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/hgignore.5.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/hgignore.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/help/hgrc.5.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/hgweb.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/merge-tools.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/help/multirevs.txt
@@ -430,6 +438,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.changelog
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.compact
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.default
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.phases
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.xml
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/bookmarks.tmpl
@@ -482,6 +491,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/paper/shortlogentry.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/paper/tags.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/changelog.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/changeset.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/error.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/fileannotate.tmpl
@@ -490,9 +500,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/graphedge.tmpl
[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to 2.4.2.
Are you ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile12 Dec 2012 06:07:14 - 1.50
+++ Makefile8 Jan 2013 14:23:51 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.4
+MODPY_EGG_VERSION =2.4.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo12 Dec 2012 06:07:14 - 1.34
+++ distinfo8 Jan 2013 14:23:51 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
-SIZE (mercurial-2.4.tar.gz) = 3607276
+SHA256 (mercurial-2.4.2.tar.gz) = zCEIPX6rTKqBWblB42xyKay7bUGianvtIadxs/Y97fM=
+SIZE (mercurial-2.4.2.tar.gz) = 3613392
Re: [UPDATE] devel/mercurial
Hey Remi,
regress on i386:
Failed test-backwards-remove.t: output changed
Failed test-clone.t: output changed
Failed test-command-template.t: output changed
Failed test-convert-cvs-synthetic.t: output changed
Failed test-convert-cvsnt-mergepoints.t: output changed
Failed test-convert.t: output changed
Failed test-fetch.t: output changed
Failed test-journal-exists.t: output changed
Failed test-largefiles.t: timed out
Failed test-lock-badness.t: output changed
Failed test-permissions.t: output changed
Failed test-pull-permission.t: output changed
Failed test-purge.t: output changed
Failed test-repair-strip.t: output changed
Failed test-revert-unknown.t: output changed
Failed test-revert.t: output changed
Failed test-serve.t: output changed
Failed test-subrepo-git.t: output changed
Failed test-subrepo-missing.t: output changed
Failed test-update-reverse.t: output changed
# Ran 415 tests, 0 skipped, 20 failed.
couldn't test on loogson my cc is broken.
Samir.
On Thu, Nov 29, 2012 at 06:50:37AM +0100, Remi Pointel wrote:
Hi,
this is the diff to update Mercurial to 2.4.
Changelog:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.4_.282012-11-1.29
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile 8 Sep 2012 08:00:45 - 1.49
+++ Makefile 27 Nov 2012 08:20:17 -
@@ -2,7 +2,7 @@
COMMENT =fast, lightweight source control management
-MODPY_EGG_VERSION = 2.3.1
+MODPY_EGG_VERSION = 2.4
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo 8 Sep 2012 08:00:45 - 1.33
+++ distinfo 27 Nov 2012 08:20:17 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.3.1.tar.gz) =
71h/3TsGLgjrQBLnhw9NCgD9g08RV4v7qAMTsQ+AhUE=
-SIZE (mercurial-2.3.1.tar.gz) = 3558058
+SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
+SIZE (mercurial-2.4.tar.gz) = 3607276
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 8 Sep 2012 08:00:45 - 1.25
+++ pkg/PLIST 27 Nov 2012 08:20:17 -
@@ -527,7 +527,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-monoblue.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-paper.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style.css
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/template-vars.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.py
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/treediscovery.py
[UPDATE] devel/mercurial
Hi,
this is the diff to update Mercurial to 2.4.
Changelog:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.4_.282012-11-1.29
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile8 Sep 2012 08:00:45 - 1.49
+++ Makefile27 Nov 2012 08:20:17 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.3.1
+MODPY_EGG_VERSION =2.4
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo8 Sep 2012 08:00:45 - 1.33
+++ distinfo27 Nov 2012 08:20:17 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.3.1.tar.gz) = 71h/3TsGLgjrQBLnhw9NCgD9g08RV4v7qAMTsQ+AhUE=
-SIZE (mercurial-2.3.1.tar.gz) = 3558058
+SHA256 (mercurial-2.4.tar.gz) = OIeFNYiBzrRAm6obgYDCyE1fNU6ozvGJI91JEAzVIQM=
+SIZE (mercurial-2.4.tar.gz) = 3607276
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -r1.25 PLIST
--- pkg/PLIST 8 Sep 2012 08:00:45 - 1.25
+++ pkg/PLIST 27 Nov 2012 08:20:17 -
@@ -527,7 +527,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-monoblue.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-paper.css
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style.css
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/template-vars.txt
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.py
lib/python${MODPY_VERSION}/site-packages/mercurial/transaction.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/treediscovery.py
[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to last release: 2.3.1.
Changelog:
http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.3.1_.282012-09-01.29
Is it ok?
Cheers,
Remi.Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile12 Jun 2012 07:16:43 - 1.48
+++ Makefile6 Sep 2012 06:42:57 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.2.2
+MODPY_EGG_VERSION =2.3.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo12 Jun 2012 07:16:43 - 1.32
+++ distinfo6 Sep 2012 06:42:57 -
@@ -1,5 +1,2 @@
-MD5 (mercurial-2.2.2.tar.gz) = n1m11xlpy7JnFwLNKnpaEQ==
-RMD160 (mercurial-2.2.2.tar.gz) = 8mpO7/eKhn1IyH4rEm5iO2YjJYg=
-SHA1 (mercurial-2.2.2.tar.gz) = cgcFMfFzzLQ5SyJ5FMRWeMlj66o=
-SHA256 (mercurial-2.2.2.tar.gz) = NIkRDsEf770sve+41xXQqGnO891ymq9NUUEQj4vhYAo=
-SIZE (mercurial-2.2.2.tar.gz) = 3430037
+SHA256 (mercurial-2.3.1.tar.gz) = 71h/3TsGLgjrQBLnhw9NCgD9g08RV4v7qAMTsQ+AhUE=
+SIZE (mercurial-2.3.1.tar.gz) = 3558058
Index: pkg/PFRAG.shared
===
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared20 Mar 2012 19:55:38 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2012/03/20 19:55:38 rpointel Exp $
-lib/python${MODPY_VERSION}/site-packages/mercurial/base85.so
-lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
-lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
-lib/python${MODPY_VERSION}/site-packages/mercurial/mpatch.so
-lib/python${MODPY_VERSION}/site-packages/mercurial/osutil.so
-lib/python${MODPY_VERSION}/site-packages/mercurial/parsers.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.24
diff -u -p -r1.24 PLIST
--- pkg/PLIST 11 May 2012 05:32:50 - 1.24
+++ pkg/PLIST 6 Sep 2012 06:42:57 -
@@ -66,6 +66,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/highlight/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/highlight/highlight.py
lib/python${MODPY_VERSION}/site-packages/hgext/highlight/highlight.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/histedit.py
+lib/python${MODPY_VERSION}/site-packages/hgext/histedit.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/interhg.py
lib/python${MODPY_VERSION}/site-packages/hgext/interhg.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/keyword.py
@@ -136,6 +138,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/archival.py
lib/python${MODPY_VERSION}/site-packages/mercurial/archival.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/base85.so
+lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py
lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
@@ -164,6 +168,7 @@ 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/diffhelpers.so
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/discovery.py
@@ -239,27 +244,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/
lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/__init__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/_readers.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/_readers.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/socketutil.py
lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/socketutil.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/tests/
-lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/tests/simple_http_test.py
[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to 2.2.2.
Are you ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile11 May 2012 05:32:50 - 1.47
+++ Makefile12 Jun 2012 05:01:06 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.2.1
+MODPY_EGG_VERSION =2.2.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo11 May 2012 05:32:50 - 1.31
+++ distinfo12 Jun 2012 05:01:06 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-2.2.1.tar.gz) = D/fH98UOUG1JT/hLqhCnfQ==
-RMD160 (mercurial-2.2.1.tar.gz) = AvNEqYCltQi3QZaCWJYsr4mW/Z4=
-SHA1 (mercurial-2.2.1.tar.gz) = QJYaQ2kgYo/520jciquAEtctzVI=
-SHA256 (mercurial-2.2.1.tar.gz) = q0/+dRVT+FKBPCGtc5B1MP+8WqObDPli9h/nDxlsu4E=
-SIZE (mercurial-2.2.1.tar.gz) = 3414944
+MD5 (mercurial-2.2.2.tar.gz) = n1m11xlpy7JnFwLNKnpaEQ==
+RMD160 (mercurial-2.2.2.tar.gz) = 8mpO7/eKhn1IyH4rEm5iO2YjJYg=
+SHA1 (mercurial-2.2.2.tar.gz) = cgcFMfFzzLQ5SyJ5FMRWeMlj66o=
+SHA256 (mercurial-2.2.2.tar.gz) = NIkRDsEf770sve+41xXQqGnO891ymq9NUUEQj4vhYAo=
+SIZE (mercurial-2.2.2.tar.gz) = 3430037
[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to last release: 2.2.1.
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile30 Apr 2012 17:01:02 - 1.46
+++ Makefile10 May 2012 20:16:22 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.1.2
+MODPY_EGG_VERSION =2.2.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo30 Apr 2012 17:01:02 - 1.30
+++ distinfo10 May 2012 20:16:22 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-2.1.2.tar.gz) = FTVNc5UE7Eb2ig/uLs+/JQ==
-RMD160 (mercurial-2.1.2.tar.gz) = SsmpHn3rvlVvHDFMw7b8h7bL8vA=
-SHA1 (mercurial-2.1.2.tar.gz) = b6LyUQdX4+Yu+p2JU/i3A7hAdbI=
-SHA256 (mercurial-2.1.2.tar.gz) = kU1IieGVaHIJ4HDAwzzzrnt41sbJL6fWzMcYqpaVmIY=
-SIZE (mercurial-2.1.2.tar.gz) = 3343349
+MD5 (mercurial-2.2.1.tar.gz) = D/fH98UOUG1JT/hLqhCnfQ==
+RMD160 (mercurial-2.2.1.tar.gz) = AvNEqYCltQi3QZaCWJYsr4mW/Z4=
+SHA1 (mercurial-2.2.1.tar.gz) = QJYaQ2kgYo/520jciquAEtctzVI=
+SHA256 (mercurial-2.2.1.tar.gz) = q0/+dRVT+FKBPCGtc5B1MP+8WqObDPli9h/nDxlsu4E=
+SIZE (mercurial-2.2.1.tar.gz) = 3414944
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- pkg/PLIST 20 Mar 2012 19:55:38 - 1.23
+++ pkg/PLIST 10 May 2012 20:16:22 -
@@ -49,6 +49,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/eol.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.py
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/factotum.py
+lib/python${MODPY_VERSION}/site-packages/hgext/factotum.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/fetch.py
lib/python${MODPY_VERSION}/site-packages/hgext/fetch.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.py
@@ -182,6 +184,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/filemerge.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/fileset.py
lib/python${MODPY_VERSION}/site-packages/mercurial/fileset.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/formatter.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/formatter.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/graphmod.py
lib/python${MODPY_VERSION}/site-packages/mercurial/graphmod.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/hbisect.py
@@ -331,6 +335,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/mercurial/posix.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/pushkey.py
lib/python${MODPY_VERSION}/site-packages/mercurial/pushkey.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/pvec.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/pvec.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.py
lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/repair.py
Re: [UPDATE] devel/mercurial
Hi Remi- On Thu, May 10, 2012 at 10:17:25PM +0200, Remi Pointel wrote: this is the diff to update mercurial to last release: 2.2.1. Is it ok? That looks great to me! -- Will Maier http://wcm.aier.us/
[UPDATE] devel/mercurial
Hi,
this is the diff to update mercurial to last release: 2.1.2.
Is it ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile20 Mar 2012 19:55:38 - 1.45
+++ Makefile28 Apr 2012 09:07:20 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =2.1.1
+MODPY_EGG_VERSION =2.1.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -24,7 +24,7 @@ USE_GROFF = Yes
BUILD_DEPENDS =devel/gettext
REGRESS_DEPENDS = ${RUN_DEPENDS} \
archivers/unzip \
- textproc/gsed
+ devel/git
FILES =hgeditor hgweb.cgi
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo20 Mar 2012 19:55:38 - 1.29
+++ distinfo28 Apr 2012 09:07:20 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-2.1.1.tar.gz) = No+rRwXr1NEpb91r0v5icg==
-RMD160 (mercurial-2.1.1.tar.gz) = 4XqZWgadGnpGU3pJGJUg35U6y28=
-SHA1 (mercurial-2.1.1.tar.gz) = 1sxLZJtnBRE3MuYnVniFQol7oAg=
-SHA256 (mercurial-2.1.1.tar.gz) = D47Csp8RIcbLc8F1CSgesTkd2/rXV7H3INfgbeCiXf0=
-SIZE (mercurial-2.1.1.tar.gz) = 3313261
+MD5 (mercurial-2.1.2.tar.gz) = FTVNc5UE7Eb2ig/uLs+/JQ==
+RMD160 (mercurial-2.1.2.tar.gz) = SsmpHn3rvlVvHDFMw7b8h7bL8vA=
+SHA1 (mercurial-2.1.2.tar.gz) = b6LyUQdX4+Yu+p2JU/i3A7hAdbI=
+SHA256 (mercurial-2.1.2.tar.gz) = kU1IieGVaHIJ4HDAwzzzrnt41sbJL6fWzMcYqpaVmIY=
+SIZE (mercurial-2.1.2.tar.gz) = 3343349
Index: patches/patch-tests_test-mq_t
===
RCS file: patches/patch-tests_test-mq_t
diff -N patches/patch-tests_test-mq_t
--- patches/patch-tests_test-mq_t 20 Mar 2012 19:55:38 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tests_test-mq_t,v 1.1 2012/03/20 19:55:38 rpointel Exp $
tests/test-mq.t.orig Mon Mar 19 14:03:28 2012
-+++ tests/test-mq.tMon Mar 19 14:03:44 2012
-@@ -1476,7 +1476,7 @@ Test that qfinish change phase when mq.secret=true
-
- Test that qfinish preserve phase when mq.secret=false
-
-- $ sed -i.bak -e 's/secret=true/secret=false/' $HGRCPATH
-+ $ gsed -i.bak -e 's/secret=true/secret=false/' $HGRCPATH
- $ hg qfinish qbase
- patch add-file2 finalized without changeset message
- $ hg phase 'all()'
Re: [UPDATE] devel/mercurial
Hi Remi- On Sat, Apr 28, 2012 at 11:18:06AM +0200, Remi Pointel wrote: this is the diff to update mercurial to last release: 2.1.2. Is it ok? Looks good -- thanks as usual! -- Will Maier http://wcm.aier.us/
Update devel/mercurial 1.7.3 - 1.8.1
Hello.
bump version number.
stripped post-build script for man pages.
man pages are well formatted in this release (compared to 1.7.3)
Samir.
Index: devel/mercurial/Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- devel/mercurial/Makefile10 Jan 2011 21:46:11 - 1.35
+++ devel/mercurial/Makefile25 Mar 2011 20:46:25 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =1.7.3
+MODPY_EGG_VERSION =1.8.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -35,14 +35,6 @@
SCRIPTS = convert-repo hg-ssh hgk \
tcsh_completion_build.sh dumprevlog \
undumprevlog simplemerge
-
-# Zap rst2man gunk that confuses nroff/mandoc.
-post-build:
-. for file in hg.1 hgignore.5 hgrc.5
- @cd ${WRKSRC}/doc \
- mv ${file} ${file}.orig \
- sed -e '/rst2man-indent-level/,/^\.SH/d' ${file}.orig
${file}
-. endfor
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
Index: devel/mercurial/distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- devel/mercurial/distinfo5 Jan 2011 17:20:13 - 1.23
+++ devel/mercurial/distinfo25 Mar 2011 20:46:25 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-1.7.3.tar.gz) = HWNa0wf6IKXpxq+6YUWnOw==
-RMD160 (mercurial-1.7.3.tar.gz) = SQQH0Hi5JXP6DOgJvswUq+FAd2M=
-SHA1 (mercurial-1.7.3.tar.gz) = MrUT4ZTxaHkQyq5bC7Kgc2q7mjo=
-SHA256 (mercurial-1.7.3.tar.gz) = GKWAgthYDIjHZFOkyb7Cd7oJe6nRMxyrRUu/RvwXRe4=
-SIZE (mercurial-1.7.3.tar.gz) = 2482093
+MD5 (mercurial-1.8.1.tar.gz) = 4KjPymmqQAPqMYeu1gnV4A==
+RMD160 (mercurial-1.8.1.tar.gz) = XhGuBAp4Kt0XGc9ddc4iM4vQk9U=
+SHA1 (mercurial-1.8.1.tar.gz) = FSwZ7tTigJ7ArKHDpi6OVh4YT8M=
+SHA256 (mercurial-1.8.1.tar.gz) = +t6gQ2QbADEyJJ/UQDKcQvqfA1NL3VGsmEBLXbyIqjE=
+SIZE (mercurial-1.8.1.tar.gz) = 2529579
Index: devel/mercurial/patches/patch-tests_run-tests_py
===
RCS file: /cvs/ports/devel/mercurial/patches/patch-tests_run-tests_py,v
retrieving revision 1.2
diff -u -r1.2 patch-tests_run-tests_py
--- devel/mercurial/patches/patch-tests_run-tests_py1 Aug 2009 03:21:46
- 1.2
+++ devel/mercurial/patches/patch-tests_run-tests_py25 Mar 2011 20:46:25
-
@@ -1,9 +1,9 @@
$OpenBSD: patch-tests_run-tests_py,v 1.2 2009/08/01 03:21:46 fgsch Exp $
tests/run-tests.py.origThu Jul 23 18:58:07 2009
-+++ tests/run-tests.py Mon Jul 27 02:01:17 2009
-@@ -67,7 +67,8 @@ SKIPPED_PREFIX = 'skipped: '
- FAILED_PREFIX = 'hghave check failed: '
- PYTHON = sys.executable
+--- tests/run-tests.py.origThu Mar 10 18:30:31 2011
tests/run-tests.py Mon Mar 21 22:36:06 2011
+@@ -74,7 +74,8 @@ IMPL_PATH = 'PYTHONPATH'
+ if 'java' in sys.platform:
+ IMPL_PATH = 'JYTHONPATH'
-requiredtools = [python, diff, grep, unzip, gunzip, bunzip2,
sed]
+requiredtools = [diff, grep, unzip, gunzip, bunzip2, sed]
Index: devel/mercurial/pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.17
diff -u -r1.17 PLIST
--- devel/mercurial/pkg/PLIST 22 Nov 2010 00:19:37 - 1.17
+++ devel/mercurial/pkg/PLIST 25 Mar 2011 20:46:25 -
@@ -6,8 +6,6 @@
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/bookmarks.py
-lib/python${MODPY_VERSION}/site-packages/hgext/bookmarks.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
@@ -115,6 +113,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/archival.py
lib/python${MODPY_VERSION}/site-packages/mercurial/archival.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py
Re: Update devel/mercurial 1.7.3 - 1.8.1
Hi Samir- On Fri, Mar 25, 2011 at 10:32:42PM +0100, Samir SAADA wrote: bump version number. stripped post-build script for man pages. man pages are well formatted in this release (compared to 1.7.3) Thanks for the update -- I ok'ed a similar one from fgsch@ earlier today. The extra bits in your diff look good to me, too. Federico: does Samir's update ok with you? Thanks! -- Will Maier http://will.m.aier.us/
Re: UPDATE devel/mercurial
Hi Vivien. Some comments after a quick look -- 1) Have you contacted the MAINTAINER to work with them on an update? 2) I think you might have forgotten to do a make update-patches 3) I don't think the i18n files should be removed. They're still in the 1.5 tar.gz source download, but looks like some work might be needed to get them back into the openbsd package? 4) No improvement for me with hg log | more versus 1.4.2 which seems to have some issues on the console on my end (I'm testing on amd64) other than that seems to work ok after a basic run although I did see some errors from make regress...
Re: UPDATE devel/mercurial
On 2010/03/21 04:32, Daniel Dickman wrote: 4) No improvement for me with hg log | more versus 1.4.2 which seems to have some issues on the console on my end (I'm testing on amd64) welcome to the astonishing world of piping threaded programs (python) to non-threaded ones (more) with userland threads ;-)
UPDATE devel/mercurial
Hi,
this is a diff for mercurial 1.5.
http://mercurial.selenic.com/wiki/WhatsNew#A1.5_-_2010-03-06
Thank you to comment!
--
Vivien MOREAU
Index: Makefile
===
RCS file: /cvs/openbsd/ports/devel/mercurial/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile12 Jan 2010 14:04:29 - 1.23
+++ Makefile21 Mar 2010 00:45:00 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =1.4.2
+MODPY_EGG_VERSION =1.5
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
HOMEPAGE = http://www.selenic.com/mercurial/
Index: distinfo
===
RCS file: /cvs/openbsd/ports/devel/mercurial/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo12 Jan 2010 14:04:29 - 1.16
+++ distinfo21 Mar 2010 00:45:00 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-1.4.2.tar.gz) = zyOwiH8EN8hgHVuJrkZjpg==
-RMD160 (mercurial-1.4.2.tar.gz) = BeuKiTKtsaSlMKCJcNbP+1LyoQs=
-SHA1 (mercurial-1.4.2.tar.gz) = a8XTNiTa59td7a4sZ29AsouUV2M=
-SHA256 (mercurial-1.4.2.tar.gz) = bIYF2XAlWulHAxonUtjB1Rnu5xTfFaytsQiZ1KqBwyk=
-SIZE (mercurial-1.4.2.tar.gz) = 1922947
+MD5 (mercurial-1.5.tar.gz) = bjE1eto1/iBVfwik6J+cQg==
+RMD160 (mercurial-1.5.tar.gz) = rcG8oxHsrIr9E0JGE/yVo3d/EBE=
+SHA1 (mercurial-1.5.tar.gz) = 9OX/U75mGovRQixwrnYzeq+/+lY=
+SHA256 (mercurial-1.5.tar.gz) = g2CEJ0FXALefDOHJCIcA5eB4EuDOVbuDm2cLDzFALJw=
+SIZE (mercurial-1.5.tar.gz) = 2017153
Index: pkg/PLIST
===
RCS file: /cvs/openbsd/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.14
diff -u -r1.14 PLIST
--- pkg/PLIST 2 Dec 2009 16:19:31 - 1.14
+++ pkg/PLIST 21 Mar 2010 00:45:00 -
@@ -78,6 +78,8 @@
lib/python${MODPY_VERSION}/site-packages/hgext/parentrevspec.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/patchbomb.py
lib/python${MODPY_VERSION}/site-packages/hgext/patchbomb.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/progress.py
+lib/python${MODPY_VERSION}/site-packages/hgext/progress.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/purge.py
lib/python${MODPY_VERSION}/site-packages/hgext/purge.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/rebase.py
@@ -191,20 +193,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/hook.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/httprepo.py
lib/python${MODPY_VERSION}/site-packages/mercurial/httprepo.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/
lib/python${MODPY_VERSION}/site-packages/mercurial/i18n.py
lib/python${MODPY_VERSION}/site-packages/mercurial/i18n.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/da.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/de.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/el.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/fr.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/hggettext
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/it.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/ja.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/pt_BR.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/sv.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/zh_CN.po
-lib/python${MODPY_VERSION}/site-packages/mercurial/i18n/zh_TW.po
lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.py
lib/python${MODPY_VERSION}/site-packages/mercurial/ignore.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/keepalive.py
@@ -293,6 +283,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/tags.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/templatefilters.py
lib/python${MODPY_VERSION}/site-packages/mercurial/templatefilters.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/templatekw.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/templatekw.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/templater.py
lib/python${MODPY_VERSION}/site-packages/mercurial/templater.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/
@@ -332,6 +324,7 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.changelog
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.compact
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.default
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-cmdline.xml
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/branches.tmpl
lib/python${MODPY_VERSION}/site-packages/mercurial/templates/monoblue/changelog.tmpl
UPDATE devel/mercurial
Hi,
Here is a diff for mercurial 1.4.2.
Tested on OpenBSD current amd64.
Changelog: http://mercurial.selenic.com/wiki/WhatsNew#A1.4.2_-_2010-01-01
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.22
diff -u Makefile
--- Makefile2 Dec 2009 16:19:31 - 1.22
+++ Makefile6 Jan 2010 19:25:40 -
@@ -2,7 +2,7 @@
COMMENT = fast, lightweight source control management
-MODPY_EGG_VERSION =1.4.1
+MODPY_EGG_VERSION =1.4.2
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
HOMEPAGE = http://www.selenic.com/mercurial/
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.15
diff -u distinfo
--- distinfo2 Dec 2009 16:19:31 - 1.15
+++ distinfo6 Jan 2010 19:25:40 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-1.4.1.tar.gz) = 6s/+ytWewUXmGh7fMys/Hw==
-RMD160 (mercurial-1.4.1.tar.gz) = zudE9ZeFoV2f+h+OWwtbz6IzJOg=
-SHA1 (mercurial-1.4.1.tar.gz) = 56eKK55Emsh0jYonXyKGI5XH2aY=
-SHA256 (mercurial-1.4.1.tar.gz) = hpYM89jKEmJKtifgU5FQnJsg1rPqT/HtY2tA4UsciF8=
-SIZE (mercurial-1.4.1.tar.gz) = 1917284
+MD5 (mercurial-1.4.2.tar.gz) = zyOwiH8EN8hgHVuJrkZjpg==
+RMD160 (mercurial-1.4.2.tar.gz) = BeuKiTKtsaSlMKCJcNbP+1LyoQs=
+SHA1 (mercurial-1.4.2.tar.gz) = a8XTNiTa59td7a4sZ29AsouUV2M=
+SHA256 (mercurial-1.4.2.tar.gz) = bIYF2XAlWulHAxonUtjB1Rnu5xTfFaytsQiZ1KqBwyk=
+SIZE (mercurial-1.4.2.tar.gz) = 1922947
Re: UPDATE devel/mercurial
2010/1/6 Max Varencov ad...@phpcode.us: Hi, Here is a diff for mercurial 1.4.2. Tested on OpenBSD current amd64. Also works fine here on i386.
Re: UPDATE devel/mercurial
On Wed, Jan 06, 2010 at 10:30:22PM +0300, Max Varencov wrote: Hi, Here is a diff for mercurial 1.4.2. Tested on OpenBSD current amd64. Changelog: http://mercurial.selenic.com/wiki/WhatsNew#A1.4.2_-_2010-01-01 have you contacted the maintainer? f.-
Re: UPDATE devel/mercurial
Hi Federico-
On Thu, Jan 07, 2010 at 01:43:11AM +, Federico G. Schwindt wrote:
On Wed, Jan 06, 2010 at 10:30:22PM +0300, Max Varencov wrote:
Here is a diff for mercurial 1.4.2.
Tested on OpenBSD current amd64.
Changelog: http://mercurial.selenic.com/wiki/WhatsNew#A1.4.2_-_2010-01-01
have you contacted the maintainer?
Not that I know of. ;) I'm back from the holidays, and this diff
looks good to me. I'll commit it tomorrow after bit of testing.
Thanks for the update, Max!
Unrelated: why did the Mercurial devs choose to set their time-based
release schedule to coincide with New Years? Sigh...
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | email.willma...@ml1.net |
*-[ BSD: Live Free or Die ]*
Re: UPDATE: devel/mercurial
On Tue, Mar 25, 2008 at 4:26 PM, Will Maier [EMAIL PROTECTED] wrote: This diff updates devel/mercurial to 1.0, released yesterday. Mercurial 1.0 includes several new features[0]. This update also enables the regress suite which, until 1.0, had largely been broken on OpenBSD. All tests pass on i386. Diff is attached and available via HTTP: http://www.lfod.us/files/ports/mercurial-1.0.diff diffstat: Makefile | 15 +- distinfo | 10 - pkg/PLIST | 66 ++ 3 files changed, 56 insertions(+), 35 deletions(-) Thanks! works well here on amd64. - benoît
UPDATE: devel/mercurial
This diff updates devel/mercurial to 1.0, released yesterday.
Mercurial 1.0 includes several new features[0]. This update also
enables the regress suite which, until 1.0, had largely been broken
on OpenBSD. All tests pass on i386.
Diff is attached and available via HTTP:
http://www.lfod.us/files/ports/mercurial-1.0.diff
diffstat:
Makefile | 15 +-
distinfo | 10 -
pkg/PLIST | 66 ++
3 files changed, 56 insertions(+), 35 deletions(-)
Thanks!
[0] http://www.selenic.com/pipermail/mercurial/2008-March/018014.html
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
? .hgignore
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.9
diff -u -u -p -r1.9 Makefile
--- Makefile28 Nov 2007 16:13:46 - 1.9
+++ Makefile25 Mar 2008 15:20:03 -
@@ -2,7 +2,8 @@
COMMENT= fast, lightweight source control management
-DISTNAME= mercurial-0.9.5
+VERSION= 1.0
+DISTNAME= mercurial-${VERSION}
CATEGORIES=devel
HOMEPAGE= http://www.selenic.com/mercurial/
@@ -18,11 +19,12 @@ MASTER_SITES= http://www.selenic.com/me
MODULES= lang/python
-# Many regress tests broken on OpenBSD.
-NO_REGRESS=Yes
+SUBST_VARS+= VERSION
CONTRIBFILES= bash_completion mercurial.el sample.hgrc \
- tcsh_completion zsh_completion
+ tcsh_completion zsh_completion hgwebdir.fcgi \
+ mergetools.hgrc mq.el
+
CONTRIBDIRS= git-viz hgsh vim
SCRIPTS= convert-repo darcs2hg.py hg-ssh hgdiff hgk \
tcsh_completion_build.sh
@@ -30,9 +32,9 @@ SCRIPTS= convert-repo darcs2hg.py hg-ss
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
- ${INSTALL_MAN} ${WRKSRC}/doc/hgmerge.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/share/mercurial/
+ ${INSTALL_SCRIPT} ${WRKSRC}/hgeditor ${PREFIX}/share/mercurial
. for file in ${CONTRIBFILES}
${INSTALL_DATA} ${WRKSRC}/contrib/${file} \
${PREFIX}/share/mercurial
@@ -46,5 +48,8 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/contrib/${script} \
${PREFIX}/share/mercurial
. endfor
+
+do-regress:
+ @cd ${WRKSRC}/tests ${MODPY_BIN} run-tests.py
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.6
diff -u -u -p -r1.6 distinfo
--- distinfo28 Nov 2007 16:13:46 - 1.6
+++ distinfo25 Mar 2008 15:20:03 -
@@ -1,5 +1,5 @@
-MD5 (mercurial-0.9.5.tar.gz) = qd1UvLh8ozIxXOgyk4FuNw==
-RMD160 (mercurial-0.9.5.tar.gz) = 6jjTFCpLEIfid33jtw34tGcs0jc=
-SHA1 (mercurial-0.9.5.tar.gz) = iJqD9M3OrZMyPXz0J2dRzCA5ZFU=
-SHA256 (mercurial-0.9.5.tar.gz) = z+ArqqThjDr2u68b5K0hyFcNSWK4zvt03YPZ8wn1ZNg=
-SIZE (mercurial-0.9.5.tar.gz) = 670808
+MD5 (mercurial-1.0.tar.gz) = n43X+m+Ihvd76bkj8AhQTA==
+RMD160 (mercurial-1.0.tar.gz) = IbVgPgM4mEIPT78bhR7eT2mnZXw=
+SHA1 (mercurial-1.0.tar.gz) = EWiehakYdEF8sRDe1sOk17MEKcs=
+SHA256 (mercurial-1.0.tar.gz) = xNPh6wu8HnfeWH7NRSdQuxoJVk7AVuK0yOKm20qGPg8=
+SIZE (mercurial-1.0.tar.gz) = 803187
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.5
diff -u -u -p -r1.5 PLIST
--- pkg/PLIST 28 Nov 2007 16:13:46 - 1.5
+++ pkg/PLIST 25 Mar 2008 15:20:03 -
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.5 2007/11/28 16:13:46 okan Exp $
%%SHARED%%
bin/hg
-bin/hgmerge
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
@@ -13,11 +12,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
+lib/python${MODPY_VERSION}/site-packages/hgext/churn.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/color.py
+lib/python${MODPY_VERSION}/site-packages/hgext/color.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/
lib/python${MODPY_VERSION}/site-packages/hgext/convert/__init__.py
Re: UPDATE: devel/mercurial
On Mon, Nov 26, 2007 at 10:41:06AM -0600, Will Maier wrote: This patch updates devel/mercurial to 0.9.5[0], the most recent stable release. As always, this version should interoperate well with older repositories and clients. Updated port tested on -current/i386. Upgrading and running works fine here, -current/i386 Cheers, Jon
Re: UPDATE: devel/mercurial
On Mon 2007.11.26 at 10:41 -0600, Will Maier wrote: This patch updates devel/mercurial to 0.9.5[0], the most recent stable release. As always, this version should interoperate well with older repositories and clients. Updated port tested on -current/i386. Patch attached and available via HTTP: http://www.lfod.us/files/ports/mercurial-0.9.5.diff Thanks! thanks, i'll look at this.
UPDATE: devel/mercurial
This patch updates devel/mercurial to 0.9.5[0], the most recent
stable release. As always, this version should interoperate well
with older repositories and clients. Updated port tested on
-current/i386.
Patch attached and available via HTTP:
http://www.lfod.us/files/ports/mercurial-0.9.5.diff
Thanks!
[0]
http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew#head-eab90ae0ad46d17b56c4c0e3ad1d0826f30320d0
diffstat:
4 files changed, 43 insertions(+), 7 deletions(-)
Makefile |4 ++--
distinfo | 10 +-
pkg/PFRAG.shared |2 ++
pkg/PLIST| 34 ++
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@
COMMENT= fast, lightweight source control management
-DISTNAME= mercurial-0.9.4
-PKGNAME= ${DISTNAME}p0
+DISTNAME= mercurial-0.9.5
+PKGNAME= ${DISTNAME}
CATEGORIES=devel
HOMEPAGE= http://www.selenic.com/mercurial/
diff --git a/distinfo b/distinfo
--- a/distinfo
+++ b/distinfo
@@ -1,5 +1,5 @@ MD5 (mercurial-0.9.4.tar.gz) = LlrG3fQ0U
-MD5 (mercurial-0.9.4.tar.gz) = LlrG3fQ0U0k41Pwn3JeXyQ==
-RMD160 (mercurial-0.9.4.tar.gz) = vXCkmpj1PNi9VTylVfwl/ZU/9Tg=
-SHA1 (mercurial-0.9.4.tar.gz) = jb69dqtZYRF3uDhbu5fJpA/nFoM=
-SHA256 (mercurial-0.9.4.tar.gz) = Jplt9n1QjhKdLwomTiUHJ2TlwtIWBuFljXfImE5u1ko=
-SIZE (mercurial-0.9.4.tar.gz) = 586918
+MD5 (mercurial-0.9.5.tar.gz) = qd1UvLh8ozIxXOgyk4FuNw==
+RMD160 (mercurial-0.9.5.tar.gz) = 6jjTFCpLEIfid33jtw34tGcs0jc=
+SHA1 (mercurial-0.9.5.tar.gz) = iJqD9M3OrZMyPXz0J2dRzCA5ZFU=
+SHA256 (mercurial-0.9.5.tar.gz) = z+ArqqThjDr2u68b5K0hyFcNSWK4zvt03YPZ8wn1ZNg=
+SIZE (mercurial-0.9.5.tar.gz) = 670808
diff --git a/pkg/PFRAG.shared b/pkg/PFRAG.shared
--- a/pkg/PFRAG.shared
+++ b/pkg/PFRAG.shared
@@ -1,4 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2006/12/23 04:17:20 jolan Exp $
lib/python${MODPY_VERSION}/site-packages/mercurial/base85.so
lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
+lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
lib/python${MODPY_VERSION}/site-packages/mercurial/mpatch.so
+lib/python${MODPY_VERSION}/site-packages/mercurial/osutil.so
diff --git a/pkg/PLIST b/pkg/PLIST
--- a/pkg/PLIST
+++ b/pkg/PLIST
@@ -7,8 +7,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/alias.py
+lib/python${MODPY_VERSION}/site-packages/hgext/alias.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/children.py
+lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/
lib/python${MODPY_VERSION}/site-packages/hgext/convert/__init__.py
lib/python${MODPY_VERSION}/site-packages/hgext/convert/__init__.pyc
@@ -16,10 +20,18 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/convert/common.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/cvs.py
lib/python${MODPY_VERSION}/site-packages/hgext/convert/cvs.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/darcs.py
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/darcs.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/filemap.py
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/filemap.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/git.py
lib/python${MODPY_VERSION}/site-packages/hgext/convert/git.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/convert/hg.py
lib/python${MODPY_VERSION}/site-packages/hgext/convert/hg.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/subversion.py
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/subversion.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/transport.py
+lib/python${MODPY_VERSION}/site-packages/hgext/convert/transport.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.py
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/fetch.py
@@ -32,19 +44,28 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/hgk.py
lib/python${MODPY_VERSION}/site-packages/hgext/hgk.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/imerge.py
+lib/python${MODPY_VERSION}/site-packages/hgext/imerge.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/interhg.py
Re: UPDATE: devel/mercurial
On Tue, Jun 26, 2007 at 05:25:53AM -0500, Will Maier wrote:
This diff updates devel/mercurial to 0.9.4[0], which was released
yesterday. In the port, I removed USE_GMAKE since regress tests
are disabled. The purge contribution has also been included as an
internal extension.
Tests fine on i386/-current.
Diff attached and available via HTTP:
http://www.lfod.us/files/ports/mercurial-0.9.4.diff
Any feedback on this update?
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Re: UPDATE: devel/mercurial
On Fri, Jul 13, 2007 at 07:02:39AM -0500, Will Maier wrote: On Tue, Jun 26, 2007 at 05:25:53AM -0500, Will Maier wrote: This diff updates devel/mercurial to 0.9.4[0], which was released yesterday. In the port, I removed USE_GMAKE since regress tests are disabled. The purge contribution has also been included as an internal extension. Tests fine on i386/-current. Diff attached and available via HTTP: http://www.lfod.us/files/ports/mercurial-0.9.4.diff Any feedback on this update? Sure thing! Some light testing on amd64/-current seems to indicate it works... I also tried it lightly on i386, seems to work there also. FWIW. Cheers, Jon
Re: UPDATE: devel/mercurial
Hi, On Fri, Jul 13, 2007 at 07:02:39AM -0500, Will Maier wrote: Diff attached and available via HTTP: http://www.lfod.us/files/ports/mercurial-0.9.4.diff Any feedback on this update? Works for me on sparc64. -- Nicholas.
Re: UPDATE: devel/mercurial
On Sun, Dec 17, 2006 at 08:14:22PM -0600, Will Maier wrote:
This patch updates devel/mercurial to version 0.9.3, released
today. This release fixes a number of bugs introduced with the
short-lived 0.9.2. Changes included in 0.9.3 can be found on the
Mercurial website:
http://www.selenic.com/mercurial/
Many regress tests continue to be broken on OpenBSD; I'm working
on improving that. The diff is attached and available via HTTP:
http://www.lfod.us/files/ports/mercurial-0.9.3.diff
Could someone look at this? The diff is still available at the URL
above.
Thanks!
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Re: UPDATE: devel/mercurial
On Sun, Dec 17, 2006 at 08:14:22PM -0600, Will Maier wrote: Could someone look at this? The diff is still available at the URL above. tested on i386, it works great Giovanni Bechis
UPDATE: devel/mercurial
This patch updates devel/mercurial to version 0.9.3, released today.
This release fixes a number of bugs introduced with the short-lived
0.9.2. Changes included in 0.9.3 can be found on the Mercurial website:
http://www.selenic.com/mercurial/
Many regress tests continue to be broken on OpenBSD; I'm working on
improving that. The diff is attached and available via HTTP:
http://www.lfod.us/files/ports/mercurial-0.9.3.diff
Thanks!
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile
--- Makefile2006/10/09 14:29:54 1.4
+++ Makefile2006/12/18 02:07:17
@@ -2,9 +2,7 @@
COMMENT= fast, lightweight source control management
-VERSION= 0.9.1
-DISTNAME= mercurial-${VERSION}
-PKGNAME= ${DISTNAME}p0
+DISTNAME= mercurial-0.9.3
CATEGORIES=devel
HOMEPAGE= http://www.selenic.com/mercurial/
@@ -20,7 +18,9 @@
USE_GMAKE= Yes
MODULES= lang/python
-# REGRESS_TARGET= tests # Currently incompatible with BSD merge
+
+# Many regress tests broken on OpenBSD.
+NO_REGRESS=Yes
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo2006/09/22 04:22:26 1.2
+++ distinfo2006/12/18 02:07:17
@@ -1,4 +1,4 @@
-MD5 (mercurial-0.9.1.tar.gz) = 9ed3962bba640a686c37faa47739270c
-RMD160 (mercurial-0.9.1.tar.gz) = f34db5fbfcc5b3e90b2bce7577d3446f6159b057
-SHA1 (mercurial-0.9.1.tar.gz) = a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e
-SIZE (mercurial-0.9.1.tar.gz) = 401485
+MD5 (mercurial-0.9.3.tar.gz) = 5e39fed853e5669cbac32b77a67bb6dd
+RMD160 (mercurial-0.9.3.tar.gz) = 9a25e508ebbe8e1827f26f6731ab085ce535f73a
+SHA1 (mercurial-0.9.3.tar.gz) = a91c769ea78bffc15017a2157d05b87b9218ca40
+SIZE (mercurial-0.9.3.tar.gz) = 530289
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/devel/mercurial/pkg/PFRAG.shared,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 PFRAG.shared
--- pkg/PFRAG.shared2006/05/28 15:39:59 1.1.1.1
+++ pkg/PFRAG.shared2006/12/18 02:07:17
@@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/05/28 15:39:59 avsm Exp $
+lib/python${MODPY_VERSION}/site-packages/mercurial/base85.so
lib/python${MODPY_VERSION}/site-packages/mercurial/bdiff.so
lib/python${MODPY_VERSION}/site-packages/mercurial/mpatch.so
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.2
diff -u -u -r1.2 PLIST
--- pkg/PLIST 2006/09/22 04:22:26 1.2
+++ pkg/PLIST 2006/12/18 02:07:17
@@ -11,6 +11,8 @@
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.py
lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fetch.py
+lib/python${MODPY_VERSION}/site-packages/hgext/fetch.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.py
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.py
@@ -23,6 +25,8 @@
lib/python${MODPY_VERSION}/site-packages/hgext/notify.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/patchbomb.py
lib/python${MODPY_VERSION}/site-packages/hgext/patchbomb.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/transplant.py
+lib/python${MODPY_VERSION}/site-packages/hgext/transplant.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/win32text.py
lib/python${MODPY_VERSION}/site-packages/hgext/win32text.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/
@@ -30,6 +34,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/appendfile.py
lib/python${MODPY_VERSION}/site-packages/mercurial/appendfile.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/archival.py
@@ -42,6 +48,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/changegroup.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.py
lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/cmdutil.py
Re: UPDATE: devel/mercurial
On Mon, Jul 24, 2006 at 06:16:11PM -0500, Will Maier wrote:
This is a update of devel/mercurial from 0.9 to 0.9.1, a bugfix
release. This update also adds me as MAINTAINER (the port had none
previously). Diff attached.
It looks like some of the REGRESS tests will continue to be broken
until post-0.9.1, unfortunately. This updated diff, however,
installs useful files from contrib/ (vim plugins, (z|tc)sh
completion widgets, etc) to /u/l/share/mercurial.
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile3 Jun 2006 12:39:30 - 1.2
+++ Makefile27 Jul 2006 11:28:04 -
@@ -2,12 +2,13 @@
COMMENT= fast, lightweight source control management
-VERSION= 0.9
+VERSION= 0.9.1
DISTNAME= mercurial-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=devel
HOMEPAGE= http://www.selenic.com/mercurial/
+MAINTAINER=Will Maier [EMAIL PROTECTED]
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
@@ -18,12 +19,23 @@
USE_GMAKE= Yes
MODULES= lang/python
-# REGRESS_TARGET= tests # (some tests also fail on Linux)
+# REGRESS_TARGET= tests # Currently incompatible with BSD merge
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/hgmerge.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/mercurial/
+.for file in bash_completion mercurial.el sample.hgrc tcsh_completion
zsh_completion
+ ${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${PREFIX}/share/mercurial/.
+.endfor
+.for script in convert-repo darcs2hg.py hg-ssh hgdiff hgk
tcsh_completion_build.sh
+ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${script}
${PREFIX}/share/mercurial/.
+.endfor
+.for dir in git-viz hgsh purge vim
+ @cp -rp ${WRKSRC}/contrib/${dir} ${PREFIX}/share/mercurial/.
+.endfor
+
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo28 May 2006 15:39:59 - 1.1.1.1
+++ distinfo27 Jul 2006 11:28:04 -
@@ -1,4 +1,4 @@
-MD5 (mercurial-0.9.tar.gz) = d4154d12dcbda78251750c2a18eae940
-RMD160 (mercurial-0.9.tar.gz) = 4ab0646abeea17bebf2262457448ef39959b5311
-SHA1 (mercurial-0.9.tar.gz) = d633a9fee89ed8aee22d5a52138c673e01feed7f
-SIZE (mercurial-0.9.tar.gz) = 326107
+MD5 (mercurial-0.9.1.tar.gz) = 9ed3962bba640a686c37faa47739270c
+RMD160 (mercurial-0.9.1.tar.gz) = f34db5fbfcc5b3e90b2bce7577d3446f6159b057
+SHA1 (mercurial-0.9.1.tar.gz) = a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e
+SIZE (mercurial-0.9.1.tar.gz) = 401485
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 28 May 2006 15:39:59 - 1.1.1.1
+++ pkg/PLIST 27 Jul 2006 11:28:04 -
@@ -5,12 +5,18 @@
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
+lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.py
+lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.py
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.py
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/hgk.py
+lib/python${MODPY_VERSION}/site-packages/hgext/hgk.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/mq.py
lib/python${MODPY_VERSION}/site-packages/hgext/mq.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/notify.py
@@ -38,6 +44,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/commands.py
lib/python${MODPY_VERSION}/site-packages/mercurial/commands.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/context.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/context.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/demandload.py
Re: UPDATE: devel/mercurial
On Thu, Jul 27, 2006 at 06:32:38AM -0500, Will Maier wrote:
On Mon, Jul 24, 2006 at 06:16:11PM -0500, Will Maier wrote:
This is a update of devel/mercurial from 0.9 to 0.9.1, a bugfix
release. This update also adds me as MAINTAINER (the port had none
previously). Diff attached.
It looks like some of the REGRESS tests will continue to be broken
until post-0.9.1, unfortunately. This updated diff, however,
installs useful files from contrib/ (vim plugins, (z|tc)sh
completion widgets, etc) to /u/l/share/mercurial.
I've received positive test reports on i386/-current for this latest
version; my tests look good as well. Commit?
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
UPDATE: devel/mercurial
.*-
This is a update of devel/mercurial from 0.9 to 0.9.1, a bugfix
release. This update also adds me as MAINTAINER (the port had none
previously). Diff attached.
Update tested on a variety of hg repositories on i386/-current.
Upstream changes:
http://www.selenic.com/pipermail/mercurial/2006-July/009510.html
Testing and comments appreciated!
--
o--{ Will Maier }--o
| web:...http://www.lfod.us/ | [EMAIL PROTECTED] |
*--[ BSD Unix: Live Free or Die ]--*
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile3 Jun 2006 12:39:30 - 1.2
+++ Makefile24 Jul 2006 23:12:35 -
@@ -2,11 +2,12 @@
COMMENT= fast, lightweight source control management
-VERSION= 0.9
+VERSION= 0.9.1
DISTNAME= mercurial-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=devel
HOMEPAGE= http://www.selenic.com/mercurial/
+
+MAINTAINER=Will Maier [EMAIL PROTECTED]
# GPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo28 May 2006 15:39:59 - 1.1.1.1
+++ distinfo24 Jul 2006 23:12:35 -
@@ -1,4 +1,4 @@
-MD5 (mercurial-0.9.tar.gz) = d4154d12dcbda78251750c2a18eae940
-RMD160 (mercurial-0.9.tar.gz) = 4ab0646abeea17bebf2262457448ef39959b5311
-SHA1 (mercurial-0.9.tar.gz) = d633a9fee89ed8aee22d5a52138c673e01feed7f
-SIZE (mercurial-0.9.tar.gz) = 326107
+MD5 (mercurial-0.9.1.tar.gz) = 9ed3962bba640a686c37faa47739270c
+RMD160 (mercurial-0.9.1.tar.gz) = f34db5fbfcc5b3e90b2bce7577d3446f6159b057
+SHA1 (mercurial-0.9.1.tar.gz) = a1f9ed5ee96660ee9f6cff6d65c8ad8e3495702e
+SIZE (mercurial-0.9.1.tar.gz) = 401485
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 28 May 2006 15:39:59 - 1.1.1.1
+++ pkg/PLIST 24 Jul 2006 23:12:35 -
@@ -5,12 +5,18 @@
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/acl.py
+lib/python${MODPY_VERSION}/site-packages/hgext/acl.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.py
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.py
+lib/python${MODPY_VERSION}/site-packages/hgext/extdiff.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.py
lib/python${MODPY_VERSION}/site-packages/hgext/gpg.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.py
lib/python${MODPY_VERSION}/site-packages/hgext/hbisect.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/hgk.py
+lib/python${MODPY_VERSION}/site-packages/hgext/hgk.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/mq.py
lib/python${MODPY_VERSION}/site-packages/hgext/mq.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/notify.py
@@ -38,6 +44,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/commands.py
lib/python${MODPY_VERSION}/site-packages/mercurial/commands.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/context.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/context.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/demandload.py
lib/python${MODPY_VERSION}/site-packages/mercurial/demandload.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
@@ -48,18 +56,35 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/filelog.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/hg.py
lib/python${MODPY_VERSION}/site-packages/mercurial/hg.pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/__init__.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/common.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/common.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/hgweb_mod.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/hgweb_mod.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/hgwebdir_mod.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/hgwebdir_mod.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/request.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/request.pyc
