diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-04-30 01:49:55 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-04-30 01:49:55 +0000 |
| commit | 70236fdc9b945c7009e921b64d4af2db68d98d96 (patch) | |
| tree | 9afe63c45407772048cc433ff4cae9590f26e0df /security/dehydrated | |
| parent | 3bc8beb33de465684ac700360448309c4518e7d3 (diff) | |
| download | ports-70236fdc9b945c7009e921b64d4af2db68d98d96.tar.gz ports-70236fdc9b945c7009e921b64d4af2db68d98d96.zip | |
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@root-login.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=468669
Diffstat (limited to 'security/dehydrated')
| -rw-r--r-- | security/dehydrated/Makefile | 32 | ||||
| -rw-r--r-- | security/dehydrated/pkg-plist | 7 |
2 files changed, 23 insertions, 16 deletions
diff --git a/security/dehydrated/Makefile b/security/dehydrated/Makefile index 61f27b60aac4..43b5dc5d8c4b 100644 --- a/security/dehydrated/Makefile +++ b/security/dehydrated/Makefile @@ -3,6 +3,7 @@ PORTNAME= dehydrated DISTVERSIONPREFIX= v DISTVERSION= 0.6.2 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= sascha@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 diff --git a/security/dehydrated/pkg-plist b/security/dehydrated/pkg-plist new file mode 100644 index 000000000000..d09bb0c4f41f --- /dev/null +++ b/security/dehydrated/pkg-plist @@ -0,0 +1,7 @@ +bin/dehydrated +@sample %%ETCDIR%%/config.sample +@sample %%ETCDIR%%/domains.txt.sample +@sample %%ETCDIR%%/hook.sh.sample +etc/periodic/weekly/000.dehydrated +@dir %%ETCDIR%%/.acme-challenges +@dir %%WWWDIR%% |