Date: Thu, 24 Apr 2014 01:04:52 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351981 - head/security/openssh-portable Message-ID: <201404240104.s3O14qsl039512@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Apr 24 01:04:52 2014 New Revision: 351981 URL: http://svnweb.freebsd.org/changeset/ports/351981 QAT: https://qat.redports.org/buildarchive/r351981/ Log: Fix minor plist issues from check-plist Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/pkg-plist Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Thu Apr 24 00:52:16 2014 (r351980) +++ head/security/openssh-portable/Makefile Thu Apr 24 01:04:52 2014 (r351981) @@ -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} Modified: head/security/openssh-portable/pkg-plist ============================================================================== --- head/security/openssh-portable/pkg-plist Thu Apr 24 00:52:16 2014 (r351980) +++ head/security/openssh-portable/pkg-plist Thu Apr 24 01:04:52 2014 (r351981) @@ -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%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404240104.s3O14qsl039512>