svn commit: r468669 - head/security/dehydrated

[Yuri Victorovich]

Author: yuri
Date: Mon Apr 30 01:49:55 2018
New Revision: 468669
URL: https://svnweb.freebsd.org/changeset/ports/468669

Log:
  security/dehydrated: Restore ZSH and BASH options because they make scripts to use these shells
  
  The options were deleted mistakenly in the previous commit.
  Additionally, moved plist into pkg-plist file, and added @sample instructions for relevant samples.
  
  PR:		227848
  Reported by:	Sascha Holzleiter <sascha at root-login.org> (maintainer)

Added:
  head/security/dehydrated/pkg-plist   (contents, props changed)
Modified:
  head/security/dehydrated/Makefile

Modified: head/security/dehydrated/Makefile
==============================================================================
--- head/security/dehydrated/Makefile	Sun Apr 29 22:43:48 2018	(r468668)
+++ head/security/dehydrated/Makefile	Mon Apr 30 01:49:55 2018	(r468669)
@@ -3,6 +3,7 @@
 PORTNAME=	dehydrated
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	sascha at root-login.org
@@ -11,8 +12,7 @@ COMMENT=	Pure BASH/ZSH Lets Encrypt client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	bash:shells/bash \
-		curl:ftp/curl
+RUN_DEPENDS=	curl:ftp/curl
 
 USES=		shebangfix
 USE_GITHUB=	yes
@@ -24,37 +24,37 @@ SHEBANG_FILES=	docs/examples/hook.sh dehydrated
 PERIODIC_DIRS=	etc/periodic/weekly
 PERIODIC_FILES=	000.dehydrated
 
-PLIST_DIRS=	${ETCDIR}/.acme-challenges \
-		www/dehydrated
-PLIST_FILES=	bin/dehydrated \
-		${ETCDIR}/config.example \
-		${ETCDIR}/hook.sh.example \
-		${ETCDIR}/domains.txt.example \
-		${PERIODIC_DIRS}/000.dehydrated
-
 SUB_FILES=	000.dehydrated pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	SHELL
+OPTIONS_SINGLE_SHELL=	BASH ZSH
+OPTIONS_DEFAULT=	BASH
+BASH_DESC=	Use the Bourne Again shell (BASH)
+ZSH_DESC=	Use the Z shell (ZSH)
 
+BASH_RUN_DEPENDS=	bash:shells/bash
+ZSH_RUN_DEPENDS=	zsh:shells/zsh
+
 PORTDOCS=	*
 
 post-patch:
 .	for f in docs/examples/config dehydrated
-		${REINPLACE_CMD} 's|/var/www/dehydrated|${PREFIX}/www/dehydrated|' \
+		@${REINPLACE_CMD} 's|/var/www/dehydrated|${PREFIX}/www/dehydrated|' \
 		    ${WRKSRC}/${f}
 .	endfor
 
 post-patch-ZSH-on:
-.	for p in docs/examples/config docs/examples/hook.sh dehydrated
-		${REINPLACE_CMD} '1 s/bash/zsh/' ${WRKSRC}/${p}
+.	for p in docs/examples/hook.sh dehydrated
+		@${REINPLACE_CMD} '1 s/bash/zsh/' ${WRKSRC}/${p}
 .	endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/.acme-challenges ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/config ${STAGEDIR}${ETCDIR}/config.example
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/hook.sh ${STAGEDIR}${ETCDIR}/hook.sh.example
-	${INSTALL_DATA} ${WRKSRC}/docs/examples/domains.txt ${STAGEDIR}${ETCDIR}/domains.txt.example
+	${INSTALL_DATA} ${WRKSRC}/docs/examples/config ${STAGEDIR}${ETCDIR}/config.sample
+	${INSTALL_DATA} ${WRKSRC}/docs/examples/hook.sh ${STAGEDIR}${ETCDIR}/hook.sh.sample
+	${INSTALL_DATA} ${WRKSRC}/docs/examples/domains.txt ${STAGEDIR}${ETCDIR}/domains.txt.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/www/dehydrated

Added: head/security/dehydrated/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/dehydrated/pkg-plist	Mon Apr 30 01:49:55 2018	(r468669)
@@ -0,0 +1,7 @@
+bin/dehydrated
+ at sample %%ETCDIR%%/config.sample
+ at sample %%ETCDIR%%/domains.txt.sample
+ at sample %%ETCDIR%%/hook.sh.sample
+etc/periodic/weekly/000.dehydrated
+ at dir %%ETCDIR%%/.acme-challenges
+ at dir %%WWWDIR%%