- Update to 3.9

- Switch to options helpers
- CA_BUNDLE option is set by default (https://www.mercurial-scm.org/wiki/SecureConnections)
- Little clean up CONTRIB_FILES
- Replace CGI by FastCGI in pkg-message (consequence of removal some files in
CONTRIB_FILES)

Changes: https://www.mercurial-scm.org/wiki/WhatsNew#Mercurial_3.9_.282016-8-1.29
This commit is contained in:
Olivier Duchateau 2016-08-01 17:51:07 +00:00
parent 89b1e497b3
commit 610eb33273
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=419447
4 changed files with 28 additions and 35 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mercurial
PORTVERSION= 3.8.4
PORTVERSION= 3.9
CATEGORIES= devel python
MASTER_SITES= http://mercurial-scm.org/release/
@ -16,11 +16,12 @@ USES= cpe python:2
USE_PYTHON= distutils
OPTIONS_DEFINE= CA_BUNDLE DATA DOCS NLS FREEBSD
OPTIONS_DEFAULT=DATA
OPTIONS_DEFAULT=CA_BUNDLE DATA
OPTIONS_SUB= yes
CA_BUNDLE_DESC= Install CA Certificates
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
DATA_SUB_FILES= pkg-message
FREEBSD_DESC= Patches used internally by the FreeBSD Project
FREEBSD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-authormapsuffix
NLS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-setup.py
@ -38,7 +39,6 @@ CONTRIB_FILES= bash_completion \
hgsh/hgsh.c \
mercurial.el \
mq.el \
perf.py \
pylintrc \
python-hook-examples.py \
simplemerge \
@ -54,34 +54,26 @@ CONTRIB_FILES= bash_completion \
vim/patchreview.vim
DOCS= CONTRIBUTORS README
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDATA}
SUB_FILES= pkg-message
.endif
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/*.so
${STRIP_CMD} \
${STAGEDIR}${PYTHON_SITELIBDIR}/hgext/fsmonitor/pywatchman/*.so
.if ${PORT_OPTIONS:MDATA}
${MKDIR} ${STAGEDIR}${DATADIR}
${MKDIR} ${STAGEDIR}${DATADIR}/contrib
${MKDIR} ${STAGEDIR}${DATADIR}/contrib/hgsh
${MKDIR} ${STAGEDIR}${DATADIR}/contrib/vim
for f in ${CONTRIB_FILES}; do \
${CP} -p ${WRKSRC}/contrib/$${f} ${STAGEDIR}${DATADIR}/contrib/$${f}; \
done
post-install-DATA-on:
.for d in hgsh vim
${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d}
.endfor
${MKDIR} ${STAGEDIR}${DATADIR}/www
${INSTALL_DATA} ${WRKSRC}/*.cgi ${STAGEDIR}${DATADIR}/www
${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${STAGEDIR}${DATADIR}/www
${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${STAGEDIR}${DATADIR}/www
.endif
.for f in ${CONTRIB_FILES}
${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
${STAGEDIR}${DATADIR}/contrib/${f}
.endfor
${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1467440792
SHA256 (mercurial-3.8.4.tar.gz) = 4b2e3ef19d34fa1d781cb7425506a05d4b6b1172bab69d6ea78874175fdf3da6
SIZE (mercurial-3.8.4.tar.gz) = 4775341
TIMESTAMP = 1470079520
SHA256 (mercurial-3.9.tar.gz) = 834f25dcff44994198fb8a7ba161a6e24204dbd63c8e6270577e06e6cedbdabc
SIZE (mercurial-3.9.tar.gz) = 4796280

View file

@ -1,7 +1,7 @@
====
Note that we now install a few more files in %%PREFIX%%/share/mercurial:
- shell completion scripts (bash, tcsh and zsh)
- CGI / WSGI scripts for web access to repositories
- FastCGI / WSGI scripts for web access to repositories
see http://www.mercurial-scm.org/wiki/PublishingRepositories
- various documentation files
====

View file

@ -114,9 +114,6 @@ bin/hg
%%PYTHON_SITELIBDIR%%/hgext/graphlog.py
%%PYTHON_SITELIBDIR%%/hgext/graphlog.pyc
%%PYTHON_SITELIBDIR%%/hgext/graphlog.pyo
%%PYTHON_SITELIBDIR%%/hgext/hgcia.py
%%PYTHON_SITELIBDIR%%/hgext/hgcia.pyc
%%PYTHON_SITELIBDIR%%/hgext/hgcia.pyo
%%PYTHON_SITELIBDIR%%/hgext/hgk.py
%%PYTHON_SITELIBDIR%%/hgext/hgk.pyc
%%PYTHON_SITELIBDIR%%/hgext/hgk.pyo
@ -129,6 +126,9 @@ bin/hg
%%PYTHON_SITELIBDIR%%/hgext/histedit.py
%%PYTHON_SITELIBDIR%%/hgext/histedit.pyc
%%PYTHON_SITELIBDIR%%/hgext/histedit.pyo
%%PYTHON_SITELIBDIR%%/hgext/journal.py
%%PYTHON_SITELIBDIR%%/hgext/journal.pyc
%%PYTHON_SITELIBDIR%%/hgext/journal.pyo
%%PYTHON_SITELIBDIR%%/hgext/keyword.py
%%PYTHON_SITELIBDIR%%/hgext/keyword.pyc
%%PYTHON_SITELIBDIR%%/hgext/keyword.pyo
@ -159,6 +159,9 @@ bin/hg
%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.py
%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyc
%%PYTHON_SITELIBDIR%%/hgext/largefiles/reposetup.pyo
%%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
@ -411,9 +414,6 @@ bin/hg
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.py
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyc
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/_readers.pyo
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.py
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyc
%%PYTHON_SITELIBDIR%%/mercurial/httpclient/socketutil.pyo
%%PYTHON_SITELIBDIR%%/mercurial/httpconnection.py
%%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyc
%%PYTHON_SITELIBDIR%%/mercurial/httpconnection.pyo
@ -495,6 +495,9 @@ bin/hg
%%PYTHON_SITELIBDIR%%/mercurial/phases.py
%%PYTHON_SITELIBDIR%%/mercurial/phases.pyc
%%PYTHON_SITELIBDIR%%/mercurial/phases.pyo
%%PYTHON_SITELIBDIR%%/mercurial/policy.py
%%PYTHON_SITELIBDIR%%/mercurial/policy.pyc
%%PYTHON_SITELIBDIR%%/mercurial/policy.pyo
%%PYTHON_SITELIBDIR%%/mercurial/posix.py
%%PYTHON_SITELIBDIR%%/mercurial/posix.pyc
%%PYTHON_SITELIBDIR%%/mercurial/posix.pyo
@ -812,7 +815,6 @@ man/man5/hgrc.5.gz
%%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c
%%DATA%%%%DATADIR%%/contrib/mercurial.el
%%DATA%%%%DATADIR%%/contrib/mq.el
%%DATA%%%%DATADIR%%/contrib/perf.py
%%DATA%%%%DATADIR%%/contrib/pylintrc
%%DATA%%%%DATADIR%%/contrib/python-hook-examples.py
%%DATA%%%%DATADIR%%/contrib/simplemerge
@ -826,6 +828,5 @@ man/man5/hgrc.5.gz
%%DATA%%%%DATADIR%%/contrib/vim/patchreview.txt
%%DATA%%%%DATADIR%%/contrib/vim/patchreview.vim
%%DATA%%%%DATADIR%%/contrib/zsh_completion
%%DATA%%%%DATADIR%%/www/hgweb.cgi
%%DATA%%%%DATADIR%%/www/hgweb.fcgi
%%DATA%%%%DATADIR%%/www/hgweb.wsgi