[pkgsrc/trunk]: pkgsrc/devel/mercurial Update to mercurial 1.0 and add DESTDI...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/mercurial Update to mercurial 1.0 and add DESTDI...
From: bjs <bjs%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 06:00:04 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/45332984942d
branches:  trunk
changeset: 540921:45332984942d
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Thu Apr 10 23:34:51 2008 +0000

description:
Update to mercurial 1.0 and add DESTDIR support.  Changes:

 General:
  * greatly improved merge tool configuration, see "hgrc.5.txt" for details
  * improved copy/rename handling in diffs, status, and merge
  * files in .hg inherit permissions from .hg/store
  * infer --repository when possible, so commands may be run from anywhere.
  * easy-installable
  * new "droplet" logo

 Commands:
  * archive: disable ".hg_archival.txt" file addition with "ui.archivemeta"
  * bisect: now built-in with greatly improved performance and usability
  * bundle: new --all option to bundle the whole repository more easily.
  * cat: apply decode filters with --decode
  * clone: can clone from a full-history bundle
  * commit: warn when creating a new head
  * debugancestor: index argument is now optional
  * diff: set the number of context line to show with -U/--unified
  * grep: display matched revisions commit date with --date
  * import: new --no-commit and --user options
  * incoming/outgoing: add --limit option
  * log: use -b/--only-branch to show revisions of a single branch
  * remove: improve handling for --after
  * revert: major speedup
  * serve: prefix the served path with --prefix (also in [web] section)
  * status: unknown files are skipped by --quiet
  * tag: allow multiple tags to be added or removed
  * tags: --verbose flags local tags
  * update: switch between named branches without -C

 Extensions:
  * churn: promoted to an official extension (previously in contrib)
  * color: new extension coloring "status" and "qseries" command outputs
  * convert:
  * hgk: configuration file changed from .gitk to .hgk
  * highlight: new extension enabling syntax highlighting in hgweb
    file view (requires pygments)
  * inotify: new extension using Linux 2.6 inotify API for instant
    status checking
  * keyword: new extension for filewise RCS-keyword expansion in working
    directory
  * mq: new --currentdate, --date, --currentuser, and --user options
  * record: add "qrecord" command when used with mq

 Web interface:
  * improved WSGI integration and compatibility
  * follow symlinks in hgwebdir collections
  * show branches in most of gitweb templates
  * add line anchors to annotate, changeset, diff and file views
  * support web.baseurl in hgwebdir, overriding SCRIPT_NAME

 Hooks:
  * standard hook to reject text files with CRLF in win32text extension
  * redirect stdout to stderr for ssh and http servers

diffstat:

 devel/mercurial/Makefile         |  18 ++++----
 devel/mercurial/PLIST            |  80 ++++++++++++++++++++++++++-------------
 devel/mercurial/distinfo         |  10 ++--
 devel/mercurial/patches/patch-aa |   8 +---
 4 files changed, 68 insertions(+), 48 deletions(-)

diffs (297 lines):

diff -r 62fa84d9b6d0 -r 45332984942d devel/mercurial/Makefile
--- a/devel/mercurial/Makefile  Thu Apr 10 21:30:44 2008 +0000
+++ b/devel/mercurial/Makefile  Thu Apr 10 23:34:51 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/10/26 14:42:23 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/04/10 23:34:51 bjs Exp $
 #
 
-DISTNAME=      mercurial-0.9.5
+DISTNAME=      mercurial-1.0
 CATEGORIES=    devel scm
 MASTER_SITES=  http://www.selenic.com/mercurial/release/
 
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial
 COMMENT=       Fast, lightweight source control management system
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_DEPENDS+=        xmlto-[0-9]*:../../textproc/xmlto
 BUILD_DEPENDS+=        asciidoc-[0-9]*:../../textproc/asciidoc
 
@@ -22,14 +24,12 @@
 
 MAKE_ENV+=     PYTHONBIN=${PYTHONBIN:Q}
 
