On Sun, Apr 09, 2017 at 09:18:16AM +0200, Remi Pointel wrote:
> On 03/27/17 04:25, Juan Francisco Cantero Hurtado wrote:
> > 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.
> >
> >
>
> Hi,
>
> attached are the diff for mercurial and tortoisehg 4.1.2.
>
> Ok?
Sorry for the delay.
If you are not interested in mercurial anymore, I could take the
maintainership of both packages. If this is OK for you, then add me as
MAINTAINER so we can avoid an additional bump just to change MAINTAINER.
In any case, both patches are OK juanfra@.
>
> Cheers,
>
> Remi.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/mercurial/Makefile,v
> retrieving revision 1.68
> diff -u -p -u -p -r1.68 Makefile
> --- Makefile 14 Jun 2016 19:58:05 -0000 1.68
> +++ Makefile 9 Apr 2017 07:08:59 -0000
> @@ -3,20 +3,15 @@
> COMMENT-main = fast, lightweight source control management
> COMMENT-x11 = graphical tooling for mercurial
>
> -MODPY_EGG_VERSION = 3.8.3
> +MODPY_EGG_VERSION = 4.1.2
> 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 <[email protected]>
> -
> # GPLv2
> PERMIT_PACKAGE_CDROM = Yes
>
> @@ -24,6 +19,7 @@ MASTER_SITES = ${HOMEPAGE}/release/
>
> MODULES = lang/python x11/tk
> USE_GROFF = Yes
> +USE_GMAKE = Yes
>
> MULTI_PACKAGES = -main -x11
>
> @@ -45,12 +41,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 +53,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 -u -p -r1.47 distinfo
> --- distinfo 14 Jun 2016 09:47:43 -0000 1.47
> +++ distinfo 9 Apr 2017 07:08:59 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mercurial-3.8.3.tar.gz) =
> +EVWzfmjMZhCYVSdnQgUOrnaM9fAPwqjI7DuUtB4Kkw=
> -SIZE (mercurial-3.8.3.tar.gz) = 4772901
> +SHA256 (mercurial-4.1.2.tar.gz) =
> CUFSU/tAmnfhm5lRUyo8IsTgfnS6uAZSUnBkYX2qsZQ=
> +SIZE (mercurial-4.1.2.tar.gz) = 5133417
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST-main
> --- pkg/PLIST-main 14 Jun 2016 09:47:43 -0000 1.7
> +++ pkg/PLIST-main 9 Apr 2017 07:08:59 -0000
> @@ -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
> +lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/load.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/pybser.py
>
> lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/pywatchman/pybser.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/fsmonitor/state.py
> @@ -82,8 +87,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/hgext/gpg.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/graphlog.py
> lib/python${MODPY_VERSION}/site-packages/hgext/graphlog.pyc
> -lib/python${MODPY_VERSION}/site-packages/hgext/hgcia.py
> -lib/python${MODPY_VERSION}/site-packages/hgext/hgcia.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/highlight/
> lib/python${MODPY_VERSION}/site-packages/hgext/highlight/__init__.py
> lib/python${MODPY_VERSION}/site-packages/hgext/highlight/__init__.pyc
> @@ -91,6 +94,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/hgext/highlight/highlight.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/histedit.py
> lib/python${MODPY_VERSION}/site-packages/hgext/histedit.pyc
> +lib/python${MODPY_VERSION}/site-packages/hgext/journal.py
> +lib/python${MODPY_VERSION}/site-packages/hgext/journal.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/keyword.py
> lib/python${MODPY_VERSION}/site-packages/hgext/keyword.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/
> @@ -112,6 +117,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/remotestore.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/reposetup.py
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/reposetup.pyc
> +lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/storefactory.py
> +lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/storefactory.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/uisetup.py
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/uisetup.pyc
> lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/wirestore.py
> @@ -184,8 +191,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/changegroup.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/changelog.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/chgserver.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/chgserver.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/cmdutil.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/cmdutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/color.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/color.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/commands.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/commands.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/commandserver.py
> @@ -202,6 +213,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/dagparser.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/dagutil.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/debugcommands.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/debugcommands.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/
> lib/python${MODPY_VERSION}/site-packages/mercurial/default.d/mergetools.rc
> lib/python${MODPY_VERSION}/site-packages/mercurial/demandimport.py
> @@ -211,6 +224,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelpers.so
> lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateguard.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateguard.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/discovery.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/discovery.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/dispatch.py
> @@ -260,12 +275,11 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/internals/changegroups.txt
>
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/internals/requirements.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/internals/revlogs.txt
> +lib/python${MODPY_VERSION}/site-packages/mercurial/help/internals/wireprotocol.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/merge-tools.txt
> -lib/python${MODPY_VERSION}/site-packages/mercurial/help/multirevs.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/patterns.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/phases.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/revisions.txt
> -lib/python${MODPY_VERSION}/site-packages/mercurial/help/revsets.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/scripting.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/subrepos.txt
> lib/python${MODPY_VERSION}/site-packages/mercurial/help/templates.txt
> @@ -300,8 +314,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/__init__.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/_readers.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/_readers.pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/socketutil.py
> -lib/python${MODPY_VERSION}/site-packages/mercurial/httpclient/socketutil.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/httpconnection.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/httpconnection.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/httppeer.py
> @@ -365,6 +377,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/mdiff.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/merge.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/merge.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/mergeutil.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/mergeutil.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/minirst.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/mpatch.so
> @@ -386,8 +400,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/peer.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/phases.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/phases.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/policy.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/policy.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/posix.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/posix.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/profiling.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/profiling.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/progress.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/progress.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/pure/
> @@ -409,8 +427,6 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/pushkey.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/pvec.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/pvec.pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.py
> -lib/python${MODPY_VERSION}/site-packages/mercurial/py3kcompat.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/pycompat.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/pycompat.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/registrar.py
> @@ -429,6 +445,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/scmutil.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/scmwindows.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/scmwindows.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/server.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/server.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/setdiscovery.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/setdiscovery.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/similar.py
> @@ -443,12 +461,12 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/sslutil.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/statichttprepo.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/statprof.py
> +lib/python${MODPY_VERSION}/site-packages/mercurial/statprof.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/store.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/store.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/streamclone.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/streamclone.pyc
> -lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.py
> -lib/python${MODPY_VERSION}/site-packages/mercurial/strutil.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/subrepo.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/tagmerge.py
> @@ -650,6 +668,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/mercurial/wireproto.pyc
> lib/python${MODPY_VERSION}/site-packages/mercurial/worker.py
> lib/python${MODPY_VERSION}/site-packages/mercurial/worker.pyc
> +lib/python${MODPY_VERSION}/site-packages/mercurial/zstd.so
> +@man man/man1/chg.1
> @man man/man1/hg.1
> @man man/man5/hgignore.5
> @man man/man5/hgrc.5
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
> retrieving revision 1.22
> diff -u -p -u -p -r1.22 Makefile
> --- Makefile 14 Jun 2016 09:49:41 -0000 1.22
> +++ Makefile 9 Apr 2017 07:08:56 -0000
> @@ -2,14 +2,12 @@
>
> COMMENT = series of applications for Mercurial
>
> -MODPY_EGG_VERSION = 3.8.3
> +MODPY_EGG_VERSION = 4.1.2
> DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
>
> CATEGORIES = devel
>
> -HOMEPAGE = http://tortoisehg.bitbucket.org/
> -
> -MAINTAINER = Remi Pointel <[email protected]>
> +HOMEPAGE = https://tortoisehg.bitbucket.io/
>
> # GPLv2
> PERMIT_PACKAGE_CDROM = Yes
> @@ -25,7 +23,7 @@ RUN_DEPENDS = x11/py-qt4 \
> editors/qscintilla \
> devel/py-sip \
> editors/py-qscintilla \
> - devel/mercurial>=3.8,<3.9 \
> + devel/mercurial>=4.1,<4.2 \
> devel/py-iniparse
>
> NO_TEST = Yes
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 distinfo
> --- distinfo 14 Jun 2016 09:49:41 -0000 1.19
> +++ distinfo 9 Apr 2017 07:08:56 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (tortoisehg-3.8.3.tar.gz) =
> YwRYVwZxILPl1Ls/+HmFucrqwnyi5p31lGqxoCgtCMg=
> -SIZE (tortoisehg-3.8.3.tar.gz) = 7817490
> +SHA256 (tortoisehg-4.1.2.tar.gz) =
> Hh2+4yOs2QRs+UDXT5CfgV/QcZG2S57RV2uXOvI9f+s=
> +SIZE (tortoisehg-4.1.2.tar.gz) = 7916802
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 PLIST
> --- pkg/PLIST 14 Jun 2016 09:49:41 -0000 1.14
> +++ pkg/PLIST 9 Apr 2017 07:08:56 -0000
> @@ -1,8 +1,12 @@
> -@comment $OpenBSD: PLIST,v 1.14 2016/06/14 09:49:41 czarkoff Exp $
> +@comment $OpenBSD$
> bin/thg
> lib/nautilus/
> lib/nautilus/extensions-3.0/
> lib/nautilus/extensions-3.0/nautilus-thg.py
> +@comment lib/python${MODPY_VERSION}/site-packages/hgext3rd/__init__.py
> +@comment lib/python${MODPY_VERSION}/site-packages/hgext3rd/__init__.pyc
> +lib/python${MODPY_VERSION}/site-packages/hgext3rd/thg.py
> +lib/python${MODPY_VERSION}/site-packages/hgext3rd/thg.pyc
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/
>
> lib/python${MODPY_VERSION}/site-packages/tortoisehg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/__init__.py
> @@ -62,6 +66,8 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graft.pyc
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graph.py
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graph.pyc
> +lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graphopt.py
> +lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graphopt.pyc
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/grep.py
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/grep.pyc
> lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/guess.py
--
Juan Francisco Cantero Hurtado http://juanfra.info
