Fri Jun 3 00:33:33 2011 UTC ()
Update to 1.8.4:

   This is a regular time-based bugfix release.
     * bookmarks: do not forward merged bookmark (issue1877)
     * changelog: convert user and desc from local encoding early
     * fix bookmarks rollback behavior
     * hgrc.5: document shell aliases
     * httprepo: proper handling of invalid responses without content-type (issue2019)
     * httprepo: send URL redirection notices to stderr (issue2828)
     * localrepo: don't add deleted files to list of modified/added files (issue2761)
     * localrepo: ignore tags to unknown nodes (issue2750)
     * mq: strip extra whitespace from node ids in header (issue2790)
     * rebase: restore mq guards after rebasing (issue2107)
     * revset: expand help for contains predicate
     * revset: note case-insensitive matches in keyword and user
     * revset: note case-sensitive match in grep
     * revset: report a parse error if a revset is not parsed completely (issue2654)
     * revset: the name is optional for the tag predicate
     * simplemerge: do not allow binary files to abort an entire merge
     * strip: make it clear that --force discards changes (issue310)
     * subrepo: don't crash when git .hgsubstate is empty (issue2716)
     * subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
     * subrepo: respect non-default path for incoming/outgoing
     * subrepo: svn abort now depends on exit code (issue2833)
     * subrepo: use code from 71ea5b only if Python needs it (issue2795)
     * tags: catch more corruption during cache parsing (issue2779)


(wiz)
diff -r1.57 -r1.58 pkgsrc/devel/mercurial/Makefile
diff -r1.45 -r1.46 pkgsrc/devel/mercurial/distinfo
cvs diff -r1.57 -r1.58 pkgsrc/devel/mercurial/Makefile (switch to unified diff)

--- pkgsrc/devel/mercurial/Makefile 2011/05/02 13:05:06 1.57
+++ pkgsrc/devel/mercurial/Makefile 2011/06/03 00:33:32 1.58
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.57 2011/05/02 13:05:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.58 2011/06/03 00:33:32 wiz Exp $
2# 2#
3 3
4DISTNAME= mercurial-1.8.3 4DISTNAME= mercurial-1.8.4
5CATEGORIES= devel scm 5CATEGORIES= devel scm
6MASTER_SITES= http://mercurial.selenic.com/release/ 6MASTER_SITES= http://mercurial.selenic.com/release/
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://mercurial.selenic.com/wiki/ 9HOMEPAGE= http://mercurial.selenic.com/wiki/
10COMMENT= Fast, lightweight source control management system 10COMMENT= Fast, lightweight source control management system
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
12 12
13BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 13BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
14BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 14BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18PY_PATCHPLIST= yes 18PY_PATCHPLIST= yes
19PYDISTUTILSPKG= yes 19PYDISTUTILSPKG= yes
20USE_TOOLS+= gmake msgfmt 20USE_TOOLS+= gmake msgfmt
21 21
22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
23INSTALLATION_DIRS+= share/doc/mercurial 23INSTALLATION_DIRS+= share/doc/mercurial
24 24
25post-install: 25post-install:
26 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 26 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
27 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 27 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
28 ${INSTALL_DATA} ${WRKSRC}/README \ 28 ${INSTALL_DATA} ${WRKSRC}/README \
29 ${DESTDIR}${PREFIX}/share/doc/mercurial 29 ${DESTDIR}${PREFIX}/share/doc/mercurial
30 30
31.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
32 32
33.if ${OPSYS} == "Linux" && empty(OS_VERSION:M2.4.*) && empty(OS_VERSION:M2.2.*) 33.if ${OPSYS} == "Linux" && empty(OS_VERSION:M2.4.*) && empty(OS_VERSION:M2.2.*)
34PLIST_SRC+= ${.CURDIR}/PLIST ${.CURDIR}/PLIST.inotify 34PLIST_SRC+= ${.CURDIR}/PLIST ${.CURDIR}/PLIST.inotify
35.endif 35.endif
36 36
37.include "../../lang/python/extension.mk" 37.include "../../lang/python/extension.mk"
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.45 -r1.46 pkgsrc/devel/mercurial/Attic/distinfo (switch to unified diff)

--- pkgsrc/devel/mercurial/Attic/distinfo 2011/05/02 13:05:06 1.45
+++ pkgsrc/devel/mercurial/Attic/distinfo 2011/06/03 00:33:33 1.46
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.45 2011/05/02 13:05:06 wiz Exp $ 1$NetBSD: distinfo,v 1.46 2011/06/03 00:33:33 wiz Exp $
2 2
3SHA1 (mercurial-1.8.3.tar.gz) = 2a8b09e3c203f276204d93706db0582c112e6657 3SHA1 (mercurial-1.8.4.tar.gz) = 25c4f9b1ad1c5c8ef94ca5b120c9af6bdfd23bdc
4RMD160 (mercurial-1.8.3.tar.gz) = 5c1ac5e28014b78e1ad589acf97103d024a0890c 4RMD160 (mercurial-1.8.4.tar.gz) = c9c21ac48e6c37360f4de5833ddf0ee5e2594620
5Size (mercurial-1.8.3.tar.gz) = 2550988 bytes 5Size (mercurial-1.8.4.tar.gz) = 2554592 bytes