Update to mercurial 1.8.1.

Original diff by me, better one supplied by Samir SAADA in ports@ wcmaier@ (maintainer) ok.
avsm · Mar 28, 2011 · 7cb5d8e · 7cb5d8e
1 parent 342822e
commit 7cb5d8e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 24 deletions.
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.35 2011/01/10 21:46:11 rpointel Exp $
+# $OpenBSD: Makefile,v 1.36 2011/03/28 00:11:34 fgsch Exp $
 
 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
 
@@ -36,14 +36,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
 	${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5

diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
@@ -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
diff --git a/devel/mercurial/patches/patch-tests_run-tests_py b/devel/mercurial/patches/patch-tests_run-tests_py
@@ -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.orig	Thu 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
+$OpenBSD: patch-tests_run-tests_py,v 1.3 2011/03/28 00:11:34 fgsch Exp $
+--- tests/run-tests.py.orig	Thu Mar 10 17:30:31 2011
++++ tests/run-tests.py	Sat Mar 26 04:42:04 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"]

diff --git a/devel/mercurial/pkg/PLIST b/devel/mercurial/pkg/PLIST
@@ -1,13 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.17 2010/11/22 00:19:37 fgsch Exp $
+@comment $OpenBSD: PLIST,v 1.18 2011/03/28 00:11:34 fgsch Exp $
 %%SHARED%%
 bin/hg
 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/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.py
 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