Date: Sat, 07 Aug 2010 11:50:37 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roberto@FreeBSD.org, portmgr@FreeBSD.org Subject: ports/149393: [PATCH] devel/mercurial: unbreak install (urgent!) Message-ID: <E1Ohg33-000Iw0-2J@apollo.emma.line.org> Resent-Message-ID: <201008071000.o77A0DgL071451@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149393
>Category: ports
>Synopsis: [PATCH] devel/mercurial: unbreak install (urgent!)
>Confidential: no
>Severity: critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 07 10:00:13 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Matthias Andree
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD apollo.emma.line.org 8.1-STABLE FreeBSD 8.1-STABLE #24: Wed Aug 4 00:11:19 CEST
>Description:
NOTE that the port is broken and fails in "make install".
I will do a non-maintainer update/commit in 48 hours time
unless there is a substantiated objection.
- fix Makefile to not install files removed in the 1.5->1.6 upgrade
- update pkg-plist accordingly
- remove broken URL from pkg-install
The patched port is "port test" clean, emits one warning about master
sites in pedantic committer portlint, and passes builds for FreeBSD
6.4, 7.3, 8.0 in Tinderbox AMD64.
Ollivier, PLEASE do at least "port test" after a minor version bump.
Port maintainer (roberto@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- mercurial-1.6.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.49
diff -u -u -r1.49 Makefile
--- Makefile 6 Aug 2010 21:59:54 -0000 1.49
+++ Makefile 7 Aug 2010 09:14:38 -0000
@@ -29,7 +29,6 @@
convert-repo \
dumprevlog \
hg-ssh \
- hgdiff \
hgk \
logo-droplets.svg \
memory.py \
@@ -39,7 +38,6 @@
perf.py \
pylintrc \
python-hook-examples.py \
- rewrite-log \
sample.hgrc \
shrink-revlog.py \
simplemerge \
@@ -48,11 +46,6 @@
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 \
@@ -85,7 +78,6 @@
.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 \
@@ -93,8 +85,6 @@
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
.endif
@${CAT} ${PKGMESSAGE}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/mercurial/pkg-plist,v
retrieving revision 1.35
diff -u -u -r1.35 pkg-plist
--- pkg-plist 6 Aug 2010 21:59:54 -0000 1.35
+++ pkg-plist 7 Aug 2010 09:22:37 -0000
@@ -191,6 +191,9 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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 @@
%%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
@@ -568,8 +589,6 @@
%%PORTDATA%%%%DATADIR%%/contrib/vim/patchreview.txt
%%PORTDATA%%%%DATADIR%%/contrib/vim/patchreview.vim
%%PORTDATA%%%%DATADIR%%/www/hgweb.cgi
-%%PORTDATA%%%%DATADIR%%/www/hgweb.fcgi
-%%PORTDATA%%%%DATADIR%%/www/hgweb.wsgi
%%PORTDATA%%@dirrm %%DATADIR%%/www
%%PORTDATA%%@dirrm %%DATADIR%%/contrib/vim
%%PORTDATA%%@dirrm %%DATADIR%%/contrib/hgsh
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/devel/mercurial/files/pkg-message.in,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-message.in
--- files/pkg-message.in 8 Jan 2010 12:25:36 -0000 1.1
+++ files/pkg-message.in 7 Aug 2010 09:24:37 -0000
@@ -2,6 +2,5 @@
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
- various documentation files
====
--- mercurial-1.6.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Ohg33-000Iw0-2J>