diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 9df39af0130..8f02974995e 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2006/10/09 14:29:54 aanriot Exp $
+# $OpenBSD: Makefile,v 1.5 2006/12/23 04:17:20 jolan Exp $
 
 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 @@ MASTER_SITES=		http://www.selenic.com/mercurial/release/
 
 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
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index 589134ce511..30bdde32266 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -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
diff --git a/devel/mercurial/pkg/PFRAG.shared b/devel/mercurial/pkg/PFRAG.shared
index 79046c42339..1337dcb841b 100644
--- a/devel/mercurial/pkg/PFRAG.shared
+++ b/devel/mercurial/pkg/PFRAG.shared
@@ -1,3 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/05/28 15:39:59 avsm Exp $
+@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/mpatch.so
diff --git a/devel/mercurial/pkg/PLIST b/devel/mercurial/pkg/PLIST
index 12c2315a473..bd3d01c2d05 100644
--- a/devel/mercurial/pkg/PLIST
+++ b/devel/mercurial/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/09/22 04:22:26 pvalchev Exp $
+@comment $OpenBSD: PLIST,v 1.3 2006/12/23 04:17:20 jolan Exp $
 %%SHARED%%
 bin/hg
 bin/hgmerge
@@ -11,6 +11,8 @@ 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/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.py
 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__.py
 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.py
 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
+lib/python${MODPY_VERSION}/site-packages/mercurial/cmdutil.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
@@ -54,6 +62,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/fancyopts.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/fancyopts.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/filelog.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/filelog.pyc
+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/hg.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/hg.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/hgweb/
@@ -85,14 +95,20 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/lock.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/lock.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/lsprof.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/lsprof.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/mail.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/mail.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/manifest.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/manifest.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/mdiff.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/mdiff.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/merge.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/merge.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/node.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/node.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/packagescan.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/packagescan.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/patch.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/patch.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/remoterepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/remoterepo.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/repo.py
@@ -107,61 +123,88 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.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/templater.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/templater.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelog-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelog-rss.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelog.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelogentry-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelogentry-rss.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changelogentry.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changeset-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changeset-raw.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/changeset.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/error-gitweb.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/error.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/fileannotate-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/fileannotate-raw.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/fileannotate.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filediff-raw.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filediff.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filelog-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filelog-rss.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filelog.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filelogentry-rss.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filelogentry.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filerevision-gitweb.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/filerevision.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/footer-gitweb.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/footer.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/header-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/header-raw.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/header-rss.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/changelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/changelogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/changeset.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/error.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/fileannotate.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/filediff.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/filelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/filerevision.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/footer.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/header.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/index.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/manifest.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/map
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/search.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/shortlog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/summary.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/gitweb/tags.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/header.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/index.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/manifest-gitweb.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/manifest.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map
 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-gitweb
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-raw
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/map-rss
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/notfound.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/search-gitweb.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/changelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/changelogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/changeset.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/fileannotate.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/filediff.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/filelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/filelogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/filerevision.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/footer.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/header.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/manifest.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/map
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/search.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/shortlog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/shortlogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/old/tags.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/changeset.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/fileannotate.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/filediff.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/header.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/raw/map
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/changelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/changelogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/filelog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/filelogentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/header.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/map
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/tagentry.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/rss/tags.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/search.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/shortlog-gitweb.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/shortlog.tmpl
+lib/python${MODPY_VERSION}/site-packages/mercurial/templates/shortlogentry.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/hgicon.png
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style-gitweb.css
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/static/style.css
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/summary-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/tagentry-rss.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/tags-gitweb.tmpl
-lib/python${MODPY_VERSION}/site-packages/mercurial/templates/tags-rss.tmpl
 lib/python${MODPY_VERSION}/site-packages/mercurial/templates/tags.tmpl
+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/ui.py
@@ -170,6 +213,8 @@ lib/python${MODPY_VERSION}/site-packages/mercurial/util.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/util.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/util_win32.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/util_win32.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/verify.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/verify.pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/version.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/version.pyc
 @man man/man1/hg.1