Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Jun 2020 20:57:40 +0000 (UTC)
From:      "Danilo G. Baio" <dbaio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540635 - in head/security/py-certbot: . files
Message-ID:  <202006272057.05RKverv016674@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbaio
Date: Sat Jun 27 20:57:40 2020
New Revision: 540635
URL: https://svnweb.freebsd.org/changeset/ports/540635

Log:
  security/py-certbot: Add man pages, Fix Concurrency
  
  PR:		235701
  Submitted by:	Walter Schwarzenfeld <w.schwarzenfeld@utanet.at>
  Reported by:	freebsd@dreamchaser.org
  Approved by:	python (with hat)

Modified:
  head/security/py-certbot/Makefile
  head/security/py-certbot/files/500.certbot.in

Modified: head/security/py-certbot/Makefile
==============================================================================
--- head/security/py-certbot/Makefile	Sat Jun 27 20:12:08 2020	(r540634)
+++ head/security/py-certbot/Makefile	Sat Jun 27 20:57:40 2020	(r540635)
@@ -3,6 +3,7 @@
 
 PORTNAME=	certbot
 PORTVERSION=	${ACME_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
@@ -34,17 +35,40 @@ USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 SUB_FILES=	500.certbot
-PLIST_FILES=	etc/periodic/weekly/500.certbot
+PLIST_FILES=	etc/periodic/weekly/500.certbot-${PYTHON_VER}
+SUB_LIST=	PYTHON_VER=${PYTHON_VER}
 
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
+
+MANPAGES_BUILD_DEPENDS=	${RUN_DEPENDS} \
+			${PY_SPHINX} \
+			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}repoze.sphinx.autointerface>0:devel/py-repoze.sphinx.autointerface@${PY_FLAVOR} \
+
+MANPAGES_PLIST_FILES=	share/man/man1/certbot.1.gz \
+			share/man/man7/certbot.7.gz
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/certbot/compat/misc.py \
 		${WRKSRC}/tests/cli_test.py
 
+post-build-MANPAGES-on:
+	# Avoid gmake / ${DO_MAKE_BUILD} -C ${WRKSRC}/docs man
+	(cd ${WRKSRC}/docs && \
+		sphinx-build-${PYTHON_VER} -N -b man . _build/man)
+
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly
 	${INSTALL_SCRIPT} ${WRKDIR}/500.certbot \
-		${STAGEDIR}${PREFIX}/etc/periodic/weekly
+		${STAGEDIR}${PREFIX}/etc/periodic/weekly/500.certbot-${PYTHON_VER}
+
+post-install-MANPAGES-on:
+	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/certbot.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/certbot.7 \
+		${STAGEDIR}${PREFIX}/share/man/man7
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test

Modified: head/security/py-certbot/files/500.certbot.in
==============================================================================
--- head/security/py-certbot/files/500.certbot.in	Sat Jun 27 20:12:08 2020	(r540634)
+++ head/security/py-certbot/files/500.certbot.in	Sat Jun 27 20:57:40 2020	(r540635)
@@ -38,7 +38,7 @@ case "$weekly_certbot_enable" in
 	fi
 
 	anticongestion
-	if %%LOCALBASE%%/bin/certbot renew --pre-hook "$PRE_HOOK" \
+	if %%LOCALBASE%%/bin/certbot-%%PYTHON_VER%% renew --pre-hook "$PRE_HOOK" \
 	                             --post-hook "$POST_HOOK" \
 	   			     --no-random-sleep-on-renew
 	then



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006272057.05RKverv016674>