OK? Objections?. 4.1 is faster than 3.8 and includes chg and zstd. I
would like to have this version in 6.1.
czarkoff, the update breaks hg-git with https urls, even with the latest
upstream code. git:// works for me. Let me know if you see more problems
with your ports.
Index: Makefile
===
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile14 Jun 2016 19:58:05 - 1.68
+++ Makefile27 Mar 2017 01:57:23 -
@@ -3,16 +3,13 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION =3.8.3
+MODPY_EGG_VERSION =4.1.1
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
PKGNAME-main = ${DISTNAME}
PKGNAME-x11 = mercurial-x11-${MODPY_EGG_VERSION}
-REVISION-main =0
-REVISION-x11 = 0
-
HOMEPAGE = http://www.mercurial-scm.org
MAINTAINER = Remi Pointel
@@ -24,6 +21,7 @@ MASTER_SITES =${HOMEPAGE}/release/
MODULES = lang/python x11/tk
USE_GROFF =Yes
+USE_GMAKE =Yes
MULTI_PACKAGES = -main -x11
@@ -45,12 +43,11 @@ SCRIPTS = hg-ssh hgk \
tcsh_completion_build.sh dumprevlog \
undumprevlog simplemerge
-WANTLIB-main +=${MODPY_WANTLIB} pthread
+WANTLIB-main +=${MODPY_WANTLIB} c pthread
WANTLIB-x11 =
PKG_ARCH-x11 = *
MODPY_ADJ_FILES = hgweb.cgi \
- contrib/convert-repo \
contrib/dumprevlog \
contrib/hg-ssh \
contrib/simplemerge \
@@ -58,11 +55,16 @@ MODPY_ADJ_FILES = hgweb.cgi \
pre-configure:
${MODTCL_WISH_ADJ} ${WRKSRC}/contrib/hgk
+post-build:
+ cd ${WRKSRC}/contrib/chg && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+
post-install:
+ ${INSTALL_MAN} ${WRKSRC}/contrib/chg/chg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hg.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/hgignore.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/hgrc.5 ${PREFIX}/man/man5
${INSTALL_DATA_DIR} ${PREFIX}/share/mercurial/
+ ${INSTALL_PROGRAM} ${WRKSRC}/contrib/chg/chg ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/hgeditor ${PREFIX}/share/mercurial
. for file in ${FILES}
${INSTALL_DATA} ${WRKSRC}/${file} \
Index: distinfo
===
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo14 Jun 2016 09:47:43 - 1.47
+++ distinfo27 Mar 2017 01:57:23 -
@@ -1,2 +1,2 @@
-SHA256 (mercurial-3.8.3.tar.gz) = +EVWzfmjMZhCYVSdnQgUOrnaM9fAPwqjI7DuUtB4Kkw=
-SIZE (mercurial-3.8.3.tar.gz) = 4772901
+SHA256 (mercurial-4.1.1.tar.gz) = Y1cb4SAvg8cgQeuMoqLrrtooTSAx/XCJGfxhBYnTNZ4=
+SIZE (mercurial-4.1.1.tar.gz) = 5132169
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 14 Jun 2016 09:47:43 - 1.7
+++ pkg/PLIST-main 27 Mar 2017 01:57:23 -
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.7 2016/06/14 09:47:43 czarkoff Exp $
@pkgpath devel/mercurial
+@bin bin/chg
bin/hg
lib/python${MODPY_VERSION}/site-packages/hgext/
lib/python${MODPY_VERSION}/site-packages/hgext/__init__.py
@@ -14,8 +15,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/bugzilla.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/censor.py
lib/python${MODPY_VERSION}/site-packages/hgext/censor.pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/chgserver.py
-lib/python${MODPY_VERSION}/site-packages/hgext/chgserver.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/children.py
lib/python${MODPY_VERSION}/site-packages/hgext/children.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/churn.py
@@ -72,6 +71,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/bser.so
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/capabilities.py
lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/capabilities.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/compat.py
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/compat.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/encoding.py
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/encoding.pyc
+lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/load.py
