From owner-cvs-ports@FreeBSD.ORG Sun Aug 8 17:32:24 2010 Return-Path: Delivered-To: cvs-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33A9C1065672; Sun, 8 Aug 2010 17:32:24 +0000 (UTC) (envelope-from jhein@gossamer.timing.com) Received: from mout.perfora.net (mout.perfora.net [74.208.4.195]) by mx1.freebsd.org (Postfix) with ESMTP id 031A88FC14; Sun, 8 Aug 2010 17:32:23 +0000 (UTC) Received: from gossamer.timing.com ([206.168.13.144]) by mrelay.perfora.net (node=mrus1) with ESMTP (Nemesis) id 0MLveu-1OaT9W1QNg-008Lws; Sun, 08 Aug 2010 13:32:22 -0400 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="4WoUZIudkY" Content-Transfer-Encoding: 7bit Message-ID: <19550.59933.469642.27709@gossamer.timing.com> Date: Sun, 8 Aug 2010 11:32:13 -0600 From: John Hein To: "Matthias Andree" In-Reply-To: <19550.59049.226541.911898@gossamer.timing.com> References: <201008062159.o76LxsbT064236@repoman.freebsd.org> <19550.59049.226541.911898@gossamer.timing.com> X-Mailer: VM 8.0.12 under 22.3.1 (i386-redhat-linux-gnu) X-Provags-ID: V02:K0:/NFmn9cMMHe4HZHL3S0436M8NisqqtTQtB1mMG3kQ2+ geE9EwY2ivLhoHBCWPTyKqbQR2TKEOvtclatBVIM1oI60CtbLh zExzaZz1ZE5ySv0JZjOj6oXp/MEi/PiYnxgTrSYMmtTaSgO0jS 64CSZJpF0QSxJj1MrkJQKEfqkEzj6S45EUSb8VYAii/58VGsjJ Ww9z8XdfUDnUUL4c9NaRA== Cc: cvs-ports@freebsd.org, "portmgr@freebsd.org" , Ollivier Robert , cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/devel/mercurial Makefile distinfo pkg-plist X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 17:32:24 -0000 --4WoUZIudkY Content-Type: text/plain; charset=us-ascii Content-Description: message body text Content-Transfer-Encoding: 7bit John Hein wrote at 11:17 -0600 on Aug 8, 2010: > Matthias Andree wrote at 11:18 +0200 on Aug 7, 2010: > > the port is MASSIVELY broken since the upgrade. It does not install at > > all, pkg-plists - particularly for contrib and help - are out of synch and > > worse. > > Indeed. That is completely my fault. I sent Ollivier the incomplete > patch. > Attached is the fix. And sorry about the delayed response. Last patch was against the original 1.6.2 update commit (Makefile:1.49). I just noticed that Ollivier partly fixed things in Makefile:1.50 Here's a refreshed patch... --4WoUZIudkY Content-Type: text/plain; name="p" Content-Description: updated patch to fix hg 1.6.2 port (against Makefile:1.50) Content-Disposition: inline; filename="p" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile 7 Aug 2010 12:15:09 -0000 1.50 +++ Makefile 8 Aug 2010 17:25:43 -0000 @@ -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} Index: pkg-plist =================================================================== RCS file: /base/FreeBSD-CVS/ports/devel/mercurial/pkg-plist,v retrieving revision 1.35 diff -u -p -r1.35 pkg-plist --- pkg-plist 6 Aug 2010 21:59:54 -0000 1.35 +++ pkg-plist 8 Aug 2010 17:15:48 -0000 @@ -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 --4WoUZIudkY--