-post-build:
-       cd ${WRKSRC}/doc && ${MAKE_ENV} ${GMAKE} man
-
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.1  ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.5  ${PREFIX}/${PKGMANDIR}/man5
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mercurial
-       ${INSTALL_DATA} ${WRKSRC}/README  ${PREFIX}/share/doc/mercurial
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.1  ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.5  ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/mercurial
+       ${INSTALL_DATA} ${WRKSRC}/README  \
+               ${DESTDIR}${PREFIX}/share/doc/mercurial
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 62fa84d9b6d0 -r 45332984942d devel/mercurial/PLIST
--- a/devel/mercurial/PLIST     Thu Apr 10 21:30:44 2008 +0000
+++ b/devel/mercurial/PLIST     Thu Apr 10 23:34:51 2008 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2007/10/26 14:42:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/10 23:34:51 bjs Exp $
 bin/hg
-bin/hgmerge
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
 ${PYSITELIB}/hgext/__init__.pyo
@@ -16,12 +15,21 @@
 ${PYSITELIB}/hgext/children.py
 ${PYSITELIB}/hgext/children.pyc
 ${PYSITELIB}/hgext/children.pyo
+${PYSITELIB}/hgext/churn.py
+${PYSITELIB}/hgext/churn.pyc
+${PYSITELIB}/hgext/churn.pyo
+${PYSITELIB}/hgext/color.py
+${PYSITELIB}/hgext/color.pyc
+${PYSITELIB}/hgext/color.pyo
 ${PYSITELIB}/hgext/convert/__init__.py
 ${PYSITELIB}/hgext/convert/__init__.pyc
 ${PYSITELIB}/hgext/convert/__init__.pyo
 ${PYSITELIB}/hgext/convert/common.py
 ${PYSITELIB}/hgext/convert/common.pyc
 ${PYSITELIB}/hgext/convert/common.pyo
+${PYSITELIB}/hgext/convert/convcmd.py
+${PYSITELIB}/hgext/convert/convcmd.pyc
+${PYSITELIB}/hgext/convert/convcmd.pyo
 ${PYSITELIB}/hgext/convert/cvs.py
 ${PYSITELIB}/hgext/convert/cvs.pyc
 ${PYSITELIB}/hgext/convert/cvs.pyo
@@ -34,9 +42,15 @@
 ${PYSITELIB}/hgext/convert/git.py
 ${PYSITELIB}/hgext/convert/git.pyc
 ${PYSITELIB}/hgext/convert/git.pyo
+${PYSITELIB}/hgext/convert/gnuarch.py
+${PYSITELIB}/hgext/convert/gnuarch.pyc
+${PYSITELIB}/hgext/convert/gnuarch.pyo
 ${PYSITELIB}/hgext/convert/hg.py
 ${PYSITELIB}/hgext/convert/hg.pyc
 ${PYSITELIB}/hgext/convert/hg.pyo
+${PYSITELIB}/hgext/convert/monotone.py
+${PYSITELIB}/hgext/convert/monotone.pyc
+${PYSITELIB}/hgext/convert/monotone.pyo
 ${PYSITELIB}/hgext/convert/subversion.py
 ${PYSITELIB}/hgext/convert/subversion.pyc
 ${PYSITELIB}/hgext/convert/subversion.pyo
@@ -55,24 +69,30 @@
 ${PYSITELIB}/hgext/graphlog.py
 ${PYSITELIB}/hgext/graphlog.pyc
 ${PYSITELIB}/hgext/graphlog.pyo
-${PYSITELIB}/hgext/hbisect.py
-${PYSITELIB}/hgext/hbisect.pyc
-${PYSITELIB}/hgext/hbisect.pyo
 ${PYSITELIB}/hgext/hgk.py
 ${PYSITELIB}/hgext/hgk.pyc
 ${PYSITELIB}/hgext/hgk.pyo
+${PYSITELIB}/hgext/highlight.py
+${PYSITELIB}/hgext/highlight.pyc
+${PYSITELIB}/hgext/highlight.pyo
 ${PYSITELIB}/hgext/imerge.py
 ${PYSITELIB}/hgext/imerge.pyc
 ${PYSITELIB}/hgext/imerge.pyo
 ${PYSITELIB}/hgext/interhg.py
 ${PYSITELIB}/hgext/interhg.pyc
 ${PYSITELIB}/hgext/interhg.pyo
