Attachment 201614 Details for Bug 235406 – Patch to update devel/mercurial

[patch] Patch to update devel/mercurial

mercurial.diff (text/plain), 10.46 KB, created by Olivier Duchateau on 2019-02-01 20:02:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2019-02-01 20:02:34 UTC

Size: 10.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 491837)
>+++ Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	mercurial
>-PORTVERSION=	4.8.2
>+PORTVERSION=	4.9
> CATEGORIES=	devel python
> MASTER_SITES=	https://www.mercurial-scm.org/release/
> 
>@@ -15,6 +15,10 @@
> USES=		cpe python:2.7
> USE_PYTHON=	distutils
> 
>+# Follow, https://www.mercurial-scm.org/wiki/CACertificates
>+# Taken from security/ca_root_nss
>+CERTDIR?=	share/certs
>+
> OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS NLS FREEBSD
> OPTIONS_DEFAULT=CA_BUNDLE DATA
> OPTIONS_SUB=	yes
>@@ -55,6 +59,10 @@
> PORTDOCS=	CONTRIBUTORS README.rst
> 
> post-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mercurial
>+	${INSTALL_DATA} ${FILESDIR}/hgrc ${STAGEDIR}${PREFIX}/etc/mercurial
>+	${REINPLACE_CMD} -i "" 's|%%PREFIX%%|${PREFIX}| ;\
>+		s|%%CERTDIR%%|${CERTDIR}|' ${STAGEDIR}${PREFIX}/etc/mercurial/hgrc
> 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
> 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
> 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 491837)
>+++ distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1548351722
>-SHA256 (mercurial-4.8.2.tar.gz) = 6c202cb9cf05e63b86477ebf84d6475eb10b4022ac2cd3a7481fb36d9c45fdb2
>-SIZE (mercurial-4.8.2.tar.gz) = 6870985
>+TIMESTAMP = 1549049847
>+SHA256 (mercurial-4.9.tar.gz) = 0f600c5c7e44d4318bedc1754a70b920f7ecd278e4089b0f6ac96f460c012f06
>+SIZE (mercurial-4.9.tar.gz) = 7075692
>Index: files/hgrc
>===================================================================
>--- files/hgrc	(nonexistent)
>+++ files/hgrc	(copie de travail)
>@@ -0,0 +1,2 @@
>+[web]
>+cacerts = %%PREFIX%%/%%CERTDIR%%/ca-root-nss.crt
>
>Property changes on: files/hgrc
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 491837)
>+++ pkg-plist	(copie de travail)
>@@ -1,4 +1,5 @@
> bin/hg
>+%%ETCDIR%%/hgrc
> %%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.py
> %%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.pyc
> %%PYTHON_SITELIBDIR%%/hgdemandimport/__init__.pyo
>@@ -32,6 +33,9 @@
> %%PYTHON_SITELIBDIR%%/hgext/blackbox.py
> %%PYTHON_SITELIBDIR%%/hgext/blackbox.pyc
> %%PYTHON_SITELIBDIR%%/hgext/blackbox.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/bookflow.py
>+%%PYTHON_SITELIBDIR%%/hgext/bookflow.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/bookflow.pyo
> %%PYTHON_SITELIBDIR%%/hgext/bugzilla.py
> %%PYTHON_SITELIBDIR%%/hgext/bugzilla.pyc
> %%PYTHON_SITELIBDIR%%/hgext/bugzilla.pyo
>@@ -243,9 +247,6 @@
> %%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.py
> %%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.pyc
> %%PYTHON_SITELIBDIR%%/hgext/largefiles/storefactory.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
>@@ -318,6 +319,69 @@
> %%PYTHON_SITELIBDIR%%/hgext/relink.py
> %%PYTHON_SITELIBDIR%%/hgext/relink.pyc
> %%PYTHON_SITELIBDIR%%/hgext/relink.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/__init__.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basepack.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basepack.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basepack.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basestore.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basestore.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/basestore.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/connectionpool.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/connectionpool.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/connectionpool.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/constants.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/constants.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/constants.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/contentstore.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/contentstore.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/contentstore.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/datapack.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/datapack.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/datapack.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/debugcommands.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/extutil.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/fileserverclient.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/historypack.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/historypack.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/historypack.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/metadatastore.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/metadatastore.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/metadatastore.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilectx.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilectx.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilectx.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelog.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelog.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelog.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelogserver.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelogserver.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/remotefilelogserver.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/repack.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/repack.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/repack.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowbundle.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowbundle.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowbundle.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowrepo.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowrepo.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowrepo.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowstore.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowstore.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowstore.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowutil.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowutil.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowutil.pyo
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowverifier.py
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowverifier.pyc
>+%%PYTHON_SITELIBDIR%%/hgext/remotefilelog/shallowverifier.pyo
> %%PYTHON_SITELIBDIR%%/hgext/remotenames.py
> %%PYTHON_SITELIBDIR%%/hgext/remotenames.pyc
> %%PYTHON_SITELIBDIR%%/hgext/remotenames.pyo
>@@ -508,6 +572,9 @@
> %%PYTHON_SITELIBDIR%%/mercurial/extensions.py
> %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/extensions.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/exthelper.py
>+%%PYTHON_SITELIBDIR%%/mercurial/exthelper.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/exthelper.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/fancyopts.py
> %%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/fancyopts.pyo
>@@ -559,6 +626,7 @@
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/censor.txt
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/changegroups.txt
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/config.txt
>+%%PYTHON_SITELIBDIR%%/mercurial/help/internals/extensions.txt
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/linelog.txt
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/requirements.txt
> %%PYTHON_SITELIBDIR%%/mercurial/help/internals/revlogs.txt
>@@ -649,6 +717,9 @@
> %%PYTHON_SITELIBDIR%%/mercurial/logexchange.py
> %%PYTHON_SITELIBDIR%%/mercurial/logexchange.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/logexchange.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/loggingutil.py
>+%%PYTHON_SITELIBDIR%%/mercurial/loggingutil.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/loggingutil.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/lsprof.py
> %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/lsprof.pyo
>@@ -757,6 +828,9 @@
> %%PYTHON_SITELIBDIR%%/mercurial/repair.py
> %%PYTHON_SITELIBDIR%%/mercurial/repair.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/repair.pyo
>+%%PYTHON_SITELIBDIR%%/mercurial/repocache.py
>+%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyc
>+%%PYTHON_SITELIBDIR%%/mercurial/repocache.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/repository.py
> %%PYTHON_SITELIBDIR%%/mercurial/repository.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/repository.pyo
>@@ -1060,24 +1134,6 @@
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/attr/validators.py
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/attr/validators.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/attr/validators.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/__init__.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/__init__.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/compat.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/compat.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/compat.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/decoder.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/decoder.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/decoder.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/encoder.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/encoder.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/encoder.pyo
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/types.py
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/types.pyc
>-%%PYTHON_SITELIBDIR%%/mercurial/thirdparty/cbor/cbor2/types.pyo
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/concurrent/__init__.py
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/concurrent/__init__.pyc
> %%PYTHON_SITELIBDIR%%/mercurial/thirdparty/concurrent/__init__.pyo

Actions: View | Diff

Attachments on bug 235406: 201614