diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-04-24 09:04:52 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-04-24 09:04:52 +0800 |
| commit | 1428a9bcad7c112680adefc89b75bf68d3b74b08 (patch) | |
| tree | ebf9d042dc7d29d1c8211490dc7f3f28a1a81206 /security/openssh-portable | |
| parent | 95a45982d8e0efe75c7c52f93388b952492cf6fa (diff) | |
| download | freebsd-ports-gnome-1428a9bcad7c112680adefc89b75bf68d3b74b08.tar.gz freebsd-ports-gnome-1428a9bcad7c112680adefc89b75bf68d3b74b08.tar.zst freebsd-ports-gnome-1428a9bcad7c112680adefc89b75bf68d3b74b08.zip | |
Fix minor plist issues from check-plist
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh-portable/pkg-plist | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 777b4c6baf6c..aecf455f8880 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -207,13 +207,14 @@ NO_MTREE= yes ETCSSH= /etc/ssh USE_RCORDER= openssh PLIST_SUB+= NOTBASE="@comment " -PLIST_SUB+= BASEPREFIX="${PREFIX}" .else ETCSSH= ${PREFIX}/etc/ssh USE_RC_SUBR= openssh PLIST_SUB+= NOTBASE="" .endif +PLIST_SUB+= BASEPREFIX="${PREFIX}" + # After all SUB_LIST+= ETCSSH="${ETCSSH}" CONFIGURE_ARGS+= --sysconfdir=${ETCSSH} --with-privsep-path=${EMPTYDIR} diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist index 7264ae4b7b7e..2a1c35454a06 100644 --- a/security/openssh-portable/pkg-plist +++ b/security/openssh-portable/pkg-plist @@ -7,12 +7,12 @@ bin/ssh-add bin/ssh-agent bin/ssh-keygen bin/ssh-keyscan -%%NOTBASE%%etc/ssh/moduli %%NOTBASE%%@exec if [ -f %D/etc/ssh_config -a ! -f %D/etc/ssh/ssh_config ]; then ln %D/etc/ssh_config %D/etc/ssh/ssh_config ; fi %%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 %%OVERWRITE_BASE%%@cwd / +%%NOTBASE%%etc/ssh/moduli etc/ssh/ssh_config-dist etc/ssh/sshd_config-dist %%OVERWRITE_BASE%%@cwd %%BASEPREFIX%% |