+${PYSITELIB}/hgext/keyword.py
+${PYSITELIB}/hgext/keyword.pyc
+${PYSITELIB}/hgext/keyword.pyo
 ${PYSITELIB}/hgext/mq.py
 ${PYSITELIB}/hgext/mq.pyc
 ${PYSITELIB}/hgext/mq.pyo
 ${PYSITELIB}/hgext/notify.py
 ${PYSITELIB}/hgext/notify.pyc
 ${PYSITELIB}/hgext/notify.pyo
+${PYSITELIB}/hgext/pager.py
+${PYSITELIB}/hgext/pager.pyc
+${PYSITELIB}/hgext/pager.pyo
 ${PYSITELIB}/hgext/parentrevspec.py
 ${PYSITELIB}/hgext/parentrevspec.pyc
 ${PYSITELIB}/hgext/parentrevspec.pyo
@@ -88,6 +108,9 @@
 ${PYSITELIB}/hgext/transplant.py
 ${PYSITELIB}/hgext/transplant.pyc
 ${PYSITELIB}/hgext/transplant.pyo
+${PYSITELIB}/hgext/win32mbcs.py
+${PYSITELIB}/hgext/win32mbcs.pyc
+${PYSITELIB}/hgext/win32mbcs.pyo
 ${PYSITELIB}/hgext/win32text.py
 ${PYSITELIB}/hgext/win32text.pyc
 ${PYSITELIB}/hgext/win32text.pyo
@@ -126,6 +149,9 @@
 ${PYSITELIB}/mercurial/context.py
 ${PYSITELIB}/mercurial/context.pyc
 ${PYSITELIB}/mercurial/context.pyo
+${PYSITELIB}/mercurial/copies.py
+${PYSITELIB}/mercurial/copies.pyc
+${PYSITELIB}/mercurial/copies.pyo
 ${PYSITELIB}/mercurial/demandimport.py
 ${PYSITELIB}/mercurial/demandimport.pyc
 ${PYSITELIB}/mercurial/demandimport.pyo
@@ -145,6 +171,12 @@
 ${PYSITELIB}/mercurial/filelog.py
 ${PYSITELIB}/mercurial/filelog.pyc
 ${PYSITELIB}/mercurial/filelog.pyo
+${PYSITELIB}/mercurial/filemerge.py
+${PYSITELIB}/mercurial/filemerge.pyc
+${PYSITELIB}/mercurial/filemerge.pyo
+${PYSITELIB}/mercurial/hbisect.py
+${PYSITELIB}/mercurial/hbisect.pyc
+${PYSITELIB}/mercurial/hbisect.pyo
 ${PYSITELIB}/mercurial/help.py
 ${PYSITELIB}/mercurial/help.pyc
 ${PYSITELIB}/mercurial/help.pyo
@@ -163,12 +195,18 @@
 ${PYSITELIB}/mercurial/hgweb/hgwebdir_mod.py
 ${PYSITELIB}/mercurial/hgweb/hgwebdir_mod.pyc
 ${PYSITELIB}/mercurial/hgweb/hgwebdir_mod.pyo
+${PYSITELIB}/mercurial/hgweb/protocol.py
+${PYSITELIB}/mercurial/hgweb/protocol.pyc
+${PYSITELIB}/mercurial/hgweb/protocol.pyo
 ${PYSITELIB}/mercurial/hgweb/request.py
 ${PYSITELIB}/mercurial/hgweb/request.pyc
 ${PYSITELIB}/mercurial/hgweb/request.pyo
 ${PYSITELIB}/mercurial/hgweb/server.py
 ${PYSITELIB}/mercurial/hgweb/server.pyc
 ${PYSITELIB}/mercurial/hgweb/server.pyo
+${PYSITELIB}/mercurial/hgweb/webcommands.py
+${PYSITELIB}/mercurial/hgweb/webcommands.pyc
+${PYSITELIB}/mercurial/hgweb/webcommands.pyo
 ${PYSITELIB}/mercurial/hgweb/wsgicgi.py
 ${PYSITELIB}/mercurial/hgweb/wsgicgi.pyc
 ${PYSITELIB}/mercurial/hgweb/wsgicgi.pyo
