diff options
-rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
-rw-r--r-- | security/openssh-portable/pkg-plist | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 81167ca74641..dc3183b9e4ea 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -219,10 +219,8 @@ pre-install: .endfor post-install: -.if !defined(WITH_OVERWRITE_BASE) ${INSTALL_DATA} -c ${WRKSRC}/ssh_config.out ${ETCSSH}/ssh_config-dist ${INSTALL_DATA} -c ${WRKSRC}/sshd_config.out ${ETCSSH}/sshd_config-dist -.endif .if defined(WITH_OVERWRITE_BASE) @${ECHO_CMD} "===> Installing rc.d startup script(s)" @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index a3b89974bf1e..b5f32bf8cf17 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -12,8 +12,8 @@ bin/ssh-keyscan %%NOTBASE%%@exec if [ -f %D/etc/sshd_config -a ! -f %D/etc/ssh/sshd_config ]; then ln %D/etc/sshd_config %D/etc/ssh/sshd_config ; fi %%NOTBASE%%@unexec if cmp -s %D/etc/ssh/ssh_config %D/etc/ssh/ssh_config-dist; then rm -f %D/etc/ssh/ssh_config; fi %%NOTBASE%%@unexec if cmp -s %D/etc/ssh/sshd_config %D/etc/ssh/sshd_config-dist; then rm -f %D/etc/ssh/sshd_config; fi -%%NOTBASE%%etc/ssh/ssh_config-dist -%%NOTBASE%%etc/ssh/sshd_config-dist +etc/ssh/ssh_config-dist +etc/ssh/sshd_config-dist %%NOTBASE%%@exec if [ ! -f %D/etc/ssh/ssh_config ]; then cp -p %D/etc/ssh/ssh_config-dist %D/etc/ssh/ssh_config ; fi %%NOTBASE%%@exec if [ ! -f %D/etc/ssh/sshd_config ]; then cp -p %D/etc/ssh/sshd_config-dist %D/etc/ssh/sshd_config ; fi %%NOTBASE%%@dirrmtry etc/ssh |