Date: Sat, 7 Aug 2010 20:08:34 +0000 From: "b. f." <bf1783@googlemail.com> To: Ollivier Robert <roberto@freebsd.org> Cc: cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/devel/mercurial Makefile Message-ID: <AANLkTinXw3Nnh5g=zysdZwttU0yZ3_vK7zTAML6xSx_f@mail.gmail.com> In-Reply-To: <201008071215.o77CFAQo078470@repoman.freebsd.org> References: <201008071215.o77CFAQo078470@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On 8/7/10, Ollivier Robert <roberto@freebsd.org> wrote:
> roberto 2010-08-07 12:15:10 UTC
>
> FreeBSD ports repository
>
> Modified files:
> devel/mercurial Makefile
> Log:
> Fix make install breakage, sorry for that.
>
> PR: ports/149393
> Submitted by: mandree
>
> Revision Changes Path
> 1.50 +0 -2 ports/devel/mercurial/Makefile
>
I find that this is still broken, and that (for me, on 9-CURRENT amd64
with python2.6 and WITHOUT_NLS -- I didn't check other cases) the
attached further changes were necessary.
b.
[-- Attachment #2 --]
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 7 Aug 2010 12:15:09 -0000 1.50
+++ Makefile 7 Aug 2010 20:03:09 -0000
@@ -46,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 \
@@ -83,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 \
@@ -91,8 +85,8 @@
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_MAN} ${WRKSRC}/contrib/hgweb.fcgi ${DATADIR}/www
+ ${INSTALL_MAN} ${WRKSRC}/contrib/hgweb.wsgi ${DATADIR}/www
.endif
@${CAT} ${PKGMESSAGE}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/mercurial/pkg-plist,v
retrieving revision 1.35
diff -u -r1.35 pkg-plist
--- pkg-plist 6 Aug 2010 21:59:54 -0000 1.35
+++ pkg-plist 7 Aug 2010 20:03:37 -0000
@@ -144,12 +144,12 @@
%%PYTHON_SITELIBDIR%%/hgext/win32text.py
%%PYTHON_SITELIBDIR%%/hgext/win32text.pyc
%%PYTHON_SITELIBDIR%%/hgext/win32text.pyo
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.py
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyc
-%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyo
%%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.py
%%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.pyc
%%PYTHON_SITELIBDIR%%/hgext/zeroconf/Zeroconf.pyo
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.py
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyc
+%%PYTHON_SITELIBDIR%%/hgext/zeroconf/__init__.pyo
%%PYTHON_SITELIBDIR%%/mercurial/__init__.py
%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyc
%%PYTHON_SITELIBDIR%%/mercurial/__init__.pyo
@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTinXw3Nnh5g=zysdZwttU0yZ3_vK7zTAML6xSx_f>