3 files changed, 25 insertions, 10 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 933a2f893556..de53afcb7dbd 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -46,11 +46,6 @@ CONTRIB_FILES=	bash_completion \
 		tmplrewrite.py \
 		undumprevlog \
 		zsh_completion \
-		git-viz/git-cat-file \
-		git-viz/git-diff-tree \
-		git-viz/git-rev-list \
-		git-viz/git-rev-tree \
-		git-viz/hg-viz \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		vim/HGAnnotate.vim \
@@ -83,16 +78,15 @@ post-install:
 .if !defined(NOPORTDATA)
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${DATADIR}/contrib
-	${MKDIR} ${DATADIR}/contrib/git-viz
 	${MKDIR} ${DATADIR}/contrib/hgsh
 	${MKDIR} ${DATADIR}/contrib/vim
 	for f in ${CONTRIB_FILES}; do \
 		${CP} -p ${WRKSRC}/contrib/$${f} ${DATADIR}/contrib/$${f}; \
 	done
 	${MKDIR} ${DATADIR}/www
-	${INSTALL_MAN} ${WRKSRC}/*.cgi ${DATADIR}/www
-	${INSTALL_MAN} ${WRKSRC}/contrib/hgwebdir.fcgi ${DATADIR}/www
-	${INSTALL_MAN} ${WRKSRC}/contrib/hgwebdir.wsgi ${DATADIR}/www
+	${INSTALL_DATA} ${WRKSRC}/*.cgi ${DATADIR}/www
+	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${DATADIR}/www
+	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${DATADIR}/www
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/devel/mercurial/files/pkg-message.in b/devel/mercurial/files/pkg-message.in
index 0abf25e7ab1c..3505a9fa33af 100644
--- a/devel/mercurial/files/pkg-message.in
+++ b/devel/mercurial/files/pkg-message.in
@@ -2,6 +2,6 @@
 Note that we now install a few more files in %%PREFIX%%/share/mercurial:
 - shell completion scripts (bash, tcsh and zsh)
 - CGI scripts for web access to repositories
-  see http://www.selenic.com/mercurial/wiki/index.cgi/CGI_Install
+  see http://mercurial.selenic.com/wiki/CGIinstall
 - various documentation files
 ====
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 6081a6ff0968..6118467be64e 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -191,6 +191,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/copies.py
 %%PYTHON_SITELIBDIR%%/mercurial/copies.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/copies.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/dagparser.py
+%%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/dagparser.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/demandimport.py
 %%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/demandimport.pyo
@@ -198,6 +201,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.py
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dirstate.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/discovery.py
+%%PYTHON_SITELIBDIR%%/mercurial/discovery.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/discovery.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.py
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/dispatch.pyo
@@ -233,9 +239,12 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/help/diffs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/environment.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/extensions.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/glossary.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/hgweb.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/multirevs.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/patterns.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/revisions.txt
+%%PYTHON_SITELIBDIR%%/mercurial/help/revsets.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/templates.txt
 %%PYTHON_SITELIBDIR%%/mercurial/help/urls.txt
 %%PYTHON_SITELIBDIR%%/mercurial/hg.py
@@ -331,6 +340,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/node.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/osutil.so
+%%PYTHON_SITELIBDIR%%/mercurial/parser.py
+%%PYTHON_SITELIBDIR%%/mercurial/parser.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/parser.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/parsers.so
 %%PYTHON_SITELIBDIR%%/mercurial/patch.py
 %%PYTHON_SITELIBDIR%%/mercurial/patch.pyc
@@ -338,6 +350,9 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/posix.py
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/posix.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/pushkey.py
+%%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/pushkey.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/repair.py
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo
@@ -347,6 +362,12 @@ bin/hg
 %%PYTHON_SITELIBDIR%%/mercurial/revlog.py
 %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/revlog.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/revset.py
+%%PYTHON_SITELIBDIR%%/mercurial/revset.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/revset.pyo
+%%PYTHON_SITELIBDIR%%/mercurial/similar.py
+%%PYTHON_SITELIBDIR%%/mercurial/similar.pyc
+%%PYTHON_SITELIBDIR%%/mercurial/similar.pyo
 %%PYTHON_SITELIBDIR%%/mercurial/simplemerge.py
 %%PYTHON_SITELIBDIR%%/mercurial/simplemerge.pyc
 %%PYTHON_SITELIBDIR%%/mercurial/simplemerge.pyo