@@ -222,9 +260,6 @@
 ${PYSITELIB}/mercurial/patch.py
 ${PYSITELIB}/mercurial/patch.pyc
 ${PYSITELIB}/mercurial/patch.pyo
-${PYSITELIB}/mercurial/remoterepo.py
-${PYSITELIB}/mercurial/remoterepo.pyc
-${PYSITELIB}/mercurial/remoterepo.pyo
 ${PYSITELIB}/mercurial/repair.py
 ${PYSITELIB}/mercurial/repair.pyc
 ${PYSITELIB}/mercurial/repair.pyo
@@ -234,6 +269,9 @@
 ${PYSITELIB}/mercurial/revlog.py
 ${PYSITELIB}/mercurial/revlog.pyc
 ${PYSITELIB}/mercurial/revlog.pyo
+${PYSITELIB}/mercurial/simplemerge.py
+${PYSITELIB}/mercurial/simplemerge.pyc
+${PYSITELIB}/mercurial/simplemerge.pyo
 ${PYSITELIB}/mercurial/sshrepo.py
 ${PYSITELIB}/mercurial/sshrepo.pyc
 ${PYSITELIB}/mercurial/sshrepo.pyo
@@ -249,6 +287,9 @@
 ${PYSITELIB}/mercurial/strutil.py
 ${PYSITELIB}/mercurial/strutil.pyc
 ${PYSITELIB}/mercurial/strutil.pyo
+${PYSITELIB}/mercurial/templatefilters.py
+${PYSITELIB}/mercurial/templatefilters.pyc
+${PYSITELIB}/mercurial/templatefilters.pyo
 ${PYSITELIB}/mercurial/templater.py
 ${PYSITELIB}/mercurial/templater.pyc
 ${PYSITELIB}/mercurial/templater.pyo
@@ -295,29 +336,14 @@
 ${PYSITELIB}/mercurial/templates/map-cmdline.compact
 ${PYSITELIB}/mercurial/templates/map-cmdline.default
 ${PYSITELIB}/mercurial/templates/notfound.tmpl
-${PYSITELIB}/mercurial/templates/old/changelog.tmpl
-${PYSITELIB}/mercurial/templates/old/changelogentry.tmpl
-${PYSITELIB}/mercurial/templates/old/changeset.tmpl
-${PYSITELIB}/mercurial/templates/old/fileannotate.tmpl
-${PYSITELIB}/mercurial/templates/old/filediff.tmpl
-${PYSITELIB}/mercurial/templates/old/filelog.tmpl
-${PYSITELIB}/mercurial/templates/old/filelogentry.tmpl
-${PYSITELIB}/mercurial/templates/old/filerevision.tmpl
-${PYSITELIB}/mercurial/templates/old/footer.tmpl
-${PYSITELIB}/mercurial/templates/old/header.tmpl
-${PYSITELIB}/mercurial/templates/old/manifest.tmpl
-${PYSITELIB}/mercurial/templates/old/map
-${PYSITELIB}/mercurial/templates/old/search.tmpl
-${PYSITELIB}/mercurial/templates/old/shortlog.tmpl
-${PYSITELIB}/mercurial/templates/old/shortlogentry.tmpl
-${PYSITELIB}/mercurial/templates/old/tags.tmpl
 ${PYSITELIB}/mercurial/templates/raw/changeset.tmpl
+${PYSITELIB}/mercurial/templates/raw/error.tmpl
 ${PYSITELIB}/mercurial/templates/raw/fileannotate.tmpl
 ${PYSITELIB}/mercurial/templates/raw/filediff.tmpl
-${PYSITELIB}/mercurial/templates/raw/header.tmpl
 ${PYSITELIB}/mercurial/templates/raw/index.tmpl
 ${PYSITELIB}/mercurial/templates/raw/manifest.tmpl
 ${PYSITELIB}/mercurial/templates/raw/map
+${PYSITELIB}/mercurial/templates/raw/notfound.tmpl
 ${PYSITELIB}/mercurial/templates/rss/changelog.tmpl
 ${PYSITELIB}/mercurial/templates/rss/changelogentry.tmpl
 ${PYSITELIB}/mercurial/templates/rss/filelog.tmpl
