Index: head/security/dehydrated/Makefile
===================================================================
--- head/security/dehydrated/Makefile	(revision 459097)
+++ head/security/dehydrated/Makefile	(revision 459098)
@@ -1,82 +1,83 @@
 # $FreeBSD$
 
 PORTNAME=	dehydrated
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
 MAINTAINER=	sascha@root-login.org
 COMMENT=	Pure BASH/ZSH Lets Encrypt client
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	curl:ftp/curl
 
+USES=		shebangfix
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	lukas2511
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	SHELL
 OPTIONS_SINGLE_SHELL=	BASH ZSH
 BASH_DESC=	Use the Bourne Again shell (BASH)
 ZSH_DESC=	Use the Z shell (ZSH)
 
 OPTIONS_DEFAULT=	BASH
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		shebangfix
 
 BASH_RUN_DEPENDS=	bash:shells/bash
 ZSH_RUN_DEPENDS=	zsh:shells/zsh
 
 PERIODIC_DIRS=	etc/periodic/weekly
 PERIODIC_FILES=	000.dehydrated
 
-PLIST_DIRS=	%%ETCDIR%%/.acme-challenges \
+PLIST_DIRS=	${ETCDIR}/.acme-challenges \
 		www/dehydrated
 PLIST_FILES=	bin/dehydrated \
-		%%ETCDIR%%/config.example \
-		%%ETCDIR%%/hook.sh.example \
-		%%ETCDIR%%/domains.txt.example \
+		${ETCDIR}/config.example \
+		${ETCDIR}/hook.sh.example \
+		${ETCDIR}/domains.txt.example \
 		${PERIODIC_DIRS}/000.dehydrated
-PORTDOCS_PLIST_FILES=	%%PORTDOCS%%%%DOCSDIR%%/README.md
+PORTDOCS_PLIST_FILES=	${PORTDOCS}${DOCSDIR}/README.md
 
 SUB_FILES=	000.dehydrated pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 PORTDOCS=	README.md dns-verification.md domains_txt.md ecc.md hook_chain.md \
 		import-from-official-client.md per-certificate-config.md staging.md \
 		troubleshooting.md wellknown.md
 
 SHEBANG_FILES=	docs/examples/hook.sh dehydrated
 
 post-patch:
 .	for f in docs/examples/config 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}
 .	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_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PERIODIC_FILES} ${STAGEDIR}${PREFIX}/${PERIODIC_DIRS}/${PERIODIC_FILES}
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/dehydrated
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 .	for d in dns-verification domains_txt ecc hook_chain import-from-official-client \
 		per-certificate-config staging troubleshooting wellknown
 		${INSTALL_DATA} ${WRKSRC}/docs/${d}.md ${STAGEDIR}${DOCSDIR}
 .	endfor
 
 .include <bsd.port.mk>
Index: head/security/dehydrated/distinfo
===================================================================
--- head/security/dehydrated/distinfo	(revision 459097)
+++ head/security/dehydrated/distinfo	(revision 459098)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487657803
-SHA256 (lukas2511-dehydrated-v0.4.0_GH0.tar.gz) = 611da321330ffd43d1dc497990b486b2dec12c59149803ad7d156980c8527f48
-SIZE (lukas2511-dehydrated-v0.4.0_GH0.tar.gz) = 74005
+TIMESTAMP = 1515937445
+SHA256 (lukas2511-dehydrated-v0.5.0_GH0.tar.gz) = 3559de9c61f8cb9dda1d247fbb88d94eddcf2d9421941dad73b1d672cb933abe
+SIZE (lukas2511-dehydrated-v0.5.0_GH0.tar.gz) = 79965
Index: head/security/dehydrated/files/000.dehydrated.in
===================================================================
--- head/security/dehydrated/files/000.dehydrated.in	(revision 459097)
+++ head/security/dehydrated/files/000.dehydrated.in	(revision 459098)
@@ -1,53 +1,46 @@
 #!/bin/sh
 
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 PATH=$PATH:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin
 export PATH
 
 case "$weekly_letsencrypt_enable" in
     [Yy][Ee][Ss])
-        echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
-        echo '!! WARNING: letsencrypt.sh has been renamed to dehydrated !!'
-        echo '!! rename all weekly_letsencrypt_* periodic variables     !!'
-        echo '!! to         weekly_dehydrated_* in your periodic.conf   !!'
-        echo '|| and mv /usr/local/etc/{letsencrypt.sh,dehydrated}      ||'
-        echo '|| default challenge path has been renamed as well        ||'
-        echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
         : ${weekly_dehydrated_enable:=$weekly_letsencrypt_enable}
         : ${weekly_dehydrated_user:=$weekly_letsencrypt_user}
         : ${weekly_dehydrated_flags:=$weekly_letsencrypt_flags}
         : ${weekly_dehydrated_deployscript:=$weekly_letsencrypt_deployscript}
         ;;
     *)
         ;;
 esac
 
 case "$weekly_dehydrated_enable" in
     [Yy][Ee][Ss])
 	echo
 	echo "Checking Let's Encrypt certificate status:"
 
 	if [ -z "$weekly_dehydrated_user" ]
 	then
 		%%PREFIX%%/bin/dehydrated -c $weekly_dehydrated_flags
 	else
 		su -m "$weekly_dehydrated_user" -c "%%PREFIX%%/bin/dehydrated -c $weekly_dehydrated_flags"
 	fi
 
 	echo "Deploying Let's Encrypt certificates:"
 
 	if [ -x "$weekly_dehydrated_deployscript" ]
 	then
 		$weekly_dehydrated_deployscript
 	else
 		echo 'Skipped, deploy script not set or not executable.'
 	fi
         ;;
     *)
         ;;
 esac