diff options
| -rw-r--r-- | security/denyhosts/Makefile | 9 | ||||
| -rw-r--r-- | security/denyhosts/pkg-plist | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile index 9a9f067ec448..36fb4c998d9a 100644 --- a/security/denyhosts/Makefile +++ b/security/denyhosts/Makefile @@ -7,6 +7,7 @@ PORTNAME= denyhosts PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,16 +23,16 @@ USE_RC_SUBR= denyhosts PORTDOCS= CHANGELOG.txt LICENSE.txt README.txt -pre-configure: +post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ ${WRKSRC}/daemon-control-dist \ ${WRKSRC}/denyhosts.cfg-dist \ ${WRKSRC}/setup.py post-install: - ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist ${PREFIX}/etc - [ -f ${PREFIX}/etc/denyhosts.cfg ] || \ - ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist ${PREFIX}/etc/denyhosts.cfg + ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist ${PREFIX}/etc/denyhosts.conf-dist + [ -f ${PREFIX}/etc/denyhosts.conf ] || \ + ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist ${PREFIX}/etc/denyhosts.conf .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} . for f in ${PORTDOCS} diff --git a/security/denyhosts/pkg-plist b/security/denyhosts/pkg-plist index c15df5e9df22..0c62442287ca 100644 --- a/security/denyhosts/pkg-plist +++ b/security/denyhosts/pkg-plist @@ -1,7 +1,7 @@ bin/denyhosts.py -@unexec if cmp -s %D/etc/denyhosts.cfg %D/etc/denyhosts.cfg-dist; then rm -f %D/etc/denyhosts.cfg; fi -etc/denyhosts.cfg-dist -@exec [ -f %B/denyhosts.cfg ] || cp -f %B/%f %B/denyhosts.cfg +@unexec if cmp -s %D/etc/denyhosts.conf %D/etc/denyhosts.conf-dist; then rm -f %D/etc/denyhosts.conf; fi +etc/denyhosts.conf-dist +@exec [ -f %B/denyhosts.conf ] || cp -f %B/%f %B/denyhosts.conf %%DATADIR%%/daemon-control-dist %%DATADIR%%/denyhosts.cfg-dist %%DATADIR%%/setup.py |