@@ -330,6 +356,8 @@
 ${PYSITELIB}/mercurial/templates/shortlog.tmpl
 ${PYSITELIB}/mercurial/templates/shortlogentry.tmpl
 ${PYSITELIB}/mercurial/templates/static/hgicon.png
+${PYSITELIB}/mercurial/templates/static/hglogo.png
+${PYSITELIB}/mercurial/templates/static/highlight.css
 ${PYSITELIB}/mercurial/templates/static/style-gitweb.css
 ${PYSITELIB}/mercurial/templates/static/style.css
 ${PYSITELIB}/mercurial/templates/tags.tmpl
@@ -353,7 +381,6 @@
 ${PYSITELIB}/mercurial/version.pyc
 ${PYSITELIB}/mercurial/version.pyo
 man/man1/hg.1
-man/man1/hgmerge.1
 man/man5/hgignore.5
 man/man5/hgrc.5
 share/doc/mercurial/README
@@ -361,7 +388,6 @@
 @dirrm ${PYSITELIB}/mercurial/templates/static
 @dirrm ${PYSITELIB}/mercurial/templates/rss
 @dirrm ${PYSITELIB}/mercurial/templates/raw
-@dirrm ${PYSITELIB}/mercurial/templates/old
 @dirrm ${PYSITELIB}/mercurial/templates/gitweb
 @dirrm ${PYSITELIB}/mercurial/templates/atom
 @dirrm ${PYSITELIB}/mercurial/templates
diff -r 62fa84d9b6d0 -r 45332984942d devel/mercurial/distinfo
--- a/devel/mercurial/distinfo  Thu Apr 10 21:30:44 2008 +0000
+++ b/devel/mercurial/distinfo  Thu Apr 10 23:34:51 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2007/10/26 14:42:23 wiz Exp $
+$NetBSD: distinfo,v 1.11 2008/04/10 23:34:51 bjs Exp $
 
-SHA1 (mercurial-0.9.5.tar.gz) = 889a83f4cdcead93323d7cf4276751cc20396455
-RMD160 (mercurial-0.9.5.tar.gz) = ea38d3142a4b1087e2777de3b70df8b4672cd237
-Size (mercurial-0.9.5.tar.gz) = 670808 bytes
-SHA1 (patch-aa) = 82eaf7bd589ab6c50912ea36496475923f6ae3db
+SHA1 (mercurial-1.0.tar.gz) = 11689e85a91874417cb110ded6c3a4d7b30429cb
+RMD160 (mercurial-1.0.tar.gz) = 21b5603e033898420f4fbf1b851ede4f69a7657c
+Size (mercurial-1.0.tar.gz) = 803187 bytes
+SHA1 (patch-aa) = 534dc735a5fc45ad69989442c31a7342d7af27bf
diff -r 62fa84d9b6d0 -r 45332984942d devel/mercurial/patches/patch-aa
--- a/devel/mercurial/patches/patch-aa  Thu Apr 10 21:30:44 2008 +0000
+++ b/devel/mercurial/patches/patch-aa  Thu Apr 10 23:34:51 2008 +0000
@@ -1,13 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2007/01/02 16:52:00 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2008/04/10 23:34:51 bjs Exp $
 
 --- doc/Makefile.orig  2006-12-17 17:02:33.000000000 -0800
 +++ doc/Makefile
-@@ -1,4 +1,4 @@
--SOURCES=$(wildcard *.[0-9].txt)
-+SOURCES=hg.1.txt hgignore.5.txt hgmerge.1.txt hgrc.5.txt
- MAN=$(SOURCES:%.txt=%)
- HTML=$(SOURCES:%.txt=%.html)
- PREFIX=/usr/local
 @@ -15,7 +15,7 @@ hg.1.txt: hg.1.gendoc.txt
        touch hg.1.txt
Prev by Date: [pkgsrc/trunk]: pkgsrc update to 1.1.11.1
Next by Date: [pkgsrc/trunk]: pkgsrc/multimedia/mediatomb Make sure some other packages are...
Previous by Thread: [pkgsrc/trunk]: pkgsrc update to 1.1.11.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/mediatomb Make sure some other packages are...
Indexes:
Home | Main Index | Thread Index | Old Index