Date: Sat, 5 Nov 2011 15:39:21 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/162309: [UPDATE] devel/mercurial to 2.0 Message-ID: <201111051539.pA5FdLWJ068221@red.freebsd.org> Resent-Message-ID: <201111051540.pA5Fe7va082585@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162309 >Category: ports >Synopsis: [UPDATE] devel/mercurial to 2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 05 15:40:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.2-RELEASE-p3 >Organization: >Environment: >Description: Release note: http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.0_.282011-11-01.29 - Clean CONTRIB_FILES macros: delete setup3k.py, for Python 3.x (installation script, experimental) memory.py, because depends on Linux - In DOCS macro, delete *.txt and *.html files, because it's redundant with man pages (same files) >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u /usr/ports/devel/mercurial/Makefile mercurial/Makefile --- /usr/ports/devel/mercurial/Makefile 2011-10-17 23:42:49.000000000 +0200 +++ mercurial/Makefile 2011-11-05 16:23:03.000000000 +0100 @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 1.9.3 +PORTVERSION= 2.0 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ @@ -27,6 +27,7 @@ CONTRIB_FILES= bash_completion \ convert-repo \ + debugcmdserver.py \ debugshell.py \ dumprevlog \ hg-ssh \ @@ -37,8 +38,6 @@ hgk \ hgsh/Makefile \ hgsh/hgsh.c \ - logo-droplets.svg \ - memory.py \ mercurial.el \ mergetools.hgrc \ mq.el \ @@ -46,7 +45,6 @@ pylintrc \ python-hook-examples.py \ sample.hgrc \ - setup3k.py \ shrink-revlog.py \ simplemerge \ tcsh_completion \ @@ -54,8 +52,6 @@ tmplrewrite.py \ undumprevlog \ zsh_completion \ - hgsh/Makefile \ - hgsh/hgsh.c \ vim/HGAnnotate.vim \ vim/hg-menu.vim \ vim/hgcommand.vim \ @@ -63,7 +59,7 @@ vim/patchreview.txt \ vim/patchreview.vim -DOCS= CONTRIBUTORS COPYING README doc/*.txt doc/*.html +DOCS= CONTRIBUTORS COPYING README MAN1= hg.1 MAN5= hgignore.5 hgrc.5 @@ -81,7 +77,7 @@ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} for f in ${DOCS}; do \ - ${INSTALL_MAN} ${WRKSRC}/$${f} ${DOCSDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \ done .endif .if !defined(NOPORTDATA) @@ -97,7 +93,8 @@ ${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} +.endif .include <bsd.port.mk> diff -u /usr/ports/devel/mercurial/distinfo mercurial/distinfo --- /usr/ports/devel/mercurial/distinfo 2011-10-17 23:42:49.000000000 +0200 +++ mercurial/distinfo 2011-11-05 16:15:06.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (mercurial-1.9.3.tar.gz) = 53d8390379b81371f60729decd15f0961777b52ed7514d29c66c1873b918d685 -SIZE (mercurial-1.9.3.tar.gz) = 2977205 +SHA256 (mercurial-2.0.tar.gz) = affab78a4d5074c71f97c07fe211de958263444eb8d86b3ad6fb6d648eb6c594 +SIZE (mercurial-2.0.tar.gz) = 3090977 Common subdirectories: /usr/ports/devel/mercurial/files and mercurial/files diff -u /usr/ports/devel/mercurial/pkg-plist mercurial/pkg-plist --- /usr/ports/devel/mercurial/pkg-plist 2011-07-06 11:20:08.000000000 +0200 +++ mercurial/pkg-plist 2011-11-05 16:15:06.000000000 +0100 @@ -96,6 +96,39 @@ %%PYTHON_SITELIBDIR%%/hgext/keyword.py %%PYTHON_SITELIBDIR%%/hgext/keyword.pyc %%PYTHON_SITELIBDIR%%/hgext/keyword.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/__init__.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/basestore.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfcommands.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/lfutil.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/localstore.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/overrides.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/proto.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/remotestore.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/uisetup.pyo +%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.py +%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyc +%%PYTHON_SITELIBDIR%%/hgext/largefiles/wirestore.pyo %%PYTHON_SITELIBDIR%%/hgext/mq.py %%PYTHON_SITELIBDIR%%/hgext/mq.pyc %%PYTHON_SITELIBDIR%%/hgext/mq.pyo @@ -490,6 +523,7 @@ %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/shortlog.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/summary.tmpl %%PYTHON_SITELIBDIR%%/mercurial/templates/gitweb/tags.tmpl +%%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.bisect %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.changelog %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.compact %%PYTHON_SITELIBDIR%%/mercurial/templates/map-cmdline.default @@ -623,15 +657,9 @@ %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/common.txt -%%PORTDOCS%%%%DOCSDIR%%/hg.1.html -%%PORTDOCS%%%%DOCSDIR%%/hg.1.txt -%%PORTDOCS%%%%DOCSDIR%%/hgignore.5.html -%%PORTDOCS%%%%DOCSDIR%%/hgignore.5.txt -%%PORTDOCS%%%%DOCSDIR%%/hgrc.5.html -%%PORTDOCS%%%%DOCSDIR%%/hgrc.5.txt %%PORTDATA%%%%DATADIR%%/contrib/bash_completion %%PORTDATA%%%%DATADIR%%/contrib/convert-repo +%%PORTDATA%%%%DATADIR%%/contrib/debugcmdserver.py %%PORTDATA%%%%DATADIR%%/contrib/debugshell.py %%PORTDATA%%%%DATADIR%%/contrib/dumprevlog %%PORTDATA%%%%DATADIR%%/contrib/hg-ssh @@ -642,8 +670,6 @@ %%PORTDATA%%%%DATADIR%%/contrib/hgk %%PORTDATA%%%%DATADIR%%/contrib/hgsh/Makefile %%PORTDATA%%%%DATADIR%%/contrib/hgsh/hgsh.c -%%PORTDATA%%%%DATADIR%%/contrib/logo-droplets.svg -%%PORTDATA%%%%DATADIR%%/contrib/memory.py %%PORTDATA%%%%DATADIR%%/contrib/mercurial.el %%PORTDATA%%%%DATADIR%%/contrib/mergetools.hgrc %%PORTDATA%%%%DATADIR%%/contrib/mq.el @@ -651,7 +677,6 @@ %%PORTDATA%%%%DATADIR%%/contrib/pylintrc %%PORTDATA%%%%DATADIR%%/contrib/python-hook-examples.py %%PORTDATA%%%%DATADIR%%/contrib/sample.hgrc -%%PORTDATA%%%%DATADIR%%/contrib/setup3k.py %%PORTDATA%%%%DATADIR%%/contrib/shrink-revlog.py %%PORTDATA%%%%DATADIR%%/contrib/simplemerge %%PORTDATA%%%%DATADIR%%/contrib/tcsh_completion @@ -716,6 +741,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb @dirrm %%PYTHON_SITELIBDIR%%/mercurial @dirrm %%PYTHON_SITELIBDIR%%/hgext/zeroconf +@dirrm %%PYTHON_SITELIBDIR%%/hgext/largefiles @dirrm %%PYTHON_SITELIBDIR%%/hgext/highlight @dirrm %%PYTHON_SITELIBDIR%%/hgext/convert @dirrm %%PYTHON_SITELIBDIR%%/hgext >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111051539.pA5FdLWJ068221>