4 files changed, 60 insertions, 60 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index d5fb0e7a0e29..34b65ca5e443 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mercurial
-PORTVERSION=	0.6
+PORTVERSION=	0.6b
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.selenic.com/mercurial/release/
 
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index a4ace037d606..cf9eb1a563f6 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,2 +1,2 @@
-MD5 (mercurial-0.6.tar.gz) = 25f9ce77b3e5e257d33a982d4ca7c43f
-SIZE (mercurial-0.6.tar.gz) = 81760
+MD5 (mercurial-0.6b.tar.gz) = 502b7de4244017cb0b16658acbbbddc2
+SIZE (mercurial-0.6b.tar.gz) = 105466
diff --git a/devel/mercurial/files/patch-hgmerge b/devel/mercurial/files/patch-hgmerge
deleted file mode 100644
index 317a87b347db..000000000000
--- a/devel/mercurial/files/patch-hgmerge
+++ /dev/null
@@ -1,8 +0,0 @@
---- hgmerge.orig	Mon Jul 11 23:59:46 2005
-+++ hgmerge	Mon Jul 11 23:59:59 2005
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # hgmerge - default merge helper for Mercurial
- #
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 913dfd55cc21..521b5d2c5c6b 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -1,72 +1,80 @@
 bin/hg
 bin/hgmerge
+%%PYTHON_SITELIBDIR%%/mercurial/__init__.py
+%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.py
 %%PYTHON_SITELIBDIR%%/mercurial/__version__.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
+%%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/bdiff.so
-%%PYTHON_SITELIBDIR%%/mercurial/hg.py
-%%PYTHON_SITELIBDIR%%/mercurial/commands.py
-%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.py
-%%PYTHON_SITELIBDIR%%/mercurial/__init__.py
-%%PYTHON_SITELIBDIR%%/mercurial/version.py
-%%PYTHON_SITELIBDIR%%/mercurial/hgweb.py
-%%PYTHON_SITELIBDIR%%/mercurial/transaction.py
-%%PYTHON_SITELIBDIR%%/mercurial/ui.py
-%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.py
-%%PYTHON_SITELIBDIR%%/mercurial/mdiff.py
-%%PYTHON_SITELIBDIR%%/mercurial/lock.py
-%%PYTHON_SITELIBDIR%%/mercurial/demandload.py
-%%PYTHON_SITELIBDIR%%/mercurial/util.py
 %%PYTHON_SITELIBDIR%%/mercurial/byterange.py
-%%PYTHON_SITELIBDIR%%/mercurial/revlog.py
-%%PYTHON_SITELIBDIR%%/mercurial/hg.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/commands.py
 %%PYTHON_SITELIBDIR%%/mercurial/commands.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/commands.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/demandload.py
+%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.py
 %%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/version.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/hg.py
+%%PYTHON_SITELIBDIR%%/mercurial/hg.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/hg.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/hgweb.py
 %%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/ui.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.py
 %%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/lock.py
 %%PYTHON_SITELIBDIR%%/mercurial/lock.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/util.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/lock.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/mdiff.py
+%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/mpatch.so
+%%PYTHON_SITELIBDIR%%/mercurial/revlog.py
 %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyc
-%%PYTHON_SITELIBDIR%%/mercurial/templates/map
-%%PYTHON_SITELIBDIR%%/mercurial/templates/map-raw
-%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/footer.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/templates/changelog-rss.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/changelog.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/header.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry-rss.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-raw.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/fileannotate.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff-raw.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filediff.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog-rss.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/filelog.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry-rss.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision-raw.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/manifest.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/filerevision.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changelogentry.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filelogentry.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/filediff-raw.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/footer.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/header-raw.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/header-rss.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/header.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/manifest.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/map
+%%PYTHON_SITELIBDIR%%/mercurial/templates/map-raw
+%%PYTHON_SITELIBDIR%%/mercurial/templates/map-rss
+%%PYTHON_SITELIBDIR%%/mercurial/templates/search.tmpl
+%%PYTHON_SITELIBDIR%%/mercurial/templates/searchentry.tmpl
 %%PYTHON_SITELIBDIR%%/mercurial/templates/tags.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/templates/changeset-raw.tmpl
-%%PYTHON_SITELIBDIR%%/mercurial/hg.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/commands.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/version.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/hgweb.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/transaction.py
+%%PYTHON_SITELIBDIR%%/mercurial/transaction.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/transaction.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/ui.py
+%%PYTHON_SITELIBDIR%%/mercurial/ui.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/ui.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/httprangereader.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/mdiff.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/lock.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/__version__.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/demandload.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/util.py
+%%PYTHON_SITELIBDIR%%/mercurial/util.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/util.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/byterange.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/version.py
+%%PYTHON_SITELIBDIR%%/mercurial/version.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/version.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
 @dirrm %%PYTHON_SITELIBDIR%%/mercurial